[bug#70247] [PATCH gnome-team 0/4] Why not bump GTK while we're at it?

[bug#70247] [PATCH gnome-team 0/4] Why not bump GTK while we're at it?

[Liliana Marie Prikler]

Hi Guix,

with Webkit needing an update, a weird graphene bug[1], and a request
to update gtk so that zrythm could be bumped… well, let's say there's
stuff to do.

Cheers

Liliana Marie Prikler (4):
  gnu: graphene: Build without ARM neon.
  gnu: gtk: Update to 4.14.2.
  [untested] gnu: webkitgtk: Update to 2.44.0.
  [untested] gnu: wpewebkit: Update to 2.44.0.

[1] https://github.com/ebassi/graphene/issues/215

 gnu/packages/gtk.scm    | 16 +++++++++++++---
 gnu/packages/webkit.scm |  8 ++++----
 2 files changed, 17 insertions(+), 7 deletions(-)


base-commit: c4ee869379cd412cc717ff07bc31801add04c0a6
-- 
2.41.0

[bug#70247] [PATCH gnome-team v2 1/4] gnu: graphene: Build without ARM neon.

[Liliana Marie Prikler]

* gnu/packages/gtk.scm (graphene)[#:configure-flags]: Add “-Darm_neon=false”.
---
 gnu/packages/gtk.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index d3b38db113..4fae0fd275 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -2415,6 +2415,9 @@ (define-public graphene
        #:configure-flags
        (list
         "-Dinstalled_tests=false"
+        ;; Neon causes alignment faults, see
+        ;; <https://github.com/ebassi/graphene/issues/215>.
+        "-Darm_neon=false"
         ,@(if (%current-target-system)
               ;; Introspection requires running binaries for 'host' on 'build'.
               '("-Dintrospection=disabled")

base-commit: c4ee869379cd412cc717ff07bc31801add04c0a6
-- 
2.41.0

[bug#70247] [PATCH gnome-team v2 2/4] gnu: gtk: Update to 4.14.2.

[Liliana Marie Prikler]

* gnu/packages/gtk.scm (gtk): Update to 4.14.2.
[#:phases]<patch>: Disable new test failures.
[inputs]: Add shaderc.
---
 gnu/packages/gtk.scm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 4fae0fd275..40b7200c57 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.12.3")
+    (version "4.14.2")
     (source
      (origin
        (method url-fetch)
@@ -1127,7 +1127,7 @@ (define-public gtk
                            (version-major+minor version)  "/"
                            name "-" version ".tar.xz"))
        (sha256
-        (base32 "128ahzsj016vz8brd8kplhfkxg2q7wy7kndibx2qfr68yrif530l"))
+        (base32 "0wp0w259rkwf6g8sk2b9jkms47vx5gp7mfs345grx9wq53plqq12"))
        (patches
         (search-patches "gtk4-respect-GUIX_GTK4_PATH.patch"))
        (modules '((guix build utils)))))
@@ -1199,7 +1199,13 @@ (define-public gtk
                 ;; This test, 'gtk:tools / validate', started failing for
                 ;; unknown reasons after updating mesa to 23.3.1 and xorgproto
                 ;; to 2023.2.
-                ((" 'validate',") ""))
+                ((" 'validate',") "")
+                ;; New failures with 4.14
+                (("'glyph-subpixel-position',") "")
+                (("'subpixel-positioning',") "")
+                (("'subpixel-positioning-hidpi-nogl-nocairo',") "")
+                (("'text.*\\.node',") "")
+                (("'text-mixed-color-colrv1',") ""))
               (substitute* "testsuite/reftests/meson.build"
                 (("[ \t]*'label-wrap-justify.ui',") "")
                 ;; The inscription-markup.ui fails due to /etc/machine-id
@@ -1267,6 +1273,7 @@ (define-public gtk
            python-toml
            python-typogrify
            sassc                        ;for building themes
+           shaderc
            tzdata-for-tests
            vala
            xorg-server-for-tests))
-- 
2.41.0

[bug#70247] [PATCH gnome-team v2 2/4] gnu: gtk: Update to 4.14.2.

[Maxim Cournoyer]

Hi,

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

> * gnu/packages/gtk.scm (gtk): Update to 4.14.2.
> [#:phases]<patch>: Disable new test failures.
> [inputs]: Add shaderc.
> ---
>  gnu/packages/gtk.scm | 13 ++++++++++---
>  1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
> index 4fae0fd275..40b7200c57 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.12.3")
> +    (version "4.14.2")
>      (source
>       (origin
>         (method url-fetch)
> @@ -1127,7 +1127,7 @@ (define-public gtk
>                             (version-major+minor version)  "/"
>                             name "-" version ".tar.xz"))
>         (sha256
> -        (base32 "128ahzsj016vz8brd8kplhfkxg2q7wy7kndibx2qfr68yrif530l"))
> +        (base32 "0wp0w259rkwf6g8sk2b9jkms47vx5gp7mfs345grx9wq53plqq12"))
>         (patches
>          (search-patches "gtk4-respect-GUIX_GTK4_PATH.patch"))
>         (modules '((guix build utils)))))
> @@ -1199,7 +1199,13 @@ (define-public gtk
>                  ;; This test, 'gtk:tools / validate', started failing for
>                  ;; unknown reasons after updating mesa to 23.3.1 and xorgproto
>                  ;; to 2023.2.
> -                ((" 'validate',") ""))
> +                ((" 'validate',") "")
> +                ;; New failures with 4.14

nitpick: Please punctuate your standalone comments.  A link to the
reported upstream issues would be icing on the cake.

> +                (("'glyph-subpixel-position',") "")
> +                (("'subpixel-positioning',") "")
> +                (("'subpixel-positioning-hidpi-nogl-nocairo',") "")
> +                (("'text.*\\.node',") "")
> +                (("'text-mixed-color-colrv1',") ""))
>                (substitute* "testsuite/reftests/meson.build"
>                  (("[ \t]*'label-wrap-justify.ui',") "")
>                  ;; The inscription-markup.ui fails due to /etc/machine-id
> @@ -1267,6 +1273,7 @@ (define-public gtk
>             python-toml
>             python-typogrify
>             sassc                        ;for building themes
> +           shaderc
>             tzdata-for-tests
>             vala
>             xorg-server-for-tests))

Otherwise LGTM.

-- 
Thanks,
Maxim

[bug#70247] [PATCH gnome-team v2 3/4] gnu: webkitgtk: Update to 2.44.1.

[Liliana Marie Prikler]

* gnu/packages/webkit.scm (webkitgtk): Update to 2.44.1.
---
 gnu/packages/webkit.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index bf24a65e83..643f1d8f43 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -127,13 +127,13 @@ (define-public wpebackend-fdo
 (define-public webkitgtk
   (package
     (name "webkitgtk")
-    (version "2.42.5")
+    (version "2.44.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.webkitgtk.org/releases/"
                                   name "-" version ".tar.xz"))
               (sha256
-               (base32 "0jg7c7z572afywwrnvdj3m5agaviv0vkqmzznnzzv30byb0phhmn"))
+               (base32 "0qamkk9db8m6x4qv5y10lihc18yzgrgbn6ldqw00ckghn1ci8ns2"))
               (snippet
                #~(begin
                    (use-modules (guix build utils))
-- 
2.41.0

[bug#70247] [PATCH gnome-team v2 4/4] gnu: wpewebkit: Update to 2.44.1.

[Liliana Marie Prikler]

* gnu/packages/webkit.scm (wpewebkit): Update to 2.44.1.
---
 gnu/packages/webkit.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 643f1d8f43..9b6f51d33c 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -322,13 +322,13 @@ (define-public wpewebkit
   (package
     (inherit webkitgtk)
     (name "wpewebkit")
-    (version "2.40.5")
+    (version "2.44.1")
     (source (origin
               (inherit (package-source webkitgtk))
               (uri (string-append "https://wpewebkit.org/releases/"
                                   name "-" version ".tar.xz"))
               (sha256
-               (base32 "0cv74qy67a0hg8sba18wrjcmmwkj4z23wqnn5yqrh3n594q8srac"))))
+               (base32 "16y1gdz38d4b99b8zrvxy0nbrc70ih02ngi8090x7148rx7vz7rc"))))
     (arguments
      (substitute-keyword-arguments (package-arguments webkitgtk)
        ((#:configure-flags flags)
-- 
2.41.0

bug#70247: [PATCH gnome-team v2 4/4] gnu: wpewebkit: Update to 2.44.1.

[Liliana Marie Prikler]

Am Freitag, dem 19.04.2024 um 20:59 +0200 schrieb Liliana Marie
Prikler:
> * gnu/packages/webkit.scm (wpewebkit): Update to 2.44.1.
> ---
Marking as done since it's part of the upcoming gnome-team merge.

[bug#70247] [PATCH gnome-team 0/4] Why not bump GTK while we're at it?

[Maxim Cournoyer]

Hi Liliana,

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

> Hi Guix,
>
> with Webkit needing an update, a weird graphene bug[1], and a request
> to update gtk so that zrythm could be bumped… well, let's say there's
> stuff to do.
>
> Cheers
>
> Liliana Marie Prikler (4):
>   gnu: graphene: Build without ARM neon.
>   gnu: gtk: Update to 4.14.2.
>   [untested] gnu: webkitgtk: Update to 2.44.0.
>   [untested] gnu: wpewebkit: Update to 2.44.0.

Did the patches go somewhere else?  I'm not seeing those attached to
this submission.

-- 
Thanks,
Maxim

[bug#70247] [PATCH gnome-team 0/4] Why not bump GTK while we're at it?

[Liliana Marie Prikler]

Am Donnerstag, dem 18.04.2024 um 21:54 -0400 schrieb Maxim Cournoyer:
> Hi Liliana,
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> 
> > Hi Guix,
> > 
> > with Webkit needing an update, a weird graphene bug[1], and a
> > request
> > to update gtk so that zrythm could be bumped… well, let's say
> > there's
> > stuff to do.
> > 
> > Cheers
> > 
> > Liliana Marie Prikler (4):
> >   gnu: graphene: Build without ARM neon.
> >   gnu: gtk: Update to 4.14.2.
> >   [untested] gnu: webkitgtk: Update to 2.44.0.
> >   [untested] gnu: wpewebkit: Update to 2.44.0.
> 
> Did the patches go somewhere else?  I'm not seeing those attached to
> this submission.
I could swear I sent them… but they never arrived?!?

Hang on, I'm redoing this with 2.44.1.

[bug#70247] [PATCH gnome-team 0/4] Why not bump GTK while we're at it?

[Maxim Cournoyer]

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

> Am Donnerstag, dem 18.04.2024 um 21:54 -0400 schrieb Maxim Cournoyer:
>> Hi Liliana,
>> 
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>> 
>> > Hi Guix,
>> > 
>> > with Webkit needing an update, a weird graphene bug[1], and a
>> > request
>> > to update gtk so that zrythm could be bumped… well, let's say
>> > there's
>> > stuff to do.
>> > 
>> > Cheers
>> > 
>> > Liliana Marie Prikler (4):
>> >   gnu: graphene: Build without ARM neon.
>> >   gnu: gtk: Update to 4.14.2.
>> >   [untested] gnu: webkitgtk: Update to 2.44.0.
>> >   [untested] gnu: wpewebkit: Update to 2.44.0.
>> 
>> Did the patches go somewhere else?  I'm not seeing those attached to
>> this submission.
> I could swear I sent them… but they never arrived?!?
>
> Hang on, I'm redoing this with 2.44.1.
>
>

I had one tiny comment for your 2/4 commit, but otherwise:

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

-- 
Thanks,
Maxim

[bug#70247] [PATCH gnome-team v2 0/4] Why not bump GTK while we're at it?

[Dale Mellor]

This is needed to put a title on the bug in QA.guix.gnu.org/patches.

[bug#70247] [PATCH gnome-team v2 0/4] Why not bump GTK while we're at it?

[Liliana Marie Prikler]

Am Dienstag, dem 23.04.2024 um 22:39 +0100 schrieb Dale Mellor:
> This is needed to put a title on the bug in QA.guix.gnu.org/patches.
Ehh, yeah, thanks for nothing, I guess, as neither the actual patches
nor anything else appear to be correctly tracked.

I've pushed this series, and I'll shortly follow it up with an
automatic merge from master.  It's high time to do something, what with
the webkit situation.  Let's get CI doing its usual job and hope we can
merge back to master soon.

Cheers

PS: Never ever forget about CC!