From patchwork Sat Dec 2 14:04:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 57930 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 27F5427BBEA; Wed, 20 Dec 2023 16:02:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 308E027BBE2 for ; Wed, 20 Dec 2023 16:02:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFz1H-00029Q-Kr; Wed, 20 Dec 2023 11:02:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rFz1G-00029D-8N for guix-patches@gnu.org; Wed, 20 Dec 2023 11:02:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rFz1F-00015x-Vt for guix-patches@gnu.org; Wed, 20 Dec 2023 11:02:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFz1G-00064m-JB; Wed, 20 Dec 2023 11:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67932] [PATCH gnome-team] gnu: accountsservice: Update to 23.13.9. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Wed, 20 Dec 2023 16:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67932 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67932@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name Received: via spool by submit@debbugs.gnu.org id=B.170308806722168 (code B ref -1); Wed, 20 Dec 2023 16:02:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 Dec 2023 16:01:07 +0000 Received: from localhost ([127.0.0.1]:41655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFz0M-0005kZ-Q7 for submit@debbugs.gnu.org; Wed, 20 Dec 2023 11:01:07 -0500 Received: from lists.gnu.org ([2001:470:142::17]:41398) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFz0K-0005X0-2t for submit@debbugs.gnu.org; Wed, 20 Dec 2023 11:01:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rFz09-00023O-Ur for guix-patches@gnu.org; Wed, 20 Dec 2023 11:00:54 -0500 Received: from planete-kraus.eu ([89.234.140.182]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1rFz07-0000CH-OD for guix-patches@gnu.org; Wed, 20 Dec 2023 11:00:53 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id c32c78f7 for ; Wed, 20 Dec 2023 16:00:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:from:date:subject:to:mime-version; s=albinoniB; bh=Lg w094Itck1Jcs/Bm5wpf+FoVaA=; b=dT44qX1SNIfwr8WOUI0oxTTN+SI/F1w19n qr1uoz3X2atiCoBMaSQeZhuPzVIMHSQB5MpHRr5i4ZHrEQJ5Nvm7rpFLzO/Q7YGw AP1NKbW5sN9a7Dey2/NUkFC1jPiJZFfRXP2i9dyhn4da1Ull7LeeJsAtGmVA7tR3 mtdB8zNJt3hLrN3pXo0MvyPbw/IV3x3R5jMFFbdtJ2JTtcOcf9MWMMkPT35FLjam ip28hQJrA6JYrn919gAwDd540x7R11ErsiHBvWhTa/H44Q8riTzK7lQOjmsmEE0C CXbfthR+lir2+hddibEbiCQTSU5RN7gGq13M9z6gDcZWVEk/HWGQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 3349b20b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for ; Wed, 20 Dec 2023 16:00:46 +0000 (UTC) Message-ID: Date: Sat, 2 Dec 2023 15:04:51 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 Received-SPF: pass client-ip=89.234.140.182; envelope-from=vivien@planete-kraus.eu; helo=planete-kraus.eu X-Spam_score_int: 13 X-Spam_score: 1.3 X-Spam_bar: + X-Spam_report: (1.3 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_96_XX=3.405, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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(-) base-commit: e21f0cb7b7a87992004193cd56638ad961fe5928 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);