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: 53988 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 4552027BBEA; Sun, 17 Sep 2023 15:51:20 +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 5815427BBE2 for ; Sun, 17 Sep 2023 15:51:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qht6v-0003Dc-Ie; Sun, 17 Sep 2023 10:50:57 -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 1qht6t-0003Bj-DU for guix-patches@gnu.org; Sun, 17 Sep 2023 10:50:55 -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 1qht6t-0005Qb-5a for guix-patches@gnu.org; Sun, 17 Sep 2023 10:50:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qht70-0008E5-QQ for guix-patches@gnu.org; Sun, 17 Sep 2023 10:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65879] [PATCH gnome-team v4 2/2] 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 14:51: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: 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.169496225931597 (code B ref 65879); Sun, 17 Sep 2023 14:51:02 +0000 Received: (at 65879) by debbugs.gnu.org; 17 Sep 2023 14:50:59 +0000 Received: from localhost ([127.0.0.1]:51099 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qht6w-0008DY-Rp for submit@debbugs.gnu.org; Sun, 17 Sep 2023 10:50:59 -0400 Received: from planete-kraus.eu ([89.234.140.182]:44532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qht6p-0008Co-PT for 65879@debbugs.gnu.org; Sun, 17 Sep 2023 10:50:53 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id b402ad7a; Sun, 17 Sep 2023 14:50:43 +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=7xrF8HLqNxPUbN1v3xhpe9Z6vRM=; b=0 uDAKZruiDQccV15iAObIkigoqsLW+I1MuT0pNdQcEY/8H/DXPs06vcdXJF5ICDEi nMe8a+FO8A7jurPNoh/pMYVSsp3HmRpzlvFVkvo8i5m5iUDhaQ8W+hw4RC14GSAh 6m8DDSD1Io65TVOMY/JmWmkDsoMAZIqMQdGUU2bFB/pQZfRpjxUOzqquAXLIqr5K E/E0chw18yBA3xURN/Du+CESJ5w+GyFHZMCBSFnpDmuvQnDkvDy/PwUjDFAk1mJa BsSvLg2V0+DAaeuWM2IhSfe6S2DGbG2i5tzvbvcxXjmlIYisx6NQaWr56vZQyqv5 aPLgWCnR0pmYfYwM8vhzA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ed3a72d0 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 17 Sep 2023 14:50:43 +0000 (UTC) Message-ID: <9728c2fab3626a2aeba39a7d3e78ec66b7f796ce.1694959943.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 Some previous fixes have been merged upstream. The gnome version is now read from a dbus service, and passwd is already searched in /run/setuid-programs. In order to let the tests run, we use the same tests environment as gnome-shell. * gnu/packages/gnome.scm (gnome-control-center): Update to 44.3. Apply gnome-control-center-firmware-security.patch. [#:phases]: Adjust accordingly. : Adjust accordingly. : Override the check phase to run under dbus. [native-inputs]: Add setxkbmap. --- gnu/packages/gnome.scm | 43 +++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) 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