[bug#51938] [PATCH core-updates-frozen 00/23] Fixes for GNOME packages

[bug#51938] [PATCH core-updates-frozen 00/23] Fixes for GNOME packages

[Timothy Sample]

Hi!

In anticipation of the great core-updates-frozen event, I tried to build
the example desktop system on top of core-updates-frozen.  A handful of
GNOME packages were failing, but it is almost all trivial stuff.

A bunch of GNOME packages have invalid “meson.build” files.  Meson 0.60
is slightly stricter than 0.59, causing builds that used to work
(erroneously) to fail (correctly).  Following some of our other
packages, I fixed these failures by just using Meson 0.59.

A handful of GNOME packages still require libsoup 2 rather than 3 (or a
WebKitGTK that uses libsoup 2).

Somewhere along the way (maybe when making colord-minimal?) colord lost
its Vala bindings.  This was causing a build failure for simple-scan.

Between these patches, Guillaume’s XWayland patch from
<https://issues.guix.gnu.org/51900>, deleting at-spi2-core from the
gnome package (cf. <https://issues.guix.gnu.org/51916>), and removing
two broken video drivers from %default-xorg-modules (mach64 and
nouveau), I could boot into GNOME 40 on QEMU!

Timothy Sample (23):
  gnu: eog: Build with Meson 0.59.
  gnu: gnome-characters: Build with Meson 0.59.
  gnu: gnome-font-viewer: Build with Meson 0.59.
  gnu: gnome-weather: Build with Meson 0.59.
  gnu: gnome-maps: Build with Meson 0.59.
  gnu: gnome-disk-utility: Build with Meson 0.59.
  gnu: gnome-screenshot: Build with Meson 0.59.
  gnu: gedit: Build with Meson 0.59.
  gnu: evolution-data-server: Propagate libsoup@2.
  gnu: gssdp: Use libsoup@2 and propagate it.
  gnu: grilo: Fix build by using libsoup@2.
  gnu: folks: Update to 0.15.3.
  gnu: gnome-photos: Build with Meson 0.59.
  gnu: gnome-music: Fix build.
  gnu: gnome-initial-setup: Fix build.
  gnu: gnome-user-share: Build with Meson 0.59.
  gnu: totem: Build with Meson 0.59.
  gnu: colord: Enable Vala bindings.
  gnu: simple-scan: Build with Meson 0.59.
  gnu: gnome-control-center: Fix build.
  gnu: gnome-shell: Build with Meson 0.59.
  gnu: cheese: Build with Meson 0.59.
  gnu: sushi: Fix build by using libsoup@2.

 gnu/packages/geo.scm   |  4 ++-
 gnu/packages/gnome.scm | 76 ++++++++++++++++++++++++++----------------
 2 files changed, 51 insertions(+), 29 deletions(-)

-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 01/23] gnu: eog: Build with Meson 0.59.

[Timothy Sample]

See <https://github.com/mesonbuild/meson/issues/9441>.

* gnu/packages/gnome.scm (eog)[arguments]: Use meson-0.59.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8677a6849d..594e07becc 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6470,7 +6470,8 @@ (define-public eog
               "0ddjwcd77nw0rxb5x5bz5hd671m8gya9827p8rsnb58x103kpai8"))))
    (build-system meson-build-system)
    (arguments
-    `(#:configure-flags
+    `(#:meson ,meson-0.59         ;positional arguments error with meson 0.60
+      #:configure-flags
       ;; Otherwise, the RUNPATH will lack the final 'eog' path component.
       (list (string-append "-Dc_link_args=-Wl,-rpath="
                            (assoc-ref %outputs "out") "/lib/eog"))
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 01/22] gnu: gnome-characters: Build with Meson 0.59.

[Timothy Sample]

See <https://github.com/mesonbuild/meson/issues/9441>.

* gnu/packages/gnome.scm (gnome-characters)[arguments]: Use meson-0.59.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 594e07becc..80a6efe763 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2082,7 +2082,8 @@ (define-public gnome-characters
          "0z2xa4w921bzpzj6gv88pvbrijcnnwni6jxynwz0ybaravyzaqha"))))
     (build-system meson-build-system)
     (arguments
-     `(#:glib-or-gtk? #t
+     `(#:meson ,meson-0.59         ;positional arguments error with meson 0.60
+       #:glib-or-gtk? #t
        #:phases (modify-phases %standard-phases
                   (add-after 'install 'wrap
                     (lambda* (#:key outputs #:allow-other-keys)
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 02/22] gnu: gnome-font-viewer: Build with Meson 0.59.

[Timothy Sample]

See <https://github.com/mesonbuild/meson/issues/9441>.

* gnu/packages/gnome.scm (gnome-font-viewer)[arguments]: Use meson-0.59.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 80a6efe763..d432653e69 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2373,7 +2373,8 @@ (define-public gnome-font-viewer
                 "0hpyi0sz3gcqqs9lkwyk8b6hr39m3n27432x98kxr436jj37dk6j"))))
     (build-system meson-build-system)
     (arguments
-     '(#:phases
+     `(#:meson ,meson-0.59         ;positional arguments error with meson 0.60
+       #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-post-install-script
            (lambda _
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 03/22] gnu: gnome-weather: Build with Meson 0.59.

[Timothy Sample]

See <https://github.com/mesonbuild/meson/issues/9441>.

* gnu/packages/gnome.scm (gnome-weather)[arguments]: Use meson-0.59.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d432653e69..f9985ff429 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9369,7 +9369,8 @@ (define-public gnome-weather
       ("libgweather" ,libgweather)
       ("libhandy" ,libhandy)))
    (arguments
-    `(#:glib-or-gtk? #t
+    `(#:meson ,meson-0.59         ;positional arguments error with meson 0.60
+      #:glib-or-gtk? #t
       #:phases
       ,#~(modify-phases %standard-phases
            (add-after 'unpack 'fix-service-file
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 04/22] gnu: gnome-maps: Build with Meson 0.59.

[Timothy Sample]

See <https://github.com/mesonbuild/meson/issues/9441>.

* gnu/packages/geo.scm (gnome-maps)[arguments]: Use meson-0.59.
---
 gnu/packages/geo.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index bd105f7985..f07b5e4b95 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -59,6 +59,7 @@ (define-module (gnu packages geo)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages build-tools)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
@@ -224,7 +225,8 @@ (define-public gnome-maps
                 "02bdkmb3wyzfrbq726634v4g1hyh9za70cc2ivlbp7zc2n1jgp5c"))))
     (build-system meson-build-system)
     (arguments
-     `(#:glib-or-gtk? #t
+     `(#:meson ,meson-0.59         ;positional arguments error with meson 0.60
+       #:glib-or-gtk? #t
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'skip-gtk-update-icon-cache
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 05/22] gnu: gnome-disk-utility: Build with Meson 0.59.

[Timothy Sample]

See <https://github.com/mesonbuild/meson/issues/9441>.

* gnu/packages/gnome.scm (gnome-disk-utility)
[arguments]: Use meson-0.59.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f9985ff429..d87e65740e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2324,7 +2324,8 @@ (define-public gnome-disk-utility
                 "1rr1ypb89p51b6428yqvczmpmylwjfnhnkgx78hzm3vxm3m15lff"))))
     (build-system meson-build-system)
     (arguments
-     '(#:configure-flags '("-Dlogind=libelogind")
+     `(#:meson ,meson-0.59         ;positional arguments error with meson 0.60
+       #:configure-flags '("-Dlogind=libelogind")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'skip-gtk-update-icon-cache
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 06/22] gnu: gnome-screenshot: Build with Meson 0.59.

[Timothy Sample]

See <https://github.com/mesonbuild/meson/issues/9441>.

* gnu/packages/gnome.scm (gnome-screenshot)[arguments]: Use meson-0.59.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d87e65740e..645a87f805 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9219,7 +9219,8 @@ (define-public gnome-screenshot
          "1qm544ymwibk31s30k47vnn79xg30m18r7l4di0c57g375dak31n"))))
     (build-system meson-build-system)
     (arguments
-     '(#:phases
+     `(#:meson ,meson-0.59         ;positional arguments error with meson 0.60
+       #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'skip-gtk-update-icon-cache
            ;; Don't create 'icon-theme.cache'.
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 07/22] gnu: gedit: Build with Meson 0.59.

[Timothy Sample]

See <https://github.com/mesonbuild/meson/issues/9441>.

* gnu/packages/gnome.scm (gedit)[arguments]: Use meson-0.59.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 645a87f805..a1811ca467 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7370,7 +7370,8 @@ (define-public gedit
                 "149ngl9qw6h59546lir1pa7hvw23ppsnqlj9mfqphmmn5jl99qsm"))))
     (build-system meson-build-system)
     (arguments
-     `(#:glib-or-gtk? #t
+     `(#:meson ,meson-0.59         ;positional arguments error with meson 0.60
+       #:glib-or-gtk? #t
        #:configure-flags
        ;; Otherwise, the RUNPATH will lack the final path component.
        (list (string-append "-Dc_link_args=-Wl,-rpath="
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 08/22] gnu: evolution-data-server: Propagate libsoup@2.

[Timothy Sample]

All of the .pc files require version 2.

* gnu/packages/gnome.scm (evolution-data-server)
[propagated-inputs]: Replace libsoup with libsoup-minimal-2.
---
 gnu/packages/gnome.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a1811ca467..efd582c7d6 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7716,7 +7716,7 @@ (define-public evolution-data-server
      `(("gtk+" ,gtk+)
        ("libical" ,libical)
        ("libsecret" ,libsecret)
-       ("libsoup" ,libsoup)
+       ("libsoup" ,libsoup-minimal-2)
        ("nss" ,nss)
        ("sqlite" ,sqlite)))
     (inputs
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 09/22] gnu: gssdp: Use libsoup@2 and propagate it.

[Timothy Sample]

* gnu/packages/gnome.scm (gssdp)[inputs]: Remove libsoup.
[propagated-inputs]: Add libsoup-minimal-2.
---
 gnu/packages/gnome.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index efd582c7d6..dc4dafa05a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1362,8 +1362,10 @@ (define-public gssdp
       ("pkg-config" ,pkg-config)
       ("vala" ,vala)))
    (inputs
-    `(("gtk+" ,gtk+)
-      ("libsoup" ,libsoup)))
+    `(("gtk+" ,gtk+)))
+   (propagated-inputs
+    ;; The .pc file "Requires" libsoup-2.4.
+    `(("libsoup" ,libsoup-minimal-2)))
    (synopsis "GObject-based API over @acronym{SSDP, Simple Service Discovery
 Protocol} for GNOME")
    (description "This package provides a library to handle resource discovery
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 10/22] gnu: grilo: Fix build by using libsoup@2.

[Timothy Sample]

* gnu/packages/gnome.scm (grilo)[inputs]: Replace libsoup with
libsoup-minimal-2.
---
 gnu/packages/gnome.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index dc4dafa05a..7d7e2e0844 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6195,7 +6195,7 @@ (define-public grilo
        ("gtk+" ,gtk+)
        ("libxml2" ,libxml2)
        ("liboauth" ,liboauth)
-       ("libsoup" ,libsoup)
+       ("libsoup" ,libsoup-minimal-2)
        ("totem-pl-parser" ,totem-pl-parser)))
     (native-search-paths
      (list (search-path-specification
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 11/22] gnu: folks: Update to 0.15.3.

[Timothy Sample]

* gnu/packages/gnome.scm (folks): Update to 0.15.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 7d7e2e0844..b609d109e2 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9965,7 +9965,7 @@ (define-public gnome-shell-extensions
 (define-public folks
   (package
     (name "folks")
-    (version "0.14.0")
+    (version "0.15.3")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -9974,7 +9974,7 @@ (define-public folks
                     "folks-" version ".tar.xz"))
               (sha256
                (base32
-                "1f9b52vmwnq7s51vj26w2618dn2ph5g12ibbkbyk6fvxcgd7iryn"))))
+                "19a4qp9ry8y24jx1v5456qn9lnw843571vkkah3bxx4ky3x3gmr1"))))
     (build-system meson-build-system)
     (arguments
      '(#:phases
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 12/22] gnu: gnome-photos: Build with Meson 0.59.

[Timothy Sample]

See <https://github.com/mesonbuild/meson/issues/9441>.

* gnu/packages/gnome.scm (gnome-photos)[arguments]: Use meson-0.59.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b609d109e2..943252c2f8 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -892,7 +892,8 @@ (define-public gnome-photos
          "1bzi79plw6ji6qlckhxnwfnswy6jpnhzmmyanml2i2xg73hp6bg0"))))
     (build-system meson-build-system)
     (arguments
-     `(#:glib-or-gtk? #t
+     `(#:meson ,meson-0.59         ;positional arguments error with meson 0.60
+       #:glib-or-gtk? #t
        #:configure-flags
        (list "-Ddogtail=false"     ; Not available
              ;; Required for RUNPATH validation.
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 13/22] gnu: gnome-music: Fix build.

[Timothy Sample]

See <https://github.com/mesonbuild/meson/issues/9441>.

* gnu/packages/gnome.scm (gnome-music)[arguments]: Use meson-0.59.
[inputs]: Replace libsoup with libsoup-minimal-2.
---
 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 943252c2f8..d82ed68f88 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -964,7 +964,8 @@ (define-public gnome-music
          "0lcdal4qdhclr8961p57xf010y92l6wwmkw86lyi9wy224z6gjr0"))))
     (build-system meson-build-system)
     (arguments
-     `(#:glib-or-gtk? #t
+     `(#:meson ,meson-0.59         ;positional arguments error with meson 0.60
+       #:glib-or-gtk? #t
        #:phases
        (modify-phases %standard-phases
          (add-after 'install 'wrap-gnome-music
@@ -1003,7 +1004,7 @@ (define-public gnome-music
        ("json-glib" ,json-glib)
        ("libdazzle" ,libdazzle)
        ("libmediaart" ,libmediaart)
-       ("libsoup" ,libsoup)
+       ("libsoup" ,libsoup-minimal-2)
        ("pycairo" ,python-pycairo)
        ("pygobject" ,python-pygobject)
        ("tracker" ,tracker)
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 14/22] gnu: gnome-initial-setup: Fix build.

[Timothy Sample]

See <https://github.com/mesonbuild/meson/issues/9441>.

* gnu/packages/gnome.scm (gnome-initial-setup)
[arguments]: Use meson-0.59.
[inputs]: Replace libsoup with libsoup-minimal-2.
---
 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 d82ed68f88..7606fe4761 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1524,7 +1524,8 @@ (define-public gnome-initial-setup
               "06q3p4f8g9zr7a4mw3qr556mi0dg9qzrj8n46ybdz93fxs26aaj1"))))
    (build-system meson-build-system)
    (arguments
-    '(#:configure-flags '(;; Enable camera support for user selfie.
+    `(#:meson ,meson-0.59         ;positional arguments error with meson 0.60
+      #:configure-flags '(;; Enable camera support for user selfie.
                           "-Dcheese=auto"
                           "-Dsystemd=false")
       #:phases (modify-phases %standard-phases
@@ -1566,7 +1567,7 @@ (define-public gnome-initial-setup
       ("pwquality" ,libpwquality)
       ("rest" ,rest)
       ("upower" ,upower)
-      ("webkitgtk" ,webkitgtk)
+      ("webkitgtk" ,webkitgtk-with-libsoup2)
       ("libgnomekbd" ,libgnomekbd)))
    (synopsis "Initial setup wizard for GNOME desktop")
    (description "This package provides a set-up wizard when a
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 15/22] gnu: gnome-user-share: Build with Meson 0.59.

[Timothy Sample]

See <https://github.com/mesonbuild/meson/issues/9441>.

* gnu/packages/gnome.scm (gnome-user-share)[arguments]: Use meson-0.59.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7606fe4761..e9d9abcdb2 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1590,7 +1590,8 @@ (define-public gnome-user-share
               "04r9ck9v4i0d31grbli1d4slw2d6dcsfkpaybkwbzi7wnj72l30x"))))
    (build-system meson-build-system)
    (arguments
-    `(#:glib-or-gtk? #t
+    `(#:meson ,meson-0.59         ;positional arguments error with meson 0.60
+      #:glib-or-gtk? #t
       #:configure-flags
        `("-Dsystemduserunitdir=/tmp/empty"
          ;; Enable nautilus extension for file sharing.
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 16/22] gnu: totem: Build with Meson 0.59.

[Timothy Sample]

See <https://github.com/mesonbuild/meson/issues/9441>.

* gnu/packages/gnome.scm (totem)[arguments]: Use meson-0.59.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e9d9abcdb2..3122ab61f0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6328,7 +6328,8 @@ (define-public totem
        ("grilo-plugins" ,grilo-plugins)
        ("vala" ,vala)))
     (arguments
-     `(#:glib-or-gtk? #t
+     `(#:meson ,meson-0.59         ;positional arguments error with meson 0.60
+       #:glib-or-gtk? #t
 
        ;; Disable automatic GStreamer plugin installation via PackageKit and
        ;; all that.
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 17/22] gnu: colord: Enable Vala bindings.

[Timothy Sample]

* gnu/packages/gnome.scm (colord)[arguments]: Add "-Dvapi=true" to
[native-inputs]: Add vala.
---
 gnu/packages/gnome.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 3122ab61f0..ddb4419b9a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5368,7 +5368,8 @@ (define-public colord
            (use-modules (srfi srfi-1))
            (append '("-Dbash_completion=true"
                      "-Ddocs=true"
-                     "-Dman=true")
+                     "-Dman=true"
+                     "-Dvapi=true")
                (fold delete ,flags '("-Dbash_completion=false"
                                      "-Ddocs=false"
                                      "-Dman=false")))))
@@ -5387,7 +5388,8 @@ (define-public colord
            ("docbook-xsl-ns" ,docbook-xsl-ns)
            ("gtk-doc" ,gtk-doc/stable)
            ("libxml2" ,libxml2)         ;for XML_CATALOG_FILES
-           ("libxslt" ,libxslt))
+           ("libxslt" ,libxslt)
+           ("vala" ,vala))              ;for VAPI, needed by simple-scan
          (package-native-inputs colord-minimal)))))
 
 (define-public geoclue
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 18/22] gnu: simple-scan: Build with Meson 0.59.

[Timothy Sample]

See <https://github.com/mesonbuild/meson/issues/9441>.

* gnu/packages/gnome.scm (simple-scan)[arguments]: Use meson-0.59.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ddb4419b9a..98d26ea920 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6738,7 +6738,8 @@ (define-public simple-scan
     (build-system meson-build-system)
     ;; TODO: Fix icons in home screen, About dialogue, and scan menu.
     (arguments
-     '(#:glib-or-gtk? #t))
+     `(#:meson ,meson-0.59         ;positional arguments error with meson 0.60
+       #:glib-or-gtk? #t))
     (inputs
      `(("gtk" ,gtk+)
        ("zlib" ,zlib)
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 19/22] gnu: gnome-control-center: Fix build.

[Timothy Sample]

See <https://github.com/mesonbuild/meson/issues/9441>.

* gnu/packages/gnome.scm (gnome-control-center)
[arguments]: Use meson-0.59.
[inputs]: Replace libsoup with libsoup-minimal-2.
---
 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 98d26ea920..9d409be7bf 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8563,7 +8563,8 @@ (define-public gnome-control-center
                 "0rr4d5m2a72vrb31jgyx49dp0s2pwgyxsrk4hyw5ym66wq63c3v1"))))
     (build-system meson-build-system)
     (arguments
-     '(#:glib-or-gtk? #t
+     `(#:meson ,meson-0.59         ;positional arguments error with meson 0.60
+       #:glib-or-gtk? #t
        #:configure-flags
        (list "-Dcheese=false"
              (string-append "-Dgnome_session_libexecdir="
@@ -8639,7 +8640,7 @@ (define-public gnome-control-center
        ("libnma" ,libnma)
        ("libpwquality" ,libpwquality)
        ("libsecret" ,libsecret)
-       ("libsoup" ,libsoup)
+       ("libsoup" ,libsoup-minimal-2)
        ("libxml2" ,libxml2)
        ("libwacom" ,libwacom)
        ("mesa" ,mesa)
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 20/22] gnu: gnome-shell: Build with Meson 0.59.

[Timothy Sample]

See <https://github.com/mesonbuild/meson/issues/9441>.

* gnu/packages/gnome.scm (gnome-shell)[arguments]: Use meson-0.59.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 9d409be7bf..5079b1e6df 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8678,7 +8678,8 @@ (define-public gnome-shell
               (modules '((guix build utils)))))
     (build-system meson-build-system)
     (arguments
-     `(#:glib-or-gtk? #t
+     `(#:meson ,meson-0.59         ;positional arguments error with meson 0.60
+       #:glib-or-gtk? #t
        #:disallowed-references ,(list (gexp-input glib "bin")
                                       (gexp-input libxslt)
                                       (gexp-input ruby-sass))
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 21/22] gnu: cheese: Build with Meson 0.59.

[Timothy Sample]

See <https://github.com/mesonbuild/meson/issues/9441>.

* gnu/packages/gnome.scm (cheese)[arguments]: Use meson-0.59.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5079b1e6df..2df6187ffc 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -10705,7 +10705,8 @@ (define-public cheese
                 "0vyim2avlgq3a48rgdfz5g21kqk11mfb53b2l883340v88mp7ll8"))
               (patches (search-patches "cheese-vala-update.patch"))))
     (arguments
-     `(#:glib-or-gtk? #t
+     `(#:meson ,meson-0.59         ;positional arguments error with meson 0.60
+       #:glib-or-gtk? #t
        ;; Tests require GDK.
        #:tests? #f
        #:phases
-- 
2.33.1

[bug#51938] [PATCH core-updates-frozen 22/22] gnu: sushi: Fix build by using libsoup@2.

[Timothy Sample]

* gnu/packages/gnome.scm (sushi)[inputs]: Replace libsoup with
libsoup-minimal-2.
---
 gnu/packages/gnome.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2df6187ffc..c8ed84d818 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1664,7 +1664,7 @@ (define-public sushi
        ("libmusicbrainz" ,libmusicbrainz)
        ("libxml2" ,libxml2)
        ("neon" ,neon)
-       ("webkitgtk" ,webkitgtk)))
+       ("webkitgtk" ,webkitgtk-with-libsoup2)))
     (synopsis "File previewer for the GNOME desktop")
     (description "Sushi is a DBus-activated service that allows applications
 to preview files on the GNOME desktop.")
-- 
2.33.1

bug#51938: [PATCH core-updates-frozen 00/23] Fixes for GNOME packages

[Ludovic Courtès]

Hi Timothy,

Timothy Sample <samplet@ngyro.com> skribis:

> In anticipation of the great core-updates-frozen event, I tried to build
> the example desktop system on top of core-updates-frozen.  A handful of
> GNOME packages were failing, but it is almost all trivial stuff.

Well done!

[...]

> Between these patches, Guillaume’s XWayland patch from
> <https://issues.guix.gnu.org/51900>, deleting at-spi2-core from the
> gnome package (cf. <https://issues.guix.gnu.org/51916>), and removing
> two broken video drivers from %default-xorg-modules (mach64 and
> nouveau), I could boot into GNOME 40 on QEMU!

Yay!  We’re getting there!

> Timothy Sample (23):
>   gnu: eog: Build with Meson 0.59.
>   gnu: gnome-characters: Build with Meson 0.59.
>   gnu: gnome-font-viewer: Build with Meson 0.59.
>   gnu: gnome-weather: Build with Meson 0.59.
>   gnu: gnome-maps: Build with Meson 0.59.
>   gnu: gnome-disk-utility: Build with Meson 0.59.
>   gnu: gnome-screenshot: Build with Meson 0.59.
>   gnu: gedit: Build with Meson 0.59.
>   gnu: evolution-data-server: Propagate libsoup@2.
>   gnu: gssdp: Use libsoup@2 and propagate it.
>   gnu: grilo: Fix build by using libsoup@2.
>   gnu: folks: Update to 0.15.3.
>   gnu: gnome-photos: Build with Meson 0.59.
>   gnu: gnome-music: Fix build.
>   gnu: gnome-initial-setup: Fix build.
>   gnu: gnome-user-share: Build with Meson 0.59.
>   gnu: totem: Build with Meson 0.59.
>   gnu: colord: Enable Vala bindings.
>   gnu: simple-scan: Build with Meson 0.59.
>   gnu: gnome-control-center: Fix build.
>   gnu: gnome-shell: Build with Meson 0.59.
>   gnu: cheese: Build with Meson 0.59.
>   gnu: sushi: Fix build by using libsoup@2.

It all LGTM, go for it!

Thank you for this great contribution to the sprint! :-)

Ludo’.