cbaines pushed a commit to branch master
in repository guix.
commit 81e43f43d0a1ae51f118367573d84465c18af050
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Fri Apr 4 10:20:10 2025 +0900
gnu: gtk: Update to 4.16.13.
* gnu/packages/gtk.scm (gtk): Update to 4.16.13.
[phases] {patch}: Disable the gsk scaling test and mask-half-pixel gsk
compare
test variants.
Change-Id: I041a22ea60fd24f74c705716c1bd1e9a10e2acee
---
gnu/packages/gtk.scm | 58 +++++++++++++++++++++++++---------------------------
1 file changed, 28 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 0fe1f8a016..dc21aed394 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -24,7 +24,7 @@
;;; Copyright © 2019 Giacomo Leidi <[email protected]>
;;; Copyright © 2020 Brendan Tildesley <[email protected]>
;;; Copyright © 2020 Guillaume Le Vaillant <[email protected]>
-;;; Copyright © 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer
<[email protected]>
+;;; Copyright © 2020, 2021, 2022, 2023, 2024, 2025 Maxim Cournoyer
<[email protected]>
;;; Copyright © 2021 Leo Famulari <[email protected]>
;;; Copyright © 2021 Simon Streit <[email protected]>
;;; Copyright © 2021 Maxime Devos <[email protected]>
@@ -1166,7 +1166,7 @@ application suites.")
(define-public gtk
(package
(name "gtk")
- (version "4.16.1")
+ (version "4.16.13")
(source
(origin
(method url-fetch)
@@ -1174,7 +1174,7 @@ application suites.")
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
- (base32 "0p11k5afy3g9d6p402zrn9izkypwzlb51y9qanibzyc1sjmiwslj"))
+ (base32 "1624c9hjp47rlnybhm9vym3hd3dpav5db4fi8nlkk0c45ghxkwyx"))
(patches
(search-patches "gtk4-respect-GUIX_GTK4_PATH.patch"))
(modules '((guix build utils)))))
@@ -1193,30 +1193,21 @@ application suites.")
"-Dcolord=enabled" ;for color printing support
"-Ddocumentation=true"
"-Dman-pages=true")
- #:test-options #~(list "--setup=x11" ;defaults to wayland
- ;; Use the same test options as upstream uses for
- ;; their CI.
- "--suite=gtk"
- "--no-suite=failing"
- "--no-suite=flaky"
- "--no-suite=headless" ; requires mutter…
- "--no-suite=gsk-compare-broadway"
- "--no-suite=needs-udmabuf"
- ;; These seem to fail on aarch64, and Debian has
- ;; also disabled these, see:
- ;;
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050075
- "--no-suite=wayland_failing"
-
- ;; The correct name of the test that fails on
- ;; AArch64 is 'wayland_gles2_failing':
- ;;
<https://gitlab.gnome.org/GNOME/gtk/-/commit/b916c4dac1075572>.
- ;; The second arm of the 'if' is kept to avoid a
- ;; rebuild on other architectures. TODO: Remove
- ;; on the next rebuild cycle.
- #$(if (and (not (%current-target-system))
- (string=? (%current-system)
"aarch64-linux"))
- "--no-suite=wayland_gles2_failing"
- "--no-suite=wayland_gles_failing"))
+ #:test-options
+ #~(list "--setup=x11" ;defaults to wayland
+ ;; Use the same test options as upstream uses for
+ ;; their CI.
+ "--suite=gtk"
+ "--no-suite=failing"
+ "--no-suite=flaky"
+ "--no-suite=headless" ; requires mutter…
+ "--no-suite=gsk-compare-broadway"
+ "--no-suite=needs-udmabuf"
+ ;; These seem to fail on aarch64, and Debian has
+ ;; also disabled these, see:
+ ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050075
+ "--no-suite=wayland_failing"
+ "--no-suite=wayland_gles2_failing")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
@@ -1246,7 +1237,14 @@ application suites.")
;; to 2023.2.
((" 'validate',") "")
;; XXX: Figure out why this fails and report upstream.
- ((".*'memorytexture',.*") ""))
+ ((".*'memorytexture',.*") "")
+ ;; Some mask-half-pixel variant tests of the gsk-compare-gl
+ ;; suite are failing starting with 4.16.13.
+ ;; TODO: Reinstate in 4.18.
+ ((".*'mask-half-pixel',.*") "")
+ ;; The 'gtk:gsk / scaling' test fails starting with 4.16.13.
+ ;; TODO: Reinstate in 4.18.
+ ((".*'scaling',.*") ""))
(substitute* "testsuite/reftests/meson.build"
(("[ \t]*'label-wrap-justify.ui',") ""))
;; These tests fail on an Apple M1 (aarch64) with the following
errors:
@@ -1290,8 +1288,8 @@ application suites.")
(("\\[ '(path|curve)-special-cases' \\],") "")
(("\\[ 'path-private' \\],") ""))
(substitute* "testsuite/a11y/meson.build"
- (("\\{ 'name': 'text(view)?' \\},") "")))
- #~())))
+ (("\\{ 'name': 'text(view)?' \\},") "")))
+ #~())))
(add-before 'build 'set-cache
(lambda _
(setenv "XDG_CACHE_HOME" (getcwd))))
