[bug#67582] [PATCH gnome-team 0/4] Update python-dbusmock

[Vivien Kraus via Guix-patches via <guix-patches@gnu.org>]

[-- Attachment #1: Type: text/plain, Size: 212 bytes --]

Hello!

Thank you for this much needed update!

I can however anticipate a QA failure, as accountsservice is too old. I
don’t want to confuse QA, so the patch is an attachment.

Best regards,

Vivien

[-- Attachment #2: 0001-gnu-accountsservice-Update-to-23.13.9.patch --]
[-- Type: text/x-patch, Size: 3616 bytes --]

From bc04d8ddae4cdc7caf2e30df5811b4c94432239a Mon Sep 17 00:00:00 2001
Message-ID: <bc04d8ddae4cdc7caf2e30df5811b4c94432239a.1701526104.git.vivien@planete-kraus.eu>
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sat, 2 Dec 2023 15:04:51 +0100
Subject: [PATCH gnome-team] gnu: accountsservice: Update to 23.13.9.
To: 67582@debbugs.gnu.org
Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name

The style of the C code has changed, so the patch does not apply anymore.

* gnu/packages/freedesktop.scm (accountsservice): Update to 23.13.9.
[native-inuputs]: Add glibc-locales.
* gnu/packages/patches/accountsservice-extensions.patch: Update.

Change-Id: I19678b5ce36549a832099109b13cdaf91539b20a
---

Thank you for this much needed update!

accountsservice fails to build now though, but we can fix it by upgrading it.

Best regards,

Vivien

 gnu/packages/freedesktop.scm                          | 5 +++--
 gnu/packages/patches/accountsservice-extensions.patch | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 25b7998d05..a934b3ac17 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1746,7 +1746,7 @@ (define-public udisks
 (define-public accountsservice
   (package
     (name "accountsservice")
-    (version "22.08.8")
+    (version "23.13.9")
     (source
      (origin
        (method url-fetch)
@@ -1754,7 +1754,7 @@ (define-public accountsservice
                            "accountsservice/accountsservice-"
                            version ".tar.xz"))
        (sha256
-        (base32 "14d3lwik048h62qrzg1djdd2sqmxf3m1r859730pvzhrd6krg6ch"))
+        (base32 "0kwjkff5m7gnzpns6cy27az90w7sxzwzygyzwy90kyi4mvg4rnmd"))
        (patches (search-patches "accountsservice-extensions.patch"))))
     (build-system meson-build-system)
     (arguments
@@ -1795,6 +1795,7 @@ (define-public accountsservice
            docbook-xsl
            gettext-minimal
            `(,glib "bin")               ; for gdbus-codegen, etc.
+           glibc-locales                    ;for tests
            gobject-introspection
            gtk-doc
            libxml2                      ;for XML_CATALOG_FILES
diff --git a/gnu/packages/patches/accountsservice-extensions.patch b/gnu/packages/patches/accountsservice-extensions.patch
index 2cfab580e3..8027a28a44 100644
--- a/gnu/packages/patches/accountsservice-extensions.patch
+++ b/gnu/packages/patches/accountsservice-extensions.patch
@@ -5,7 +5,7 @@ diff --git a/src/extensions.c b/src/extensions.c
 index 038dcb2..830465d 100644
 --- a/src/extensions.c
 +++ b/src/extensions.c
-@@ -121,16 +121,7 @@ daemon_read_extension_directory (GHashTable  *ifaces,
+@@ -122,15 +122,7 @@ daemon_read_extension_directory (GHashTable  *ifaces,
                          continue;
                  }
  
@@ -13,8 +13,7 @@ index 038dcb2..830465d 100644
 -                const gchar * const prefix = "../../dbus-1/interfaces/";
 -                if (g_str_has_prefix (symlink, prefix) && g_str_equal (symlink + strlen (prefix), name)) {
 -                        daemon_read_extension_file (ifaces, filename);
--                }
--                else {
+-                } else {
 -                        g_warning ("Found accounts service vendor extension symlink %s, but it must be exactly "
 -                                   "equal to '../../dbus-1/interfaces/%s' for forwards-compatibility reasons.",
 -                                   filename, name);

base-commit: e21f0cb7b7a87992004193cd56638ad961fe5928
-- 
2.41.0