jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I94835a8edead6e9a3b22a5a47b8605afc7bad286
This commit is contained in:
Adrien Béraud
2025-08-01 11:44:58 -04:00
committed by Gerrit Code Review
parent 0920927895
commit 3fa3f7bad9
10 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/dbus/dbuscallmanager.hpp
View File

@ -23,7 +23,7 @@ class DBusCallManager : public sdbus::AdaptorInterfaces<cx::ring::Ring::CallMana
{
public:
DBusCallManager(sdbus::IConnection& connection)
: AdaptorInterfaces(connection, "/cx/ring/Ring/CallManager")
: AdaptorInterfaces(connection, sdbus::ObjectPath("/cx/ring/Ring/CallManager"))
{
registerAdaptor();
registerSignalHandlers();

2
bin/dbus/dbusconfigurationmanager.hpp
View File

@ -33,7 +33,7 @@ public:
std::vector<std::map<std::string, std::string>>,
std::map<std::string, int32_t>>;
DBusConfigurationManager(sdbus::IConnection& connection)
: AdaptorInterfaces(connection, "/cx/ring/Ring/ConfigurationManager")
: AdaptorInterfaces(connection, sdbus::ObjectPath("/cx/ring/Ring/ConfigurationManager"))
{
registerAdaptor();
registerSignalHandlers();

2
bin/dbus/dbusinstance.hpp
View File

@ -28,7 +28,7 @@ class DBusInstance : public sdbus::AdaptorInterfaces<cx::ring::Ring::Instance_ad
{
public:
DBusInstance(sdbus::IConnection& connection)
: AdaptorInterfaces(connection, "/cx/ring/Ring/Instance")
: AdaptorInterfaces(connection, sdbus::ObjectPath("/cx/ring/Ring/Instance"))
{
registerAdaptor();
}

2
bin/dbus/dbuspluginmanagerinterface.hpp
View File

@ -23,7 +23,7 @@ class DBusPluginManagerInterface : public sdbus::AdaptorInterfaces<cx::ring::Rin
{
public:
DBusPluginManagerInterface(sdbus::IConnection& connection)
: AdaptorInterfaces(connection, "/cx/ring/Ring/PluginManagerInterface")
: AdaptorInterfaces(connection, sdbus::ObjectPath("/cx/ring/Ring/PluginManagerInterface"))
{
registerAdaptor();
registerSignalHandlers();

2
bin/dbus/dbuspresencemanager.hpp
View File

@ -23,7 +23,7 @@ class DBusPresenceManager : public sdbus::AdaptorInterfaces<cx::ring::Ring::Pres
{
public:
DBusPresenceManager(sdbus::IConnection& connection)
: AdaptorInterfaces(connection, "/cx/ring/Ring/PresenceManager")
: AdaptorInterfaces(connection, sdbus::ObjectPath("/cx/ring/Ring/PresenceManager"))
{
registerAdaptor();
registerSignalHandlers();

2
bin/dbus/dbusvideomanager.hpp
View File

@ -23,7 +23,7 @@ class DBusVideoManager : public sdbus::AdaptorInterfaces<cx::ring::Ring::VideoMa
{
public:
DBusVideoManager(sdbus::IConnection& connection)
: AdaptorInterfaces(connection, "/cx/ring/Ring/VideoManager")
: AdaptorInterfaces(connection, sdbus::ObjectPath("/cx/ring/Ring/VideoManager"))
{
registerAdaptor();
registerSignalHandlers();

2
bin/dbus/main.cpp
View File

@ -180,7 +180,7 @@ main(int argc, char *argv [])
}
try {
connection = sdbus::createSessionBusConnection("cx.ring.Ring");
connection = sdbus::createSessionBusConnection(sdbus::ServiceName("cx.ring.Ring"));
DBusCallManager callManager(*connection);
DBusConfigurationManager configurationManager(*connection);
DBusInstance instanceManager(*connection);

2
configure.ac
View File

@ -420,7 +420,7 @@ AC_ARG_WITH([dbus],
[],
[with_dbus=yes])
AS_IF([test "x$with_dbus" = "xyes"],
[PKG_CHECK_MODULES(SDBUSCPP, [sdbus-c++],,
[PKG_CHECK_MODULES(SDBUSCPP, [sdbus-c++ >= 2.0.0],,
AC_MSG_ERROR([sdbus-c++ not found]))
AC_CONFIG_FILES([bin/dbus/Makefile])

2
contrib/src/sdbus-cpp/SHA512SUMS
View File

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

11
contrib/src/sdbus-cpp/rules.mak
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))