summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRutherther <rutherther@ditigal.xyz>2026-01-17 21:31:15 +0100
committerRutherther <rutherther@ditigal.xyz>2026-01-18 11:14:18 +0100
commitd41f3621145762457af5dd5931fa2935d172a54a (patch)
tree3990ff56a766e3a2d9884336ef626e33efc46de8
parentb50a7973dba15388953225c126627d503b936f85 (diff)
maint: Register files for dist tarballs.
* Makefile.am: Register missing dist files. * gnu/local.mk: Register all used patches. * gnu/packages/patches/emacs-gnus-desktop-notify-fix-notifications.patch: Remove unregistered patch. * gnu/packages/patches/emacs-gnus-desktop-notify-rescan.patch: Remove unregistered patch. * gnu/packages/patches/libjami-ac-config-files.patch: Remove unregistered patch. * gnu/packages/patches/libjami-sdbus-cpp-v2.patch: Remove unregistered patch. Fixes: #5691 Merges: #5709 Reported-By: Vagrant Cascadian <vagrant@debian.org> Change-Id: Ifa05b163b3ad362c5a07efdfd2dac6af88bac18e
-rw-r--r--Makefile.am6
-rw-r--r--gnu/local.mk8
-rw-r--r--gnu/packages/patches/emacs-gnus-desktop-notify-fix-notifications.patch76
-rw-r--r--gnu/packages/patches/emacs-gnus-desktop-notify-rescan.patch37
-rw-r--r--gnu/packages/patches/libjami-ac-config-files.patch52
-rw-r--r--gnu/packages/patches/libjami-sdbus-cpp-v2.patch144
6 files changed, 12 insertions, 311 deletions
diff --git a/Makefile.am b/Makefile.am
index 679a7bfce97..370721694f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -376,6 +376,7 @@ MODULES = \
376 guix/scripts/import/luanti.scm \ 376 guix/scripts/import/luanti.scm \
377 guix/scripts/import/minetest.scm \ 377 guix/scripts/import/minetest.scm \
378 guix/scripts/import/npm-binary.scm \ 378 guix/scripts/import/npm-binary.scm \
379 guix/scripts/import/nuget.scm \
379 guix/scripts/import/opam.scm \ 380 guix/scripts/import/opam.scm \
380 guix/scripts/import/pypi.scm \ 381 guix/scripts/import/pypi.scm \
381 guix/scripts/import/stackage.scm \ 382 guix/scripts/import/stackage.scm \
@@ -505,7 +506,8 @@ EXAMPLES = \
505 gnu/system/examples/plasma.tmpl \ 506 gnu/system/examples/plasma.tmpl \
506 gnu/system/examples/raspberry-pi-64.tmpl \ 507 gnu/system/examples/raspberry-pi-64.tmpl \
507 gnu/system/examples/raspberry-pi-64-nfs-root.tmpl \ 508 gnu/system/examples/raspberry-pi-64-nfs-root.tmpl \
508 gnu/system/examples/vm-image.tmpl 509 gnu/system/examples/vm-image.tmpl \
510 gnu/system/examples/vm-image-efi.tmpl
509 511
510GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go) 512GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go)
511 513
@@ -747,7 +749,7 @@ dist_fishcompletion_DATA = etc/completion/fish/guix.fish
747nodist_selinux_policy_DATA = etc/guix-daemon.cil 749nodist_selinux_policy_DATA = etc/guix-daemon.cil
748 750
749# AppArmor profiles. 751# AppArmor profiles.
750nodist_apparmor_profile_DATA = \ 752dist_apparmor_profile_DATA = \
751 etc/apparmor.d/guix \ 753 etc/apparmor.d/guix \
752 etc/apparmor.d/guix-daemon 754 etc/apparmor.d/guix-daemon
753 755
diff --git a/gnu/local.mk b/gnu/local.mk
index edf3e69b231..80bb2031de0 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1175,6 +1175,7 @@ dist_patch_DATA = \
1175 %D%/packages/patches/dhclient-script-resolvconf-support.patch \ 1175 %D%/packages/patches/dhclient-script-resolvconf-support.patch \
1176 %D%/packages/patches/dicedb-remove-init-from-config-subpkg.patch \ 1176 %D%/packages/patches/dicedb-remove-init-from-config-subpkg.patch \
1177 %D%/packages/patches/directfb-davinci-glibc-228-compat.patch \ 1177 %D%/packages/patches/directfb-davinci-glibc-228-compat.patch \
1178 %D%/packages/patches/django-compressor-build-with-beautifulsoup-4.14+.patch \
1178 %D%/packages/patches/dkimproxy-add-ipv6-support.patch \ 1179 %D%/packages/patches/dkimproxy-add-ipv6-support.patch \
1179 %D%/packages/patches/doc++-gcc-14.patch \ 1180 %D%/packages/patches/doc++-gcc-14.patch \
1180 %D%/packages/patches/docbook-utils-documentation-edits.patch \ 1181 %D%/packages/patches/docbook-utils-documentation-edits.patch \
@@ -1208,6 +1209,7 @@ dist_patch_DATA = \
1208 %D%/packages/patches/eigen-fix-strict-aliasing-bug.patch \ 1209 %D%/packages/patches/eigen-fix-strict-aliasing-bug.patch \
1209 %D%/packages/patches/einstein-build.patch \ 1210 %D%/packages/patches/einstein-build.patch \
1210 %D%/packages/patches/elfutils-tests-ptrace.patch \ 1211 %D%/packages/patches/elfutils-tests-ptrace.patch \
1212 %D%/packages/patches/elixir-httpoison-tag-network-dependent-test-cases.patch \
1211 %D%/packages/patches/elixir-path-length.patch \ 1213 %D%/packages/patches/elixir-path-length.patch \
1212 %D%/packages/patches/elm-ghc9.2.patch \ 1214 %D%/packages/patches/elm-ghc9.2.patch \
1213 %D%/packages/patches/python-treelib-remove-python2-compat.patch \ 1215 %D%/packages/patches/python-treelib-remove-python2-compat.patch \
@@ -1247,7 +1249,9 @@ dist_patch_DATA = \
1247 %D%/packages/patches/ergodox-firmware-fix-numpad.patch \ 1249 %D%/packages/patches/ergodox-firmware-fix-numpad.patch \
1248 %D%/packages/patches/ericw-tools-add-check-for-sse2-in-light.cc.patch \ 1250 %D%/packages/patches/ericw-tools-add-check-for-sse2-in-light.cc.patch \
1249 %D%/packages/patches/ericw-tools-gcc-11-pass-const-to-offsetof.patch \ 1251 %D%/packages/patches/ericw-tools-gcc-11-pass-const-to-offsetof.patch \
1252 %D%/packages/patches/erlang-binpp-disable-failing-tests.patch \
1250 %D%/packages/patches/erlang-man-path.patch \ 1253 %D%/packages/patches/erlang-man-path.patch \
1254 %D%/packages/patches/erlang-mochiweb-disable-known-to-fail-tests.patch \
1251 %D%/packages/patches/esmini-use-pkgconfig.patch \ 1255 %D%/packages/patches/esmini-use-pkgconfig.patch \
1252 %D%/packages/patches/esmtp-add-lesmtp.patch \ 1256 %D%/packages/patches/esmtp-add-lesmtp.patch \
1253 %D%/packages/patches/esound-c99.patch \ 1257 %D%/packages/patches/esound-c99.patch \
@@ -1681,6 +1685,7 @@ dist_patch_DATA = \
1681 %D%/packages/patches/libretro-dolphin-emu-libusb-assert.patch \ 1685 %D%/packages/patches/libretro-dolphin-emu-libusb-assert.patch \
1682 %D%/packages/patches/libretro-dolphin-emu-vulkan-headers.patch \ 1686 %D%/packages/patches/libretro-dolphin-emu-vulkan-headers.patch \
1683 %D%/packages/patches/librewolf-add-store-to-rdd-allowlist.patch \ 1687 %D%/packages/patches/librewolf-add-store-to-rdd-allowlist.patch \
1688 %D%/packages/patches/librewolf-compare-paths.patch \
1684 %D%/packages/patches/librewolf-neuter-locale-download.patch \ 1689 %D%/packages/patches/librewolf-neuter-locale-download.patch \
1685 %D%/packages/patches/librewolf-use-system-wide-dir.patch \ 1690 %D%/packages/patches/librewolf-use-system-wide-dir.patch \
1686 %D%/packages/patches/libvirt-add-install-prefix.patch \ 1691 %D%/packages/patches/libvirt-add-install-prefix.patch \
@@ -1691,6 +1696,8 @@ dist_patch_DATA = \
1691 %D%/packages/patches/lightdm-vnc-ipv6.patch \ 1696 %D%/packages/patches/lightdm-vnc-ipv6.patch \
1692 %D%/packages/patches/lightdm-vnc-color-depth.patch \ 1697 %D%/packages/patches/lightdm-vnc-color-depth.patch \
1693 %D%/packages/patches/lightdm-vncserver-check.patch \ 1698 %D%/packages/patches/lightdm-vncserver-check.patch \
1699 %D%/packages/patches/linphone-desktop-cmake-belcard.patch \
1700 %D%/packages/patches/linphone-desktop-cmake-find-modules.patch \
1694 %D%/packages/patches/localed-xorg-keyboard.patch \ 1701 %D%/packages/patches/localed-xorg-keyboard.patch \
1695 %D%/packages/patches/kaldi-ignore-failing-test.patch \ 1702 %D%/packages/patches/kaldi-ignore-failing-test.patch \
1696 %D%/packages/patches/kaldi-openblas-0.3.29-compatibility.patch \ 1703 %D%/packages/patches/kaldi-openblas-0.3.29-compatibility.patch \
@@ -2294,6 +2301,7 @@ dist_patch_DATA = \
2294 %D%/packages/patches/sbcl-burgled-batteries3-fix-signals.patch \ 2301 %D%/packages/patches/sbcl-burgled-batteries3-fix-signals.patch \
2295 %D%/packages/patches/sbcl-ciel-repl.patch \ 2302 %D%/packages/patches/sbcl-ciel-repl.patch \
2296 %D%/packages/patches/sbcl-clml-fix-types.patch \ 2303 %D%/packages/patches/sbcl-clml-fix-types.patch \
2304 %D%/packages/patches/sbcl-cl-redis-replace-sbcl-specific-calls.patch \
2297 %D%/packages/patches/sbcl-eazy-gnuplot-skip-path-check.patch \ 2305 %D%/packages/patches/sbcl-eazy-gnuplot-skip-path-check.patch \
2298 %D%/packages/patches/sbcl-lack-fix-tests.patch \ 2306 %D%/packages/patches/sbcl-lack-fix-tests.patch \
2299 %D%/packages/patches/sbcl-png-fix-sbcl-compatibility.patch \ 2307 %D%/packages/patches/sbcl-png-fix-sbcl-compatibility.patch \
diff --git a/gnu/packages/patches/emacs-gnus-desktop-notify-fix-notifications.patch b/gnu/packages/patches/emacs-gnus-desktop-notify-fix-notifications.patch
deleted file mode 100644
index 5b5648956c8..00000000000
--- a/gnu/packages/patches/emacs-gnus-desktop-notify-fix-notifications.patch
+++ /dev/null
@@ -1,76 +0,0 @@
1Upstream status: https://gitlab.com/wavexx/gnus-desktop-notify.el/-/merge_requests/15
2
3From 905e7ea41560783ec723aa0167911ba050f91789 Mon Sep 17 00:00:00 2001
4From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
5Date: Mon, 16 Jun 2025 09:24:07 +0900
6Subject: [PATCH] Revert to use the notifications library by default.
7
8The alert library project itself mentions that:
9
10 For desktop notifications, the notifications package that is
11 installed with emacs, provides a probably better alternative for
12 most users.
13
14and it appears true, as by default `alert' simply print notification
15messages to the `*Messages*' buffer, which is not exactly a desktop
16notification.
17
18* gnus-desktop-notify.el (require): Require notifications first,
19falling back to alert.
20(gnus-desktop-notify-function): Test for the notifications feature
21first. Mention `notifications' is the default in its doc.
22---
23 gnus-desktop-notify.el | 15 ++++++++++-----
24 1 file changed, 10 insertions(+), 5 deletions(-)
25
26diff --git a/gnus-desktop-notify.el b/gnus-desktop-notify.el
27index 97e65f3..a12e444 100644
28--- a/gnus-desktop-notify.el
29+++ b/gnus-desktop-notify.el
30@@ -26,6 +26,11 @@
31
32 ;;; Change Log:
33
34+;; 1.5:
35+;; * Revert to use the `notifications' library by default if
36+;; available. The `alert' library doesn't do anything useful in its
37+;; default configuration.
38+;;
39 ;; 1.4:
40 ;; * Use `alert' package by default if available (`gnus-desktop-notify-alert').
41 ;;
42@@ -83,8 +88,8 @@
43 (require 'format-spec)
44 (require 'gnus-group)
45
46-(unless (require 'alert nil t)
47- (require 'notifications nil t))
48+(unless (require 'notifications nil t)
49+ (require 'alert nil t))
50
51 (declare-function alert "alert")
52 (declare-function notifications-notify "notifications")
53@@ -96,8 +101,8 @@
54 :group 'gnus)
55
56 (defcustom gnus-desktop-notify-function
57- (cond ((featurep 'alert) 'gnus-desktop-notify-alert)
58- ((featurep 'notifications) 'gnus-desktop-notify-dbus)
59+ (cond ((featurep 'notifications) 'gnus-desktop-notify-dbus)
60+ ((featurep 'alert) 'gnus-desktop-notify-alert)
61 (t 'gnus-desktop-notify-send))
62 "Notification backend used when a group receives new messages.
63 The backend is passed the notification content as a single,
64@@ -109,8 +114,8 @@ or fallback to the generic `gnus-desktop-notify-send' otherwise.
65
66 The following functions are available (whose documentation see):
67
68+`gnus-desktop-notify-dbus': Use the `notifications' library (default).
69 `gnus-desktop-notify-alert': Use the `alert' library.
70-`gnus-desktop-notify-dbus': Use the `notifications' library.
71 `gnus-desktop-notify-send': Call the `notify-send' program.
72 `gnus-desktop-notify-exec': Call a customizable program."
73 :type 'function)
74--
75GitLab
76
diff --git a/gnu/packages/patches/emacs-gnus-desktop-notify-rescan.patch b/gnu/packages/patches/emacs-gnus-desktop-notify-rescan.patch
deleted file mode 100644
index 2e1f7782a30..00000000000
--- a/gnu/packages/patches/emacs-gnus-desktop-notify-rescan.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1Upstream-status: https://gitlab.com/wavexx/gnus-desktop-notify.el/-/merge_requests/16
2
3diff --git a/README.rst b/README.rst
4index 4cacdcb..150a2c2 100644
5--- a/README.rst
6+++ b/README.rst
7@@ -18,7 +18,7 @@ new messages are received. For basic usage, to be used in conjunction with
8
9 (require 'gnus-desktop-notify)
10 (gnus-desktop-notify-mode)
11- (gnus-demon-add-scanmail)
12+ (gnus-demon-add-rescan)
13
14 into your ``.gnus`` file. The default is to use alert_ if available, which
15 works on every operating system and allows the user to customize the
16@@ -52,7 +52,7 @@ follows:
17 (setq gnus-desktop-notify-function 'gnus-desktop-notify-exec
18 gnus-desktop-notify-exec-program "growlnotify -a Emacs.app -m")
19 (gnus-desktop-notify-mode)
20- (gnus-demon-add-scanmail)
21+ (gnus-demon-add-rescan)
22
23
24 Advanced setup
25diff --git a/gnus-desktop-notify.el b/gnus-desktop-notify.el
26index 97e65f3..3153807 100644
27--- a/gnus-desktop-notify.el
28+++ b/gnus-desktop-notify.el
29@@ -50,7 +50,7 @@
30 ;;
31 ;; (require 'gnus-desktop-notify)
32 ;; (gnus-desktop-notify-mode)
33-;; (gnus-demon-add-scanmail)
34+;; (gnus-demon-add-rescan)
35 ;;
36 ;; into your ``.gnus`` file. The default is to use `alert' if available, which
37 ;; works on every operating system and allows the user to customize the
diff --git a/gnu/packages/patches/libjami-ac-config-files.patch b/gnu/packages/patches/libjami-ac-config-files.patch
deleted file mode 100644
index 8508d55ee14..00000000000
--- a/gnu/packages/patches/libjami-ac-config-files.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1Forwarded here: https://lists.gnu.org/archive/html/jami/2024-01/msg00003.html
2
3From 20a1702d881b381979d31c456f1b8cf5e0f728ad Mon Sep 17 00:00:00 2001
4From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
5Date: Sun, 7 Jan 2024 16:40:41 -0500
6Subject: [PATCH] configure.ac: Expand AC_CONFIG_FILES to fix a race.
7
8The commands apparently run for each file listed, or something
9similar, leading to:
10
11 configure: creating ./config.status
12 config.status: creating test/agent/Makefile
13 chmod: cannot access 'test/agent/pre-inst-env': No such file or directory
14 chmod: cannot access 'test/agent/scenarios/bulk-calls/run-scenario': No such file or directory
15 config.status: creating test/agent/pre-inst-env
16 chmod: cannot access 'test/agent/scenarios/bulk-calls/run-scenario': No such file or directory
17
18* configure.ac [ENABLE_AGENT]: Separate AC_CONFIG_FILES uses per file.
19
20Series-to: jami@gnu.org
21Series-postfix: daemon
22Change-Id: Ib283955b73540248e09bf31ef44ef3d178b216fa
23---
24 configure.ac | 10 +++++-----
25 1 file changed, 5 insertions(+), 5 deletions(-)
26
27diff --git a/configure.ac b/configure.ac
28index cdea5ff1c..2ab96d817 100644
29--- a/configure.ac
30+++ b/configure.ac
31@@ -61,11 +61,11 @@ AC_ARG_ENABLE([agent],
32 [Build agent]))
33 AM_CONDITIONAL([ENABLE_AGENT], [test "x$enable_agent" = "xyes"])
34 AM_COND_IF([ENABLE_AGENT],
35- [AC_CONFIG_FILES([test/agent/Makefile
36- test/agent/pre-inst-env:test/agent/build-aux/pre-inst-env.in
37- test/agent/scenarios/bulk-calls/run-scenario],
38- [chmod +x test/agent/pre-inst-env
39- chmod +x test/agent/scenarios/bulk-calls/run-scenario])])
40+ [AC_CONFIG_FILES([test/agent/Makefile])
41+ AC_CONFIG_FILES([test/agent/pre-inst-env:test/agent/build-aux/pre-inst-env.in],
42+ [chmod +x test/agent/pre-inst-env])
43+ AC_CONFIG_FILES([test/agent/scenarios/bulk-calls/run-scenario],
44+ [chmod +x test/agent/scenarios/bulk-calls/run-scenario])])
45
46 AC_ARG_ENABLE([tracepoints], AS_HELP_STRING([--enable-tracepoints], [Enable tracepoints]))
47
48
49base-commit: e246fb2e090c9b3de55e2d455eee5a6f05a5b286
50--
512.41.0
52
diff --git a/gnu/packages/patches/libjami-sdbus-cpp-v2.patch b/gnu/packages/patches/libjami-sdbus-cpp-v2.patch
deleted file mode 100644
index 3a6460d380a..00000000000
--- a/gnu/packages/patches/libjami-sdbus-cpp-v2.patch
+++ /dev/null
@@ -1,144 +0,0 @@
1Upstream-status: <https://review.jami.net/c/jami-daemon/+/31504>
2
3diff --git a/bin/dbus/dbuscallmanager.hpp b/bin/dbus/dbuscallmanager.hpp
4index b79e0cd6f..918d8bc30 100644
5--- a/bin/dbus/dbuscallmanager.hpp
6+++ b/bin/dbus/dbuscallmanager.hpp
7@@ -23,7 +23,7 @@ class DBusCallManager : public sdbus::AdaptorInterfaces<cx::ring::Ring::CallMana
8 {
9 public:
10 DBusCallManager(sdbus::IConnection& connection)
11- : AdaptorInterfaces(connection, "/cx/ring/Ring/CallManager")
12+ : AdaptorInterfaces(connection, sdbus::ObjectPath("/cx/ring/Ring/CallManager"))
13 {
14 registerAdaptor();
15 registerSignalHandlers();
16diff --git a/bin/dbus/dbusconfigurationmanager.hpp b/bin/dbus/dbusconfigurationmanager.hpp
17index a6bb8e4e9..895c7690d 100644
18--- a/bin/dbus/dbusconfigurationmanager.hpp
19+++ b/bin/dbus/dbusconfigurationmanager.hpp
20@@ -33,7 +33,7 @@ public:
21 std::vector<std::map<std::string, std::string>>,
22 std::map<std::string, int32_t>>;
23 DBusConfigurationManager(sdbus::IConnection& connection)
24- : AdaptorInterfaces(connection, "/cx/ring/Ring/ConfigurationManager")
25+ : AdaptorInterfaces(connection, sdbus::ObjectPath("/cx/ring/Ring/ConfigurationManager"))
26 {
27 registerAdaptor();
28 registerSignalHandlers();
29diff --git a/bin/dbus/dbusinstance.hpp b/bin/dbus/dbusinstance.hpp
30index d45c033e1..184fd2c7d 100644
31--- a/bin/dbus/dbusinstance.hpp
32+++ b/bin/dbus/dbusinstance.hpp
33@@ -28,7 +28,7 @@ class DBusInstance : public sdbus::AdaptorInterfaces<cx::ring::Ring::Instance_ad
34 {
35 public:
36 DBusInstance(sdbus::IConnection& connection)
37- : AdaptorInterfaces(connection, "/cx/ring/Ring/Instance")
38+ : AdaptorInterfaces(connection, sdbus::ObjectPath("/cx/ring/Ring/Instance"))
39 {
40 registerAdaptor();
41 }
42diff --git a/bin/dbus/dbuspluginmanagerinterface.hpp b/bin/dbus/dbuspluginmanagerinterface.hpp
43index c063a9903..132674e9f 100644
44--- a/bin/dbus/dbuspluginmanagerinterface.hpp
45+++ b/bin/dbus/dbuspluginmanagerinterface.hpp
46@@ -23,7 +23,7 @@ class DBusPluginManagerInterface : public sdbus::AdaptorInterfaces<cx::ring::Rin
47 {
48 public:
49 DBusPluginManagerInterface(sdbus::IConnection& connection)
50- : AdaptorInterfaces(connection, "/cx/ring/Ring/PluginManagerInterface")
51+ : AdaptorInterfaces(connection, sdbus::ObjectPath("/cx/ring/Ring/PluginManagerInterface"))
52 {
53 registerAdaptor();
54 registerSignalHandlers();
55diff --git a/bin/dbus/dbuspresencemanager.hpp b/bin/dbus/dbuspresencemanager.hpp
56index ca8ba7f2a..27b93eee4 100644
57--- a/bin/dbus/dbuspresencemanager.hpp
58+++ b/bin/dbus/dbuspresencemanager.hpp
59@@ -23,7 +23,7 @@ class DBusPresenceManager : public sdbus::AdaptorInterfaces<cx::ring::Ring::Pres
60 {
61 public:
62 DBusPresenceManager(sdbus::IConnection& connection)
63- : AdaptorInterfaces(connection, "/cx/ring/Ring/PresenceManager")
64+ : AdaptorInterfaces(connection, sdbus::ObjectPath("/cx/ring/Ring/PresenceManager"))
65 {
66 registerAdaptor();
67 registerSignalHandlers();
68diff --git a/bin/dbus/dbusvideomanager.hpp b/bin/dbus/dbusvideomanager.hpp
69index 7fbca2492..96f73e99b 100644
70--- a/bin/dbus/dbusvideomanager.hpp
71+++ b/bin/dbus/dbusvideomanager.hpp
72@@ -23,7 +23,7 @@ class DBusVideoManager : public sdbus::AdaptorInterfaces<cx::ring::Ring::VideoMa
73 {
74 public:
75 DBusVideoManager(sdbus::IConnection& connection)
76- : AdaptorInterfaces(connection, "/cx/ring/Ring/VideoManager")
77+ : AdaptorInterfaces(connection, sdbus::ObjectPath("/cx/ring/Ring/VideoManager"))
78 {
79 registerAdaptor();
80 registerSignalHandlers();
81diff --git a/bin/dbus/main.cpp b/bin/dbus/main.cpp
82index ee8a349cc..4d7adc95e 100644
83--- a/bin/dbus/main.cpp
84+++ b/bin/dbus/main.cpp
85@@ -180,7 +180,7 @@ main(int argc, char *argv [])
86 }
87
88 try {
89- connection = sdbus::createSessionBusConnection("cx.ring.Ring");
90+ connection = sdbus::createSessionBusConnection(sdbus::ServiceName("cx.ring.Ring"));
91 DBusCallManager callManager(*connection);
92 DBusConfigurationManager configurationManager(*connection);
93 DBusInstance instanceManager(*connection);
94diff --git a/configure.ac b/configure.ac
95index 66e52ee62..68de32497 100644
96--- a/configure.ac
97+++ b/configure.ac
98@@ -420,7 +420,7 @@ AC_ARG_WITH([dbus],
99 [],
100 [with_dbus=yes])
101 AS_IF([test "x$with_dbus" = "xyes"],
102- [PKG_CHECK_MODULES(SDBUSCPP, [sdbus-c++],,
103+ [PKG_CHECK_MODULES(SDBUSCPP, [sdbus-c++ >= 2.0.0],,
104 AC_MSG_ERROR([sdbus-c++ not found]))
105
106 AC_CONFIG_FILES([bin/dbus/Makefile])
107diff --git a/contrib/src/sdbus-cpp/SHA512SUMS b/contrib/src/sdbus-cpp/SHA512SUMS
108index a48ebec1c..009d0b81b 100644
109--- a/contrib/src/sdbus-cpp/SHA512SUMS
110+++ b/contrib/src/sdbus-cpp/SHA512SUMS
111@@ -1 +1 @@
112-dab2c4d9a5ea6d626672a5a6ee6f3490c60c6fdd160769801a4d6b4cf3df4983fad57ff0230132a5d637ec78a55993200ce217fa89461016e101865cc2777d7d sdbus-cpp-1.2.0.tar.gz
113+4247d49f0d5231e2768c0c96fa9c266bbcc340292c9c3d748f9c37ff992b82301faea798300f916e9a5c992d77adfe56186866c91a4c7d4157750ff09ba5a047 sdbus-cpp-2.1.0.tar.gz
114diff --git a/contrib/src/sdbus-cpp/rules.mak b/contrib/src/sdbus-cpp/rules.mak
115index 397d18d3b..d00fa97ca 100644
116--- a/contrib/src/sdbus-cpp/rules.mak
117+++ b/contrib/src/sdbus-cpp/rules.mak
118@@ -1,4 +1,4 @@
119-SDBUS_CPP_VERSION := 1.2.0
120+SDBUS_CPP_VERSION := 2.1.0
121 SDBUS_CPP_URL := https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v$(SDBUS_CPP_VERSION).tar.gz
122
123 ifdef HAVE_LINUX
124@@ -7,17 +7,14 @@ PKGS += sdbus-cpp
125 endif
126 endif
127
128-ifeq ($(call need_pkg,"sdbus-c++ >= 1.2.0"),)
129+ifeq ($(call need_pkg,"sdbus-c++ >= 2.0.0"),)
130 PKGS_FOUND += sdbus-cpp
131 endif
132
133 SDBUS_CPP_CMAKECONF := -D CMAKE_BUILD_TYPE=Release \
134 -D BUILD_SHARED_LIBS=OFF \
135- -D BUILD_CODE_GEN=ON \
136- -D BUILD_LIBSYSTEMD=OFF \
137- -D BUILD_TESTS=OFF \
138- -D BUILD_EXAMPLES=OFF \
139- -D BUILD_DOC=OFF
140+ -D SDBUSCPP_BUILD_CODEGEN=ON \
141+ -D SDBUSCPP_BUILD_DOCS=OFF
142
143 $(TARBALLS)/sdbus-cpp-$(SDBUS_CPP_VERSION).tar.gz:
144 $(call download,$(SDBUS_CPP_URL))