~ruther/guix-local

d41f3621145762457af5dd5931fa2935d172a54a — Rutherther 3 months ago b50a797
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
6 files changed, 12 insertions(+), 311 deletions(-)

M Makefile.am
M gnu/local.mk
D gnu/packages/patches/emacs-gnus-desktop-notify-fix-notifications.patch
D gnu/packages/patches/emacs-gnus-desktop-notify-rescan.patch
D gnu/packages/patches/libjami-ac-config-files.patch
D gnu/packages/patches/libjami-sdbus-cpp-v2.patch
M Makefile.am => Makefile.am +4 -2
@@ 376,6 376,7 @@ MODULES =					\
  guix/scripts/import/luanti.scm  		\
  guix/scripts/import/minetest.scm  		\
  guix/scripts/import/npm-binary.scm		\
  guix/scripts/import/nuget.scm  		\
  guix/scripts/import/opam.scm			\
  guix/scripts/import/pypi.scm			\
  guix/scripts/import/stackage.scm		\


@@ 505,7 506,8 @@ EXAMPLES =					\
  gnu/system/examples/plasma.tmpl		\
  gnu/system/examples/raspberry-pi-64.tmpl	\
  gnu/system/examples/raspberry-pi-64-nfs-root.tmpl	\
  gnu/system/examples/vm-image.tmpl
  gnu/system/examples/vm-image.tmpl		\
  gnu/system/examples/vm-image-efi.tmpl

GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go)



@@ 747,7 749,7 @@ dist_fishcompletion_DATA = etc/completion/fish/guix.fish
nodist_selinux_policy_DATA = etc/guix-daemon.cil

# AppArmor profiles.
nodist_apparmor_profile_DATA =	\
dist_apparmor_profile_DATA =	\
  etc/apparmor.d/guix		\
  etc/apparmor.d/guix-daemon


M gnu/local.mk => gnu/local.mk +8 -0
@@ 1175,6 1175,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/dhclient-script-resolvconf-support.patch \
  %D%/packages/patches/dicedb-remove-init-from-config-subpkg.patch	\
  %D%/packages/patches/directfb-davinci-glibc-228-compat.patch	\
  %D%/packages/patches/django-compressor-build-with-beautifulsoup-4.14+.patch	\
  %D%/packages/patches/dkimproxy-add-ipv6-support.patch		\
  %D%/packages/patches/doc++-gcc-14.patch			\
  %D%/packages/patches/docbook-utils-documentation-edits.patch	\


@@ 1208,6 1209,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/eigen-fix-strict-aliasing-bug.patch	\
  %D%/packages/patches/einstein-build.patch			\
  %D%/packages/patches/elfutils-tests-ptrace.patch		\
  %D%/packages/patches/elixir-httpoison-tag-network-dependent-test-cases.patch			\
  %D%/packages/patches/elixir-path-length.patch			\
  %D%/packages/patches/elm-ghc9.2.patch	\
  %D%/packages/patches/python-treelib-remove-python2-compat.patch	\


@@ 1247,7 1249,9 @@ dist_patch_DATA =						\
  %D%/packages/patches/ergodox-firmware-fix-numpad.patch	\
  %D%/packages/patches/ericw-tools-add-check-for-sse2-in-light.cc.patch	\
  %D%/packages/patches/ericw-tools-gcc-11-pass-const-to-offsetof.patch	\
  %D%/packages/patches/erlang-binpp-disable-failing-tests.patch	\
  %D%/packages/patches/erlang-man-path.patch			\
  %D%/packages/patches/erlang-mochiweb-disable-known-to-fail-tests.patch	\
  %D%/packages/patches/esmini-use-pkgconfig.patch		\
  %D%/packages/patches/esmtp-add-lesmtp.patch		\
  %D%/packages/patches/esound-c99.patch         		\


@@ 1681,6 1685,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/libretro-dolphin-emu-libusb-assert.patch \
  %D%/packages/patches/libretro-dolphin-emu-vulkan-headers.patch        \
  %D%/packages/patches/librewolf-add-store-to-rdd-allowlist.patch       \
  %D%/packages/patches/librewolf-compare-paths.patch		\
  %D%/packages/patches/librewolf-neuter-locale-download.patch	\
  %D%/packages/patches/librewolf-use-system-wide-dir.patch	\
  %D%/packages/patches/libvirt-add-install-prefix.patch	\


