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

  • Done
  • quality assurance status badge
Details
3 participants
  • Dale Mellor
  • Liliana Marie Prikler
  • Maxim Cournoyer
Owner
unassigned
Submitted by
Liliana Marie Prikler
Severity
normal
L
L
Liliana Marie Prikler wrote on 6 Apr 23:23 +0200
(address . guix-patches@gnu.org)
cover.1712438620.git.liliana.prikler@gmail.com
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.


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


base-commit: c4ee869379cd412cc717ff07bc31801add04c0a6
--
2.41.0
M
M
Maxim Cournoyer wrote on 19 Apr 03:54 +0200
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
87r0f2m81c.fsf@gmail.com
Hi Liliana,

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

Toggle quote (14 lines)
> 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
L
L
Liliana Marie Prikler wrote on 19 Apr 20:56 +0200
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
fefaf61583da3e9d9951ece3961bd2ee2b1b28d2.camel@gmail.com
Am Donnerstag, dem 18.04.2024 um 21:54 -0400 schrieb Maxim Cournoyer:
Toggle quote (22 lines)
> 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.
L
L
Liliana Marie Prikler wrote on 6 Apr 09:32 +0200
[PATCH gnome-team v2 1/4] gnu: graphene: Build without ARM neon.
(address . 70247@debbugs.gnu.org)
026f898291bbf618996ea40f64fbffc09fcc9066.1713553254.git.liliana.prikler@gmail.com
* gnu/packages/gtk.scm (graphene)[#:configure-flags]: Add “-Darm_neon=false”.
---
gnu/packages/gtk.scm | 3 +++
1 file changed, 3 insertions(+)

Toggle diff (18 lines)
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
L
L
Liliana Marie Prikler wrote on 19 Apr 20:59 +0200
[PATCH gnome-team v2 3/4] gnu: webkitgtk: Update to 2.44.1.
(address . 70247@debbugs.gnu.org)
c1dd6b16aa947ff6341c464f5ffa16931287810f.1713553254.git.liliana.prikler@gmail.com
* gnu/packages/webkit.scm (webkitgtk): Update to 2.44.1.
---
gnu/packages/webkit.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)
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
L
L
Liliana Marie Prikler wrote on 6 Apr 09:34 +0200
[PATCH gnome-team v2 2/4] gnu: gtk: Update to 4.14.2.
(address . 70247@debbugs.gnu.org)
be50394128babb538b6684b6ce2f703634bafaca.1713553254.git.liliana.prikler@gmail.com
* 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(-)

Toggle diff (47 lines)
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
L
L
Liliana Marie Prikler wrote on 19 Apr 20:59 +0200
[PATCH gnome-team v2 4/4] gnu: wpewebkit: Update to 2.44.1.
(address . 70247@debbugs.gnu.org)
4ed4d5c9f4957337ea430428fc6184d666b9b2ed.1713553254.git.liliana.prikler@gmail.com
* gnu/packages/webkit.scm (wpewebkit): Update to 2.44.1.
---
gnu/packages/webkit.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (22 lines)
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
M
M
Maxim Cournoyer wrote on 20 Apr 18:19 +0200
Re: [bug#70247] [PATCH gnome-team v2 2/4] gnu: gtk: Update to 4.14.2.
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
877cgsj9b4.fsf@gmail.com
Hi,

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

Toggle quote (37 lines)
> * 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.

Toggle quote (17 lines)
> + (("'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
M
M
Maxim Cournoyer wrote on 20 Apr 18:20 +0200
Re: [bug#70247] [PATCH gnome-team 0/4] Why not bump GTK while we're at it?
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
8734rgj9ad.fsf@gmail.com
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

Toggle quote (29 lines)
> 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
D
D
Dale Mellor wrote on 23 Apr 23:39 +0200
[PATCH gnome-team v2 0/4] Why not bump GTK while we're at it?
(address . 70247@debbugs.gnu.org)
ac81d2c411c0c605d51aee8996f311f1d514d25d.camel@rdmp.org
This is needed to put a title on the bug in QA.guix.gnu.org/patches.
L
L
Liliana Marie Prikler wrote on 25 Apr 18:36 +0200
7d990e6d54cb8f063e96ec538196de2dc62f409c.camel@gmail.com
Am Dienstag, dem 23.04.2024 um 22:39 +0100 schrieb Dale Mellor:
Toggle quote (1 lines)
> 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!
L
L
Liliana Marie Prikler wrote on 14 May 07:38 +0200
Re: [PATCH gnome-team v2 4/4] gnu: wpewebkit: Update to 2.44.1.
(address . 70247-done@debbugs.gnu.org)
540d81cc16c3dc44be3a0857cae9c83ad824b521.camel@gmail.com
Am Freitag, dem 19.04.2024 um 20:59 +0200 schrieb Liliana Marie
Prikler:
Toggle quote (2 lines)
> * gnu/packages/webkit.scm (wpewebkit): Update to 2.44.1.
> ---
Marking as done since it's part of the upcoming gnome-team merge.
Closed
?