From patchwork Mon Sep 11 21:26:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 53765 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 3D2A027BBEC; Tue, 12 Sep 2023 20:18:35 +0100 (BST) 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 9266E27BBE2 for ; Tue, 12 Sep 2023 20:18:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qg8tc-0004Aa-0R; Tue, 12 Sep 2023 15:18:00 -0400 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 1qg8tZ-00049r-Uu for guix-patches@gnu.org; Tue, 12 Sep 2023 15:17:57 -0400 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 1qg8tZ-0007Ni-Lo for guix-patches@gnu.org; Tue, 12 Sep 2023 15:17:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qg8te-0006Hy-An for guix-patches@gnu.org; Tue, 12 Sep 2023 15:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65879] [gnome-team v2 1/1] gnu: gnome-control-center: Update to 44.3. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Sep 2023 19:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65879 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 65879@debbugs.gnu.org Cc: rg@raghavgururajan.name, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 65879-submit@debbugs.gnu.org id=B65879.169454627624156 (code B ref 65879); Tue, 12 Sep 2023 19:18:02 +0000 Received: (at 65879) by debbugs.gnu.org; 12 Sep 2023 19:17:56 +0000 Received: from localhost ([127.0.0.1]:60090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qg8tO-0006HN-NK for submit@debbugs.gnu.org; Tue, 12 Sep 2023 15:17:56 -0400 Received: from planete-kraus.eu ([89.234.140.182]:32996) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qg8tG-0006GS-Eo for 65879@debbugs.gnu.org; Tue, 12 Sep 2023 15:17:44 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 61d68dd7; Tue, 12 Sep 2023 19:17:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniA; bh=9V+XSS0lolf8lcTK7bIiC8GnXrA=; b=m nhb65eCnD4yPNnOnM9csiXVtVFP4RsXlZX3BjAvup9VnnZIDaFPr9MLyibd9ZBVK xrXFs+lO/gr1IXpDhx/pEOrZ8eqEQub5b/DMsftq6SnkoPGZvktaUC+kRYfgiu65 DqX0hKCUsVOePHsk85Ml/DQR7wBDGu/d3cQnqOCD73dZ6U4HtVR9nagKKSPLSORM H/PQqQZOYGrUuZDMSVkoqCss57BMU/zJtoM6IbuV1gTI/ikHlrVU0GX4wJv4JyXV LThiBFM3l532tVk/HPz374po/h6B1TSTzvrKGyXT01d+19CC/U2Qegbww+QVF02p 84NlHyrXrwLuwKSS3JBJw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id c8ec2ba2 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 12 Sep 2023 19:17:32 +0000 (UTC) Message-ID: <621017892c8ae986bcf37eee9cd3be8de917efbb.1694545220.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Mon, 11 Sep 2023 23:26:20 +0200 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 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 * gnu/packages/gnome.scm (gnome-control-center): Update to 44.3. [#:phases]: Upstream already uses /run/setuid-programs/passwd. Querying the GNOME version is done through dbus now. Disable the network panel test, because it wants to connect to the system session. [#:phase] : The icon cache update should be disabled differently. [native-inputs]: Add setxkbmap. * gnu/packages/patches/gnome-control-center-firmware-security.patch: Disable the firmware security panel. * gnu/packages/gnome.scm (gnome-control-center): Apply the patch to disable the firmware security panel. * gnu/local.mk (dist_patch_DATA): Distribute the patch to disable the firmware security panel. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 27 ++++++++------- ...ome-control-center-firmware-security.patch | 33 +++++++++++++++++++ 3 files changed, 49 insertions(+), 12 deletions(-) create mode 100644 gnu/packages/patches/gnome-control-center-firmware-security.patch diff --git a/gnu/local.mk b/gnu/local.mk index 69be1a07c7..da573addc9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1299,6 +1299,7 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnash-fix-giflib-version.patch \ %D%/packages/patches/gnome-2048-fix-positional-argument.patch \ + %D%/packages/patches/gnome-control-center-firmware-security.patch \ %D%/packages/patches/gnome-control-center-libexecdir.patch \ %D%/packages/patches/gnome-online-miners-tracker-3.patch \ %D%/packages/patches/gnome-settings-daemon-gc.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ad118090eb..acc30db425 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9003,7 +9003,7 @@ (define-public gnome-bluetooth (define-public gnome-control-center (package (name "gnome-control-center") - (version "42.4") + (version "44.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9011,7 +9011,10 @@ (define-public gnome-control-center name "-" version ".tar.xz")) (sha256 (base32 - "1ln5rch6zbfh3vl2nnnmw39bylgg38rin6xp7ra0ra4ay3wv3gvs")))) + "0yhcm0c0ghkfqswqlkwcln3jpaz6jzvqaph2c3lgmv635w2nash6")) + (patches + (search-patches + "gnome-control-center-firmware-security.patch")))) (build-system meson-build-system) (arguments (list @@ -9036,18 +9039,17 @@ (define-public gnome-control-center (("\"nm-connection-editor") (string-append "\"" (search-input-file inputs "bin/nm-connection-editor")))) - (substitute* "panels/user-accounts/run-passwd.c" - (("/usr/bin/passwd") - "/run/setuid-programs/passwd")) - (substitute* "panels/info-overview/cc-info-overview-panel.c" - (("DATADIR \"/gnome/gnome-version.xml\"") - (format #f "~s" (search-input-file - inputs "share/gnome/gnome-version.xml")))))) + + ;; This test wants to connect to the system dbus session + (substitute* "tests/meson.build" + (("subdir\\('network'\\)") + "# subdir('network')")))) (add-after 'unpack 'skip-gtk-update-icon-cache ;; Don't create 'icon-theme.cache'. (lambda _ - (substitute* "build-aux/meson/meson_post_install.py" - (("gtk-update-icon-cache") (which "true")))))))) + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false"))))))) (native-inputs (list docbook-xsl gettext-minimal @@ -9056,7 +9058,8 @@ (define-public gnome-control-center pkg-config python python-dbusmock - xorg-server-for-tests)) + xorg-server-for-tests + setxkbmap)) (inputs (list accountsservice colord-gtk diff --git a/gnu/packages/patches/gnome-control-center-firmware-security.patch b/gnu/packages/patches/gnome-control-center-firmware-security.patch new file mode 100644 index 0000000000..fd9d7b8ff4 --- /dev/null +++ b/gnu/packages/patches/gnome-control-center-firmware-security.patch @@ -0,0 +1,33 @@ +From: Jeremy Bicha +Date: Mon, 22 Aug 2022 08:31:15 -0400 +Subject: firmware-security: Disable + +Not yet useful enough to justify its inclusion by default here + +You can get the same info by running +fwupdmgr security + +If you drop this patch, add a Depends: fwupd [linux-any] + +https://launchpad.net/bugs/1987162 + +https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1938 + +[Stolen from the debian package] +--- + shell/cc-panel-loader.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c +index 17f9601..1b819a5 100644 +--- a/shell/cc-panel-loader.c ++++ b/shell/cc-panel-loader.c +@@ -113,7 +113,7 @@ static CcPanelLoaderVtable default_panels[] = + PANEL_TYPE("info-overview", cc_info_overview_panel_get_type, NULL), + PANEL_TYPE("keyboard", cc_keyboard_panel_get_type, NULL), + PANEL_TYPE("location", cc_location_panel_get_type, NULL), +- PANEL_TYPE("firmware-security",cc_firmware_security_panel_get_type, cc_firmware_security_panel_static_init_func), ++ // PANEL_TYPE("firmware-security",cc_firmware_security_panel_get_type, cc_firmware_security_panel_static_init_func), + PANEL_TYPE("microphone", cc_microphone_panel_get_type, NULL), + PANEL_TYPE("mouse", cc_mouse_panel_get_type, NULL), + PANEL_TYPE("multitasking", cc_multitasking_panel_get_type, NULL),