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: 53981 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 DF1C727BBE9; Sun, 17 Sep 2023 13:59:39 +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=unavailable 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 2F9F127BBE2 for ; Sun, 17 Sep 2023 13:59:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhrMa-0004cr-Oi; Sun, 17 Sep 2023 08:59: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 1qhrMX-0004bv-4U for guix-patches@gnu.org; Sun, 17 Sep 2023 08:58:58 -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 1qhrMW-0006c1-3H for guix-patches@gnu.org; Sun, 17 Sep 2023 08:58:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhrMd-0007rz-MH for guix-patches@gnu.org; Sun, 17 Sep 2023 08:59:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65879] [PATCH gnome-team v3 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: Sun, 17 Sep 2023 12:59:03 +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: Liliana Marie Prikler ,65879@debbugs.gnu.org Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com Received: via spool by 65879-submit@debbugs.gnu.org id=B65879.169495550330158 (code B ref 65879); Sun, 17 Sep 2023 12:59:03 +0000 Received: (at 65879) by debbugs.gnu.org; 17 Sep 2023 12:58:23 +0000 Received: from localhost ([127.0.0.1]:49357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhrLy-0007qJ-KA for submit@debbugs.gnu.org; Sun, 17 Sep 2023 08:58:23 -0400 Received: from planete-kraus.eu ([89.234.140.182]:51706) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhrLw-0007pa-Gn for 65879@debbugs.gnu.org; Sun, 17 Sep 2023 08:58:21 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 2146c3ad; Sun, 17 Sep 2023 12:58:11 +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=ZLEF7thj6AA9mQEZ14n4ZrFhGUk=; b=L D6VENyyDUyo/QXB53zbKWJx87eLZ7RF7z4NtXMTLvSZQRQFAhcfrBz0xxIR9AzCM +TVDrk25pGfgO0fW3JKlEMrz7JLM25MxDm5ZILLwRxJxmNbq4lSznfhg8atnRblY bxParmeaylBg2Qzy2QU+yyxV3MeAY8K0zBPdUfiJ4x/oUJoItvpTzBdTSkKdtxns Ok6MOgIOiHkIqt5q8SsGp++2029N4Q4/ngwV2vh+zW8o9dK87YJXpHHJfbIlXaJy miaEv+qiI3Vu9nw87r2j7DsROq7lnCg7SW4nGPh8ED6XkcqkSGchci8Z+C1pivtU Wvsy+23VifA3DEPq65APQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 7667b9ad (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 17 Sep 2023 12:58:11 +0000 (UTC) Message-ID: <1361e95b870e39e696cdd8bb336b9a8250b1496a.1694955414.git.vivien@planete-kraus.eu> In-Reply-To: References: <5774f857a0541540adec552fc79734c9d7114e4b.camel@gmail.com> 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. Set up the test environment as gnome-shell, and run tests under dbus-run-session. [#:phases] : The icon cache update should be disabled differently. [#:phases] : Override the check phase to run under dbus. [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 | 43 +++++++++++++------ ...ome-control-center-firmware-security.patch | 33 ++++++++++++++ 3 files changed, 64 insertions(+), 13 deletions(-) create mode 100644 gnu/packages/patches/gnome-control-center-firmware-security.patch diff --git a/gnu/local.mk b/gnu/local.mk index db21feb507..96560d72e7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1309,6 +1309,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 2077478ff2..ff36967194 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9016,7 +9016,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 "/" @@ -9024,7 +9024,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 @@ -9048,19 +9051,32 @@ (define-public gnome-control-center "panels/network/connection-editor/net-connection-editor.c") (("\"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")))))) + inputs "bin/nm-connection-editor")))))) (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")))) + (replace 'check + (lambda* (#:key parallel-tests? tests? #:allow-other-keys) + (when tests? + ;; Tests require a running X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + ;; For the missing /var/lib/dbus/machine-id + (setenv "DBUS_FATAL_WARNINGS" "0") + (setenv "NO_AT_BRIDGE" "1") + (setenv "HOME" "/tmp") + (setenv "XDG_RUNTIME_DIR" (string-append (getcwd) "/runtime-dir")) + (mkdir (getenv "XDG_RUNTIME_DIR")) + (chmod (getenv "XDG_RUNTIME_DIR") #o700) + (setenv "MESON_TESTTHREADS" + (if parallel-tests? + (number->string (parallel-job-count)) + "1")) + (invoke "dbus-run-session" "--" + "meson" "test" "-t" "0"))))))) (native-inputs (list docbook-xsl gettext-minimal @@ -9069,7 +9085,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),