@@ 1691,6 1696,8 @@ dist_patch_DATA =						\
  %D%/packages/patches/lightdm-vnc-ipv6.patch			\
  %D%/packages/patches/lightdm-vnc-color-depth.patch		\
  %D%/packages/patches/lightdm-vncserver-check.patch		\
  %D%/packages/patches/linphone-desktop-cmake-belcard.patch	\
  %D%/packages/patches/linphone-desktop-cmake-find-modules.patch	\
  %D%/packages/patches/localed-xorg-keyboard.patch		\
  %D%/packages/patches/kaldi-ignore-failing-test.patch		\
  %D%/packages/patches/kaldi-openblas-0.3.29-compatibility.patch	\


@@ 2294,6 2301,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/sbcl-burgled-batteries3-fix-signals.patch	\
  %D%/packages/patches/sbcl-ciel-repl.patch			\
  %D%/packages/patches/sbcl-clml-fix-types.patch		\
  %D%/packages/patches/sbcl-cl-redis-replace-sbcl-specific-calls.patch	\
  %D%/packages/patches/sbcl-eazy-gnuplot-skip-path-check.patch	\
  %D%/packages/patches/sbcl-lack-fix-tests.patch		\
  %D%/packages/patches/sbcl-png-fix-sbcl-compatibility.patch	\

D gnu/packages/patches/emacs-gnus-desktop-notify-fix-notifications.patch => gnu/packages/patches/emacs-gnus-desktop-notify-fix-notifications.patch +0 -76
@@ 1,76 0,0 @@
Upstream status: https://gitlab.com/wavexx/gnus-desktop-notify.el/-/merge_requests/15

From 905e7ea41560783ec723aa0167911ba050f91789 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 16 Jun 2025 09:24:07 +0900
Subject: [PATCH] Revert to use the notifications library by default.

The alert library project itself mentions that:

  For desktop notifications, the notifications package that is
  installed with emacs, provides a probably better alternative for
  most users.

and it appears true, as by default `alert' simply print notification
messages to the `*Messages*' buffer, which is not exactly a desktop
notification.

* gnus-desktop-notify.el (require): Require notifications first,
falling back to alert.
(gnus-desktop-notify-function): Test for the notifications feature
first.  Mention `notifications' is the default in its doc.
---
 gnus-desktop-notify.el | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/gnus-desktop-notify.el b/gnus-desktop-notify.el
index 97e65f3..a12e444 100644
--- a/gnus-desktop-notify.el
+++ b/gnus-desktop-notify.el
@@ -26,6 +26,11 @@
 
 ;;; Change Log:
 
+;; 1.5:
+;; * Revert to use the `notifications' library by default if
+;;   available.  The `alert' library doesn't do anything useful in its
+;;   default configuration.
+;;
 ;; 1.4:
 ;; * Use `alert' package by default if available (`gnus-desktop-notify-alert').
 ;;
