From patchwork Sat Dec 2 14:18:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 57211 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 95EDC27BBE9; Sat, 2 Dec 2023 14:19:15 +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 50F4A16653 for ; Sat, 2 Dec 2023 14:19:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9Qpa-0005st-30; Sat, 02 Dec 2023 09:18:54 -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 1r9QpZ-0005sa-07 for guix-patches@gnu.org; Sat, 02 Dec 2023 09:18:53 -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 1r9QpY-0005eh-OC for guix-patches@gnu.org; Sat, 02 Dec 2023 09:18:52 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9Qpi-00009I-2C for guix-patches@gnu.org; Sat, 02 Dec 2023 09:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67582] [PATCH gnome-team 0/4] Update python-dbusmock References: In-Reply-To: Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Dec 2023 14:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67582 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67582@debbugs.gnu.org Received: via spool by 67582-submit@debbugs.gnu.org id=B67582.1701526736554 (code B ref 67582); Sat, 02 Dec 2023 14:19:02 +0000 Received: (at 67582) by debbugs.gnu.org; 2 Dec 2023 14:18:56 +0000 Received: from localhost ([127.0.0.1]:56971 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9Qpb-00008r-EA for submit@debbugs.gnu.org; Sat, 02 Dec 2023 09:18:55 -0500 Received: from planete-kraus.eu ([89.234.140.182]:50742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9QpZ-00008i-G6 for 67582@debbugs.gnu.org; Sat, 02 Dec 2023 09:18:54 -0500 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id fa40f858 for <67582@debbugs.gnu.org>; Sat, 2 Dec 2023 14:18:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:subject:from:to:date:content-type:mime-version; s= albinoniB; bh=hiwVdhBDglKxlnClVng6DXsD94A=; b=PiXAcy+/5y1ejXnj+U bvm6Le8qkIpWjzSZK+fnkuM/Sp5xg2RyECN4VzSh5tviB8tfVNzJT3k1QDKRZHEF JYOcbuDCSFehkQpp950iLdmefnCA+ADlNolqZ5dMzxjU2Z3fw50nss8cKrXpffgR tkiuRuZyfPqV9D+NTl1jInoj0/KQhkeCQh3lMu0WOtbyerMuX1+e3w8EyN+u+gSL 4zVXG/BrK11z+gZhet5zRhchPo6Sckg+x/ZrCK5iqY4hSpsmYIauWckLknolTdV9 hpl3Gi+ulzgeI51W0u5jyg81Ao6RT4ep7f8An8t+xo3v7Q22xS84hdBLZhn3lSmn 0cHg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 137af7b9 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <67582@debbugs.gnu.org>; Sat, 2 Dec 2023 14:18:41 +0000 (UTC) Message-ID: Date: Sat, 02 Dec 2023 15:18:39 +0100 User-Agent: Evolution 3.46.4 MIME-Version: 1.0 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 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 From bc04d8ddae4cdc7caf2e30df5811b4c94432239a Mon Sep 17 00:00:00 2001 Message-ID: From: Vivien Kraus 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