GNU bug report logs - #67932
[PATCH gnome-team] gnu: accountsservice: Update to 23.13.9.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 67932 in the body.
You can then email your comments to 67932 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Vivien Kraus <vivien <at> planete-kraus.eu>
To: guix-patches <at> gnu.org
Subject: [PATCH gnome-team] gnu: accountsservice: Update to 23.13.9.
Date: Sat, 2 Dec 2023 15:04:51 +0100

The package provides a patch to update C code. However, upstream changed the C
code style. Now, the patch fails to apply. So, the patch needs to be re-styled
too.

* 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
---
Dear guix,

#67582 has been merged, but this patch was forgotten :(

Thus, accountsservice fails to build on gnome-team.

We had a short discussion about this patch: http://logs.guix.gnu.org/guix/2023-12-02.log#154150

What do you think?

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.

Message #10 received at 67932-done <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Vivien Kraus <vivien <at> planete-kraus.eu>, 67932-done <at> debbugs.gnu.org
Subject: Re: [PATCH gnome-team] gnu: accountsservice: Update to 23.13.9.
Date: Fri, 22 Dec 2023 08:48:45 +0100

Am Samstag, dem 02.12.2023 um 15:04 +0100 schrieb Vivien Kraus:
> The package provides a patch to update C code. However, upstream
> changed the C code style. Now, the patch fails to apply. So, the
> patch needs to be re-styled too.
> 
> * 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
> ---
Reworded and pushed.

Thanks

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.