[bug#74622] [PATCH gnome-team 00/10] Getting ready to finally deliver GNOME 46

[bug#74622] [PATCH gnome-team 00/10] Getting ready to finally deliver GNOME 46

[Liliana Marie Prikler]

Hi Guix,

this series updates the last big blocks we need to get GNOME 46
running inside a virtual machine (apart from, well, said virtual machine
itself, for which you need to disable the tests u-boot-tools).
There are lots of things still unfinished: for one, gnome-shell can't
run its automated tests, which is very, very, very unfortunate.
Of course, we still have to update third-party things like the
extensions we ship if we want a great experience out-of-the-box,
but baby steps :)

Cheers

Liliana Marie Prikler (10):
  gnu: gnome-settings-daemon: Update to 47.2.
  gnu: lock: Update to 1.1.3.
  gnu: mutter: Update to 46.6.
  gnu: Make xdg-desktop-portal-next the new xdg-desktop-portal.
  [WIP] gnu: gnome-shell: Update to 46.6.
  folks: Disable tests.
  gnu: folks: Update to 0.15.9.
  gnu: gnome-keyring: Update to 46.2.
  gnu: libshumate: Update to 1.3.0.
  gnu: gnome-initial-setup: Update to 46.4.

 gnu/packages/freedesktop.scm | 80 ++++++++++++------------------------
 gnu/packages/gnome.scm       | 54 ++++++++++++------------
 2 files changed, 52 insertions(+), 82 deletions(-)


base-commit: 5c00ceb3be6e855022090177a9b554ac876681a3
-- 
2.46.0

[bug#74622] [PATCH gnome-team 01/10] gnu: gnome-settings-daemon: Update to 47.2.

[Liliana Marie Prikler]

gnome-settings-daemon 46 has a hard requirement for systemd, which is fixed
with two upstream patches that are sadly not yet included in any public
release.  To not carry them around needlessly, jump straight ahead to 47.

* gnu/packages/gnome.scm (gnome-settings-daemon): Update to 47.2.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index eba0ef54b5..a3d32223e7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6077,7 +6077,7 @@ (define-public libgweather4
 (define-public gnome-settings-daemon
   (package
     (name "gnome-settings-daemon")
-    (version "44.1")
+    (version "47.2")
     (source
      (origin
        (method url-fetch)
@@ -6086,7 +6086,7 @@ (define-public gnome-settings-daemon
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "129rjhr2kvfd37fingz8737brh8a874hlw3xlh01658zv1r3nr8j"))
+         "0nka7zfl4hzzk4066kk5cc8pmk7v3izhi4wihsh5b3w85s35idqy"))
        (patches (search-patches "gnome-settings-daemon-gc.patch"))))
     (build-system meson-build-system)
     (arguments
-- 
2.46.0

[bug#74622] [PATCH gnome-team 02/10] gnu: lock: Update to 1.1.3.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (lock): Update to 1.1.3.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a3d32223e7..a6cb66cc41 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -14303,7 +14303,7 @@ (define-public gnome-connections
 (define-public lock
   (package
     (name "lock")
-    (version "1.0.0")
+    (version "1.1.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -14311,7 +14311,7 @@ (define-public lock
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
-               (base32 "1sq7mk4j3jzs1gzzql938d58gvrz6cp0ingzaxilffdpbpvj4fn3"))))
+               (base32 "18xyh7g4qqm2nx9wfd5bxf293dk0ahwr1acj4ypwswasv0isxdf9"))))
     (build-system meson-build-system)
     (arguments
      (list
-- 
2.46.0

[bug#74622] [PATCH gnome-team 03/10] gnu: mutter: Update to 46.6.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (mutter): Update to 46.6.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a6cb66cc41..565dcec6ab 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8023,7 +8023,7 @@ (define-public zenity
 (define-public mutter
   (package
     (name "mutter")
-    (version "46.4")
+    (version "46.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -8031,7 +8031,7 @@ (define-public mutter
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1r02fp1z5ikm9ml2m4dvnfdn3nig4wj45cz2gicmdnrak37xj6v1"))))
+                "1w6da067gxgwwv8q893zxrh7h429m41xzkl3p71kr3iwljbq8aj5"))))
     ;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
     ;; versions of cogl and clutter.  As a result, many of the inputs,
     ;; propagated-inputs, and configure flags used in cogl and clutter are
-- 
2.46.0

[bug#74622] [PATCH gnome-team 04/10] gnu: Make xdg-desktop-portal-next the new xdg-desktop-portal.

[Liliana Marie Prikler]

* gnu/packages/freedesktop.scm (xdg-desktop-portal-next): Inline into…
(xdg-desktop-portal): … this.
---
 gnu/packages/freedesktop.scm | 80 ++++++++++++------------------------
 1 file changed, 26 insertions(+), 54 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index d197b5f553..64d7218a5c 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -3122,7 +3122,7 @@ (define-public libportal
 (define-public xdg-desktop-portal
   (package
     (name "xdg-desktop-portal")
-    (version "1.16.0")
+    (version "1.18.4")
     (source
      (origin
        (method url-fetch)
@@ -3131,30 +3131,13 @@ (define-public xdg-desktop-portal
              version "/xdg-desktop-portal-" version ".tar.xz"))
        (sha256
         (base32
-         "06cczlh39kc41rvav06v37sad827y61rffy3v29i918ibj8sahav"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("libtool" ,libtool)
-       ("glib:bin" ,glib "bin")
-       ("which" ,which)
-       ("gettext" ,gettext-minimal)))
-    (inputs
-     `(("gdk-pixbuf" ,gdk-pixbuf)
-       ("glib" ,glib)
-       ("flatpak" ,flatpak)
-       ("fontconfig" ,fontconfig)
-       ("json-glib" ,json-glib)
-       ("libportal" ,libportal)
-       ("dbus" ,dbus)
-       ("geoclue" ,geoclue)
-       ("pipewire" ,pipewire)
-       ("fuse" ,fuse)))
+         "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q"))
+       ;; Disable portal tests since they try to use fuse.
+       (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch"))))
+    (build-system meson-build-system)
     (arguments
      `(#:configure-flags
-       (list "--with-systemd=no")
+       (list "-Dsystemd=disabled")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'po-chmod
@@ -3165,6 +3148,26 @@ (define-public xdg-desktop-portal
                        (find-files "po" "\\.po$"))))
          (add-after 'unpack 'set-home-directory
            (lambda _ (setenv "HOME" "/tmp"))))))
+    (native-inputs
+     (list pkg-config
+           `(,glib "bin")
+           gettext-minimal
+           python
+           python-dbusmock
+           python-pytest
+           python-pytest-xdist))
+    (inputs
+     (list bubblewrap
+           gdk-pixbuf
+           glib
+           flatpak
+           fontconfig
+           json-glib
+           libportal
+           dbus
+           geoclue
+           pipewire
+           fuse))
     (native-search-paths
      (list (search-path-specification
             (variable "XDG_DESKTOP_PORTAL_DIR")
@@ -3183,37 +3186,6 @@ (define-public xdg-desktop-portal
 and others.")
     (license license:lgpl2.1+)))
 
-(define-public xdg-desktop-portal-next
-  (package
-    (inherit xdg-desktop-portal)
-    (version "1.18.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append
-             "https://github.com/flatpak/xdg-desktop-portal/releases/download/"
-             version "/xdg-desktop-portal-" version ".tar.xz"))
-       (sha256
-        (base32
-         "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q"))
-       ;; Disable portal tests since they try to use fuse.
-       (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch"))))
-    (build-system meson-build-system)
-    (arguments
-     (substitute-keyword-arguments (package-arguments xdg-desktop-portal)
-       ((#:configure-flags _ ''())
-        #~(list "-Dsystemd=disabled"))))
-    (native-inputs
-     (list pkg-config
-           `(,glib "bin")
-           gettext-minimal
-           python
-           python-dbusmock
-           python-pytest
-           python-pytest-xdist))
-    (inputs (modify-inputs (package-inputs xdg-desktop-portal)
-              (prepend bubblewrap)))))
-
 (define-public xdg-desktop-portal-gtk
   (package
     (name "xdg-desktop-portal-gtk")
-- 
2.46.0

[bug#74622] [PATCH gnome-team 08/10] gnu: gnome-keyring: Update to 46.2.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (gnome-keyring): Update to 46.2.
[#:parallel-tests?]: Disable unconditionally.
---
 gnu/packages/gnome.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7633daa59a..d954c89799 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2640,7 +2640,7 @@ (define-public libgnome-keyring
 (define-public gnome-keyring
   (package
     (name "gnome-keyring")
-    (version "46.1")
+    (version "46.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -2648,7 +2648,7 @@ (define-public gnome-keyring
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1xp31iashi7n81z4halmrw53v3lnj847k4514lzqnbzz6a8sxlxi"))))
+                "098ryv7xsnf5r58w8kdr6nahzhmrczjb72ycbqlg7dx8p1kcj9mz"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -2658,7 +2658,7 @@ (define-public gnome-keyring
                         #$output "/share/p11-kit/modules/")
          (string-append "--with-pkcs11-modules="
                         #$output "/share/p11-kit/modules/"))
-      #:parallel-tests? (not (target-riscv64?))
+      #:parallel-tests? #f              ; XXX: concurrency in dbus tests
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'fix-/bin/sh-reference
-- 
2.46.0

[bug#74622] [PATCH gnome-team 09/10] gnu: libshumate: Update to 1.3.0.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (libshumate): Update to 1.3.0.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d954c89799..e5f343c6e8 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5097,7 +5097,7 @@ (define-public rest-next
 (define-public libshumate
   (package
     (name "libshumate")
-    (version "1.2.1")
+    (version "1.3.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -5105,7 +5105,7 @@ (define-public libshumate
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "04cwakbdr68nw4kh956xhf447fawz8badpyd76hg4ir1gq3yw18i"))))
+                "1m3mvk38cjlkxmhkq0zg75msckylc0vzizll50ii5phw53lac9w2"))))
     (build-system meson-build-system)
     (arguments
      (list #:phases
-- 
2.46.0

[bug#74622] [PATCH gnome-team 06/10] folks: Disable tests.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (folks)[#:tests?]: Set to #f.
---
 gnu/packages/gnome.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 1d90a636dc..ae2c084387 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11062,7 +11062,10 @@ (define-public folks
                 "1hj9brran2azy3scyf913svhxjrmya83fi7x239h33rp7vxnljlm"))))
     (build-system meson-build-system)
     (arguments
-     '(#:phases
+     '(;; Tests are broken since GLib 2.80
+       ;; See <https://gitlab.gnome.org/GNOME/folks/-/issues/140>.
+       #:tests? #f
+       #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'skip-gtk-update-icon-cache
            ;; Don't create 'icon-theme.cache'.
-- 
2.46.0

[bug#74622] [PATCH gnome-team 07/10] gnu: folks: Update to 0.15.9.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (folks): Update to 0.15.9.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ae2c084387..7633daa59a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11050,7 +11050,7 @@ (define-public gnome-shell-extensions
 (define-public folks
   (package
     (name "folks")
-    (version "0.15.8")
+    (version "0.15.9")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -11059,7 +11059,7 @@ (define-public folks
                     "folks-" version ".tar.xz"))
               (sha256
                (base32
-                "1hj9brran2azy3scyf913svhxjrmya83fi7x239h33rp7vxnljlm"))))
+                "0ps1243l4vladlylj6f3h830lam2fi43kp1z2qzz6lf3amrv6493"))))
     (build-system meson-build-system)
     (arguments
      '(;; Tests are broken since GLib 2.80
-- 
2.46.0

[bug#74622] [PATCH gnome-team 10/10] gnu: gnome-initial-setup: Update to 46.4.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (gnome-initial-setup): Update to 46.4.
---
 gnu/packages/gnome.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e5f343c6e8..5e66477bc2 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1571,7 +1571,7 @@ (define-public libmediaart
 (define-public gnome-initial-setup
   (package
     (name "gnome-initial-setup")
-    (version "44.8")
+    (version "46.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/gnome-initial-setup/"
@@ -1579,7 +1579,7 @@ (define-public gnome-initial-setup
                                   "/gnome-initial-setup-" version ".tar.xz"))
               (sha256
                (base32
-                "0y61y3rvz1hqmhjxl9mjwxcdvdxslyaghajav6l79a9yxi859508"))))
+                "1mqvvsl161pi4sv2x6b90rfs4a2166da9rkgkcpd67pwfhgyjxmr"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -1603,6 +1603,7 @@ (define-public gnome-initial-setup
            pkg-config))
     (inputs
      (list accountsservice
+           dconf
            elogind
            gdm
            geoclue
-- 
2.46.0

[bug#74622] [PATCH gnome-team 05/10] [WIP] gnu: gnome-shell: Update to 46.6.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (gnome-shell): Update to 46.6.
[#:configure-flags]: Adjust accordingly.
[#:phases]<wrap-programs>: Likewise.
[#:tests?]: Disabled. XXX: Find a way to reenable them.
---
 gnu/packages/gnome.scm | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 565dcec6ab..1d90a636dc 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9467,7 +9467,7 @@ (define-public gnome-control-center
 (define-public gnome-shell
   (package
     (name "gnome-shell")
-    (version "44.10")
+    (version "46.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -9475,7 +9475,7 @@ (define-public gnome-shell
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "01pw9qnnvh64x56z1gqh0qk6vfn0ihh4zijq23f4bpz9wszlbpwf"))))
+                "009mp7dnlw5pqxl2hx45ams0qhxmjbr7nvcvm9i6jf1fabx17n4b"))))
     (build-system meson-build-system)
     (arguments
      (let ((disallowed-references
@@ -9485,13 +9485,13 @@ (define-public gnome-shell
                   (gexp-input ruby-sass))))
        (list
         #:glib-or-gtk? #t
+        #:tests? #f
         #:disallowed-references disallowed-references
         #:configure-flags
         #~(list "-Dsystemd=false"
                 ;; Otherwise, the RUNPATH will lack the final path component.
                 (string-append "-Dc_link_args=-Wl,-rpath="
-                               #$output "/lib/gnome-shell")
-                "-Dsoup2=false")
+                               #$output "/lib/gnome-shell"))
         #:modules '((guix build meson-build-system)
                     (guix build utils)
                     (ice-9 match)
@@ -9557,7 +9557,7 @@ (define-public gnome-shell
                    (lambda (prog)
                      (wrap-program (string-append #$output "/bin/" prog)
                        `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
-                   '("gnome-shell" "gnome-extensions-app"))
+                   '("gnome-shell" "gnome-extensions" "gnome-extensions-app"))
                   (substitute* (string-append #$output "/share/gnome-shell/"
                                               "org.gnome.Shell.Extensions")
                     (("imports\\.package\\.start" all)
@@ -9577,13 +9577,7 @@ (define-public gnome-shell
                                     "[imports.gi.GLib.getenv('GST_PLUGIN_SYSTEM_PATH'),"
                                     "'" gst-plugin-path "'].filter(v => v).join(':'),"
                                     "true);\n"
-                                    all)))
-                  (for-each
-                   (lambda (prog)
-                     (wrap-program (string-append #$output "/bin/" prog)
-                       `("GUIX_PYTHONPATH"      ":" prefix (,python-path))
-                       `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
-                   '("gnome-shell-perf-tool")))))
+                                    all))))))
             (add-after 'install 'rewire
               (lambda* (#:key inputs #:allow-other-keys)
                 (for-each
-- 
2.46.0