From a7e831a556accc2f937bf8d7f54977037b128f81 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 11 Nov 2023 01:19:20 +0100 Subject: [PATCH] gnu: gtk: Update to 4.12.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 @@ application suites.") (define-public gtk (package (name "gtk") - (version "4.10.3") + (version "4.12.3") (source (origin (method url-fetch) @@ -1127,11 +1127,10 @@ application suites.") (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 @@ application suites.") "--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 @@ application suites.") (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',") "")