[bug#67058] [PATCH gnome-team 0/4] Upate libadwaita to 1.4.0

[bug#67058] [PATCH gnome-team 0/4] Upate libadwaita to 1.4.0

[Liliana Marie Prikler]

Yet another Webkit rebuild, here we gooooo!

Liliana Marie Prikler (4):
  gnu: gtk: Update to 4.12.3.
  gnu: libxmlb: Update to 0.3.14.
  gnu: appstream: Update to 0.16.4.
  gnu: libadwaita: Update to 1.4.0.

 gnu/packages/freedesktop.scm |  7 ++++---
 gnu/packages/gnome.scm       |  7 ++++---
 gnu/packages/gtk.scm         | 11 +++++++----
 gnu/packages/xml.scm         |  4 ++--
 4 files changed, 17 insertions(+), 12 deletions(-)


base-commit: 72e886328c14c832b2ed71c400069b63852ee18d
-- 
2.41.0

[bug#67058] [PATCH gnome-team 1/4] gnu: gtk: Update to 4.12.3.

[Liliana Marie Prikler]

* gnu/packages/gtk.scm (gtk): Update to 4.12.3.
[source]: Remove snippet.
[arguments]<#:configure-flags>: Add “--no-suite=headless”.
<#:phases>: Also patch text-color tests in gsk/nodeparser.

Change-Id: Iedabfd12ae4f60f02ea21f427b85aeb6b17d03d6
---
 gnu/packages/gtk.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 21a12689b7..6a0f5e0773 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1119,7 +1119,7 @@ (define-public gtk+
 (define-public gtk
   (package
     (name "gtk")
-    (version "4.10.3")
+    (version "4.12.3")
     (source
      (origin
        (method url-fetch)
@@ -1127,11 +1127,10 @@ (define-public gtk
                            (version-major+minor version)  "/"
                            name "-" version ".tar.xz"))
        (sha256
-        (base32 "1aff06l9v40j16s4s0qvdbj8cs54qxnh41d7w2v7wdwyswd48ia5"))
+        (base32 "128ahzsj016vz8brd8kplhfkxg2q7wy7kndibx2qfr68yrif530l"))
        (patches
         (search-patches "gtk4-respect-GUIX_GTK4_PATH.patch"))
-       (modules '((guix build utils)))
-       (snippet #~(begin (delete-file-recursively "subprojects/gi-docgen")))))
+       (modules '((guix build utils)))))
     (build-system meson-build-system)
     (outputs '("out" "bin" "doc"))
     (arguments
@@ -1157,6 +1156,7 @@ (define-public gtk
                             "--suite=gtk"
                             "--no-suite=failing"
                             "--no-suite=flaky"
+                            "--no-suite=headless" ; requires mutter…
                             "--no-suite=gsk-compare-broadway")
       #:phases
       #~(modify-phases %standard-phases
@@ -1179,6 +1179,9 @@ (define-public gtk
               (substitute* "meson.build"
                 (("gtk_update_icon_cache: true")
                  "gtk_update_icon_cache: false"))
+              (substitute* (find-files "testsuite/gsk/nodeparser/"
+                                       "^text-color.*\\.node$")
+                (("Noto Sans") "DejaVu Sans"))
               ;; Disable failing tests.
               (substitute* (find-files "testsuite" "meson.build")
                 (("[ \t]*'empty-text.node',") "")
-- 
2.41.0

[bug#67058] [PATCH gnome-team 1/4] gnu: gtk: Update to 4.12.3.

[Maxim Cournoyer]

Hi,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> * gnu/packages/gtk.scm (gtk): Update to 4.12.3.
> [source]: Remove snippet.
> [arguments]<#:configure-flags>: Add “--no-suite=headless”.
> <#:phases>: Also patch text-color tests in gsk/nodeparser.
>
> Change-Id: Iedabfd12ae4f60f02ea21f427b85aeb6b17d03d6
> ---
>  gnu/packages/gtk.scm | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
> index 21a12689b7..6a0f5e0773 100644
> --- a/gnu/packages/gtk.scm
> +++ b/gnu/packages/gtk.scm
> @@ -1119,7 +1119,7 @@ (define-public gtk+
>  (define-public gtk
>    (package
>      (name "gtk")
> -    (version "4.10.3")
> +    (version "4.12.3")
>      (source
>       (origin
>         (method url-fetch)
> @@ -1127,11 +1127,10 @@ (define-public gtk
>                             (version-major+minor version)  "/"
>                             name "-" version ".tar.xz"))
>         (sha256
> -        (base32 "1aff06l9v40j16s4s0qvdbj8cs54qxnh41d7w2v7wdwyswd48ia5"))
> +        (base32 "128ahzsj016vz8brd8kplhfkxg2q7wy7kndibx2qfr68yrif530l"))
>         (patches
>          (search-patches "gtk4-respect-GUIX_GTK4_PATH.patch"))
> -       (modules '((guix build utils)))
> -       (snippet #~(begin (delete-file-recursively "subprojects/gi-docgen")))))
> +       (modules '((guix build utils)))))

If we don't need the snippet, we don't need the 'modules' field either.

>      (build-system meson-build-system)
>      (outputs '("out" "bin" "doc"))
>      (arguments
> @@ -1157,6 +1156,7 @@ (define-public gtk
>                              "--suite=gtk"
>                              "--no-suite=failing"
>                              "--no-suite=flaky"
> +                            "--no-suite=headless" ; requires mutter…

Instead of the '...', maybe explicit that 'XXX: Requires mutter, which
transitively requires this package.' on a standalone comment.

>                              "--no-suite=gsk-compare-broadway")
>        #:phases
>        #~(modify-phases %standard-phases
> @@ -1179,6 +1179,9 @@ (define-public gtk
>                (substitute* "meson.build"
>                  (("gtk_update_icon_cache: true")
>                   "gtk_update_icon_cache: false"))
> +              (substitute* (find-files "testsuite/gsk/nodeparser/"
> +                                       "^text-color.*\\.node$")
> +                (("Noto Sans") "DejaVu Sans"))
>                ;; Disable failing tests.
>                (substitute* (find-files "testsuite" "meson.build")
>                  (("[ \t]*'empty-text.node',") "")

Otherwise,

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>

-- 
Thanks,
Maxim

[bug#67058] [PATCH gnome-team 2/4] gnu: libxmlb: Update to 0.3.14.

[Liliana Marie Prikler]

* gnu/packages/xml.scm (libxmlb): Update to 0.3.14.

Change-Id: I8571b3f46a5528d04cc2ea013ff2ab0ef4ba19da
---
 gnu/packages/xml.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 01e48fda57..ec68deb31a 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -88,7 +88,7 @@ (define-module (gnu packages xml)
 (define-public libxmlb
   (package
     (name "libxmlb")
-    (version "0.3.12")
+    (version "0.3.14")
     (source
      (origin
        (method git-fetch)
@@ -98,7 +98,7 @@ (define-public libxmlb
          (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0v9s2k5saxrs0ssjyg1zxaibybikvaw7fip6sy0b8ixzax9r5y0c"))))
+        (base32 "0qcp881s559wc73db91vjccrv0d3zva87l5jdp5w0ygzz6bmg5cn"))))
     (build-system meson-build-system)
     (arguments
      `(#:glib-or-gtk? #t))
-- 
2.41.0

[bug#67058] [PATCH gnome-team 3/4] gnu: appstream: Update to 0.16.4.

[Liliana Marie Prikler]

* gnu/packages/freedesktop.scm (appstream): Update to 0.16.4.
[arguments]<#:configure-flags>: Add “-Dsystemd=false”.
<#:phases>: Adjust accordingly.

Change-Id: I9c22cbd10681666c20e848dbc1e52ca08431d984
---
 gnu/packages/freedesktop.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index d920afe1e7..0aeeadf5a3 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -139,7 +139,7 @@ (define-module (gnu packages freedesktop)
 (define-public appstream
   (package
     (name "appstream")
-    (version "0.15.6")
+    (version "0.16.4")
     (source
      (origin
        (method url-fetch)
@@ -148,11 +148,12 @@ (define-public appstream
                        "appstream/releases/"
                        "AppStream-" version ".tar.xz"))
        (sha256
-        (base32 "03pirmc5r4izl6mzff879g7pk1nxq03kgpr2yvnnqnlb6r0ckmi3"))))
+        (base32 "1val1b3dggn9g33q2r9q7wsl75a64x4lcvswvkcjjbvakkbj5xyl"))))
     (build-system meson-build-system)
     (arguments
      (list
       #:glib-or-gtk? #t
+      #:configure-flags #~(list "-Dsystemd=false")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-libstemmer
@@ -165,7 +166,7 @@ (define-public appstream
           (add-after 'unpack 'disable-failing-tests
             (lambda _
               (substitute* "tests/test-pool.c"
-                (("[ \t]*g_test_add_func \\(\"/AppStream/PoolRead?.*;")
+                (("[ \t]*g_test_add_func \\(\"/AppStream/Stemming.*;")
                  ""))))
           (add-before 'check 'check-setup
             (lambda _
-- 
2.41.0

[bug#67058] [PATCH gnome-team 4/4] gnu: libadwaita: Update to 1.4.0.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (libadwaita): Update to 1.4.0.

Change-Id: I322caffb65a2b19f87e4c03a267a85c155d65124
---
 gnu/packages/gnome.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2958da2cd9..595b8d5afc 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13375,7 +13375,7 @@ (define-public ocrfeeder
 (define-public libadwaita
   (package
     (name "libadwaita")
-    (version "1.3.4")
+    (version "1.4.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/libadwaita/"
@@ -13383,7 +13383,7 @@ (define-public libadwaita
                                   "libadwaita-" version ".tar.xz"))
               (sha256
                (base32
-                "1gdimh85f5hb6jhnivjaai4m08nz4x9iif5rxdckn8b0lzrwl740"))))
+                "1hj7kxza6263x662v4ffndlz8dhfx19cz3y4iwhnhdflaj50j6p5"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases
@@ -13394,7 +13394,8 @@ (define-public libadwaita
              (system "Xvfb :1 &")
              (setenv "DISPLAY" ":1"))))))
     (native-inputs
-     (list gettext-minimal
+     (list appstream
+           gettext-minimal
            `(,glib "bin")
            gobject-introspection
            gtk-doc/stable
-- 
2.41.0

bug#67058: [PATCH gnome-team 4/4] gnu: libadwaita: Update to 1.4.0.

[Liliana Marie Prikler]

Am Samstag, dem 11.11.2023 um 01:39 +0100 schrieb Liliana Marie
Prikler:
> * gnu/packages/gnome.scm (libadwaita): Update to 1.4.0.
Moved appstream to propagated-inputs, but forgot to mention it.

Anyhow, it's pushed.

[bug#67058] [PATCH gnome-team 0/4] Upate libadwaita to 1.4.0

[Vivien Kraus via Guix-patches via]

Hi,

I just noticed I did a duplicate update in #61968, oops.

I did manage to get the stemmer test for appstream to work, by cherry-
picking a recent commit on master though. Maybe you would like to
import it too?

https://github.com/ximion/appstream/commit/32182d7a7a67d0d204cd0a37bd211bfd0177bc27

Best regards,

Vivien

[bug#67058] [PATCH gnome-team 0/4] Upate libadwaita to 1.4.0

[Vivien Kraus via Guix-patches via]

Le samedi 18 novembre 2023 à 09:21 +0100, Vivien Kraus a écrit :
> Hi,
> 
> I just noticed I did a duplicate update in #61968, oops.
> 
> I did manage to get the stemmer test for appstream to work, by
> cherry-
> picking a recent commit on master though. Maybe you would like to
> import it too?
> 
> https://github.com/ximion/appstream/commit/32182d7a7a67d0d204cd0a37bd211bfd0177bc27
> 
> Best regards,
> 
> Vivien

P.S. Since I’m in the wrong here regarding the duplicate work, I will
retract my commits in favor of yours, but I don’t have access to my
main computer right now.

[bug#67058] [PATCH gnome-team 0/4] Upate libadwaita to 1.4.0

[Maxim Cournoyer]

Hi,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> Yet another Webkit rebuild, here we gooooo!
>
> Liliana Marie Prikler (4):
>   gnu: gtk: Update to 4.12.3.
>   gnu: libxmlb: Update to 0.3.14.
>   gnu: appstream: Update to 0.16.4.
>   gnu: libadwaita: Update to 1.4.0.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>

(for the whole series)

-- 
Thanks,
Maxim