update sdbus-cpp to 2.1.0 and adjust daemon for breaking changes

The daemon sources were adjusted via the ChatGPT-provided sed snippet:

find . -name '*.cpp' -o -name '*.hpp' | while read -r file; do
  sed -i \
    -e 's/\(AdaptorInterfaces([^,]*,\) *"\([^"]*\)"/\1 sdbus::ObjectPath("\2")/' \
    -e 's/\(createSessionBusConnection(\) *"\([^"]*\)"/\1 sdbus::ServiceName("\2")/' \
    -e 's/\(createSystemBusConnection(\) *"\([^"]*\)"/\1 sdbus::ServiceName("\2")/' \
    "$file"
done

Fixes: #1141
Change-Id: I9d7b75814c66cdd8a12432c349f5df7b3e6796cd
This commit is contained in:
Maxim Cournoyer
2025-07-21 14:40:26 +09:00
parent 2dc79812a7
commit 4a99991086
10 changed files with 13 additions and 16 deletions

View File

@ -1 +1 @@
dab2c4d9a5ea6d626672a5a6ee6f3490c60c6fdd160769801a4d6b4cf3df4983fad57ff0230132a5d637ec78a55993200ce217fa89461016e101865cc2777d7d sdbus-cpp-1.2.0.tar.gz
4247d49f0d5231e2768c0c96fa9c266bbcc340292c9c3d748f9c37ff992b82301faea798300f916e9a5c992d77adfe56186866c91a4c7d4157750ff09ba5a047 sdbus-cpp-2.1.0.tar.gz

View File

@ -1,4 +1,4 @@
SDBUS_CPP_VERSION := 1.2.0
SDBUS_CPP_VERSION := 2.1.0
SDBUS_CPP_URL := https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v$(SDBUS_CPP_VERSION).tar.gz
ifdef HAVE_LINUX
@ -7,17 +7,14 @@ PKGS += sdbus-cpp
endif
endif
ifeq ($(call need_pkg,"sdbus-c++ >= 1.2.0"),)
ifeq ($(call need_pkg,"sdbus-c++ >= 2.0.0"),)
PKGS_FOUND += sdbus-cpp
endif
SDBUS_CPP_CMAKECONF := -D CMAKE_BUILD_TYPE=Release \
-D BUILD_SHARED_LIBS=OFF \
-D BUILD_CODE_GEN=ON \
-D BUILD_LIBSYSTEMD=OFF \
-D BUILD_TESTS=OFF \
-D BUILD_EXAMPLES=OFF \
-D BUILD_DOC=OFF
-D SDBUSCPP_BUILD_CODEGEN=ON \
-D SDBUSCPP_BUILD_DOCS=OFF
$(TARBALLS)/sdbus-cpp-$(SDBUS_CPP_VERSION).tar.gz:
$(call download,$(SDBUS_CPP_URL))