Subject: [bug#65879] [gnome-team 1/1] gnu: gnome-control-center: Update to 44.3.

From: Vivien Kraus <[email-masked]>
Date: Mon, 11 Sep 2023 23:26:20 +0200

* gnu/packages/gnome.scm (gnome-control-center): Update to 44.3.
[phase patch-paths]: 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 skip-gtk-update-icon-cache]: The icon cache update should be disabled
differently.
[native-inputs]: Add setxkbmap.
---
 gnu/packages/gnome.scm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ad118090eb..81ce9207f4 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,7 @@ (define-public gnome-control-center
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1ln5rch6zbfh3vl2nnnmw39bylgg38rin6xp7ra0ra4ay3wv3gvs"))))
+                "0yhcm0c0ghkfqswqlkwcln3jpaz6jzvqaph2c3lgmv635w2nash6"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -9036,18 +9036,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 +9055,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