From: Vivien Kraus via Guix-patches via <guix-patches@gnu.org>
To: Liliana Marie Prikler <liliana.prikler@gmail.com>,65879@debbugs.gnu.org
Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com
Subject: [bug#65879] [PATCH gnome-team v4 2/2] gnu: gnome-control-center: Update to 44.3.
Date: Mon, 11 Sep 2023 23:26:20 +0200 [thread overview]
Message-ID: <9728c2fab3626a2aeba39a7d3e78ec66b7f796ce.1694959943.git.vivien@planete-kraus.eu> (raw)
In-Reply-To: <cover.1694959943.git.vivien@planete-kraus.eu>
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]<patch-paths>: Adjust accordingly.
<skip-gtk-update-icon-cache>: Adjust accordingly.
<check>: 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
--
2.41.0
next prev parent reply other threads:[~2023-09-17 14:51 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-11 21:31 [bug#65879] [gnome-team 0/1] Update gnome-control-center Vivien Kraus via Guix-patches via
2023-09-11 21:26 ` [bug#65879] [gnome-team 1/1] gnu: gnome-control-center: Update to 44.3 Vivien Kraus via Guix-patches via
2023-09-12 4:15 ` Liliana Marie Prikler
2023-09-12 10:03 ` Vivien Kraus via Guix-patches via
2023-09-12 18:25 ` Liliana Marie Prikler
2023-09-12 19:00 ` [bug#65879] [gnome-team v2 0/1] Still failing: Updage gnome-control-center and disable the firmware security panel Vivien Kraus via Guix-patches via
2023-09-11 21:26 ` [bug#65879] [gnome-team v2 1/1] gnu: gnome-control-center: Update to 44.3 Vivien Kraus via Guix-patches via
2023-09-12 20:41 ` [bug#65879] [gnome-team v2 0/1] Still failing: Updage gnome-control-center and disable the firmware security panel Liliana Marie Prikler
2023-09-12 22:31 ` Vivien Kraus via Guix-patches via
2023-09-15 22:13 ` Vivien Kraus via Guix-patches via
2023-09-16 4:02 ` Liliana Marie Prikler
2023-09-17 12:56 ` [bug#65879] [PATCH gnome-team v3 0/1] Gnome-control-center passes all tests, but still crashes Vivien Kraus via Guix-patches via
2023-09-11 21:26 ` [bug#65879] [PATCH gnome-team v3 1/1] gnu: gnome-control-center: Update to 44.3 Vivien Kraus via Guix-patches via
2023-09-17 13:37 ` Liliana Marie Prikler
2023-09-17 14:12 ` [bug#65879] [PATCH gnome-team v4 0/2] Commit style update − still failing Vivien Kraus via Guix-patches via
2023-09-11 21:26 ` Vivien Kraus via Guix-patches via [this message]
2023-10-09 20:38 ` bug#65879: [PATCH gnome-team v4 2/2] gnu: gnome-control-center: Update to 44.3 Liliana Marie Prikler
2023-09-17 14:08 ` [bug#65879] [PATCH gnome-team v4 1/2] gnu: gnome-control-center: Add gnome-control-center-firmware-security.patch Vivien Kraus via Guix-patches via
2023-09-17 16:23 ` [bug#65879] [PATCH gnome-team v4 0/2] Commit style update − still failing Liliana Marie Prikler
2023-10-08 12:04 ` [bug#65879] [gnome-team 0/1] Update gnome-control-center Vivien Kraus via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9728c2fab3626a2aeba39a7d3e78ec66b7f796ce.1694959943.git.vivien@planete-kraus.eu \
--to=guix-patches@gnu.org \
--cc=65879@debbugs.gnu.org \
--cc=liliana.prikler@gmail.com \
--cc=maxim.cournoyer@gmail.com \
--cc=rg@raghavgururajan.name \
--cc=vivien@planete-kraus.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.