@@ -83,8 +88,8 @@
 (require 'format-spec)
 (require 'gnus-group)
 
-(unless (require 'alert nil t)
-  (require 'notifications nil t))
+(unless (require 'notifications nil t)
+  (require 'alert nil t))
 
 (declare-function alert "alert")
 (declare-function notifications-notify "notifications")
@@ -96,8 +101,8 @@
   :group 'gnus)
 
 (defcustom gnus-desktop-notify-function
-  (cond ((featurep 'alert)         'gnus-desktop-notify-alert)
-        ((featurep 'notifications) 'gnus-desktop-notify-dbus)
+  (cond ((featurep 'notifications) 'gnus-desktop-notify-dbus)
+        ((featurep 'alert)         'gnus-desktop-notify-alert)
         (t                         'gnus-desktop-notify-send))
   "Notification backend used when a group receives new messages.
 The backend is passed the notification content as a single,
@@ -109,8 +114,8 @@ or fallback to the generic `gnus-desktop-notify-send' otherwise.
 
 The following functions are available (whose documentation see):
 
+`gnus-desktop-notify-dbus':  Use the `notifications' library (default).
 `gnus-desktop-notify-alert': Use the `alert' library.
-`gnus-desktop-notify-dbus':  Use the `notifications' library.
 `gnus-desktop-notify-send':  Call the `notify-send' program.
 `gnus-desktop-notify-exec':  Call a customizable program."
   :type 'function)
-- 
GitLab


D gnu/packages/patches/emacs-gnus-desktop-notify-rescan.patch => gnu/packages/patches/emacs-gnus-desktop-notify-rescan.patch +0 -37
@@ 1,37 0,0 @@
Upstream-status: https://gitlab.com/wavexx/gnus-desktop-notify.el/-/merge_requests/16

diff --git a/README.rst b/README.rst
index 4cacdcb..150a2c2 100644
--- a/README.rst
+++ b/README.rst
@@ -18,7 +18,7 @@ new messages are received. For basic usage, to be used in conjunction with
 
   (require 'gnus-desktop-notify)
   (gnus-desktop-notify-mode)
-  (gnus-demon-add-scanmail)
+  (gnus-demon-add-rescan)
 
 into your ``.gnus`` file. The default is to use alert_ if available, which
 works on every operating system and allows the user to customize the
@@ -52,7 +52,7 @@ follows:
   (setq gnus-desktop-notify-function 'gnus-desktop-notify-exec
 	gnus-desktop-notify-exec-program "growlnotify -a Emacs.app -m")
   (gnus-desktop-notify-mode)
-  (gnus-demon-add-scanmail)
+  (gnus-demon-add-rescan)
 
 
 Advanced setup
diff --git a/gnus-desktop-notify.el b/gnus-desktop-notify.el
index 97e65f3..3153807 100644
--- a/gnus-desktop-notify.el
+++ b/gnus-desktop-notify.el
@@ -50,7 +50,7 @@
 ;;
 ;; (require 'gnus-desktop-notify)
 ;; (gnus-desktop-notify-mode)
-;; (gnus-demon-add-scanmail)
+;; (gnus-demon-add-rescan)
 ;;
 ;; into your ``.gnus`` file. The default is to use `alert' if available, which
 ;; works on every operating system and allows the user to customize the

D gnu/packages/patches/libjami-ac-config-files.patch => gnu/packages/patches/libjami-ac-config-files.patch +0 -52
@@ 1,52 0,0 @@
Forwarded here: https://lists.gnu.org/archive/html/jami/2024-01/msg00003.html

From 20a1702d881b381979d31c456f1b8cf5e0f728ad Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Sun, 7 Jan 2024 16:40:41 -0500
Subject: [PATCH] configure.ac: Expand AC_CONFIG_FILES to fix a race.

The commands apparently run for each file listed, or something
similar, leading to:

  configure: creating ./config.status
  config.status: creating test/agent/Makefile
  chmod: cannot access 'test/agent/pre-inst-env': No such file or directory
  chmod: cannot access 'test/agent/scenarios/bulk-calls/run-scenario': No such file or directory
  config.status: creating test/agent/pre-inst-env
  chmod: cannot access 'test/agent/scenarios/bulk-calls/run-scenario': No such file or directory

* configure.ac [ENABLE_AGENT]: Separate AC_CONFIG_FILES uses per file.

Series-to: jami@gnu.org
Series-postfix: daemon
Change-Id: Ib283955b73540248e09bf31ef44ef3d178b216fa
---
 configure.ac | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index cdea5ff1c..2ab96d817 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,11 +61,11 @@ AC_ARG_ENABLE([agent],
     [Build agent]))
 AM_CONDITIONAL([ENABLE_AGENT], [test "x$enable_agent" = "xyes"])
 AM_COND_IF([ENABLE_AGENT],
-           [AC_CONFIG_FILES([test/agent/Makefile
-                             test/agent/pre-inst-env:test/agent/build-aux/pre-inst-env.in
-                             test/agent/scenarios/bulk-calls/run-scenario],
-                            [chmod +x test/agent/pre-inst-env
-                             chmod +x test/agent/scenarios/bulk-calls/run-scenario])])
+  [AC_CONFIG_FILES([test/agent/Makefile])
+   AC_CONFIG_FILES([test/agent/pre-inst-env:test/agent/build-aux/pre-inst-env.in],
+                   [chmod +x test/agent/pre-inst-env])
+   AC_CONFIG_FILES([test/agent/scenarios/bulk-calls/run-scenario],
+                   [chmod +x test/agent/scenarios/bulk-calls/run-scenario])])
 
 AC_ARG_ENABLE([tracepoints], AS_HELP_STRING([--enable-tracepoints], [Enable tracepoints]))
 

base-commit: e246fb2e090c9b3de55e2d455eee5a6f05a5b286
-- 
2.41.0


D gnu/packages/patches/libjami-sdbus-cpp-v2.patch => gnu/packages/patches/libjami-sdbus-cpp-v2.patch +0 -144
@@ 1,144 0,0 @@
Upstream-status: <https://review.jami.net/c/jami-daemon/+/31504>

diff --git a/bin/dbus/dbuscallmanager.hpp b/bin/dbus/dbuscallmanager.hpp
index b79e0cd6f..918d8bc30 100644
--- a/bin/dbus/dbuscallmanager.hpp
+++ b/bin/dbus/dbuscallmanager.hpp
@@ -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();
diff --git a/bin/dbus/dbusconfigurationmanager.hpp b/bin/dbus/dbusconfigurationmanager.hpp
index a6bb8e4e9..895c7690d 100644
--- a/bin/dbus/dbusconfigurationmanager.hpp
+++ b/bin/dbus/dbusconfigurationmanager.hpp
@@ -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();
diff --git a/bin/dbus/dbusinstance.hpp b/bin/dbus/dbusinstance.hpp
index d45c033e1..184fd2c7d 100644
--- a/bin/dbus/dbusinstance.hpp
+++ b/bin/dbus/dbusinstance.hpp
@@ -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();
     }
diff --git a/bin/dbus/dbuspluginmanagerinterface.hpp b/bin/dbus/dbuspluginmanagerinterface.hpp
index c063a9903..132674e9f 100644
--- a/bin/dbus/dbuspluginmanagerinterface.hpp
+++ b/bin/dbus/dbuspluginmanagerinterface.hpp
@@ -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();
diff --git a/bin/dbus/dbuspresencemanager.hpp b/bin/dbus/dbuspresencemanager.hpp
index ca8ba7f2a..27b93eee4 100644
--- a/bin/dbus/dbuspresencemanager.hpp
+++ b/bin/dbus/dbuspresencemanager.hpp
@@ -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();
diff --git a/bin/dbus/dbusvideomanager.hpp b/bin/dbus/dbusvideomanager.hpp
index 7fbca2492..96f73e99b 100644
--- a/bin/dbus/dbusvideomanager.hpp
+++ b/bin/dbus/dbusvideomanager.hpp
@@ -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();
diff --git a/bin/dbus/main.cpp b/bin/dbus/main.cpp
index ee8a349cc..4d7adc95e 100644
--- a/bin/dbus/main.cpp
+++ b/bin/dbus/main.cpp
@@ -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);
diff --git a/configure.ac b/configure.ac
index 66e52ee62..68de32497 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
diff --git a/contrib/src/sdbus-cpp/SHA512SUMS b/contrib/src/sdbus-cpp/SHA512SUMS
index a48ebec1c..009d0b81b 100644
--- a/contrib/src/sdbus-cpp/SHA512SUMS
+++ b/contrib/src/sdbus-cpp/SHA512SUMS
@@ -1 +1 @@
-dab2c4d9a5ea6d626672a5a6ee6f3490c60c6fdd160769801a4d6b4cf3df4983fad57ff0230132a5d637ec78a55993200ce217fa89461016e101865cc2777d7d  sdbus-cpp-1.2.0.tar.gz
+4247d49f0d5231e2768c0c96fa9c266bbcc340292c9c3d748f9c37ff992b82301faea798300f916e9a5c992d77adfe56186866c91a4c7d4157750ff09ba5a047  sdbus-cpp-2.1.0.tar.gz
diff --git a/contrib/src/sdbus-cpp/rules.mak b/contrib/src/sdbus-cpp/rules.mak
index 397d18d3b..d00fa97ca 100644
--- a/contrib/src/sdbus-cpp/rules.mak
+++ b/contrib/src/sdbus-cpp/rules.mak
@@ -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))