amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gtk+: Ungraft.

Browse source 
* gnu/packages/gtk.scm (gtk+): Update to 3.24.43.
[replacement]: Remove.
[source]: Use git-fetch.
[arguments]<#:phases>: Add some test to disable-failing-tests phase.
(gtk+/fixed): Remove.

Change-Id: Ia34ac538f36424748e0a813cfc4e0dad2d643d0b
This commit is contained in:
John Kehayias 2025-09-09 17:37:36 -04:00
parent 68fbaa044e
commit a0246e63b1
No known key found for this signature in database
GPG key ID: 499097AE5EA815D9
1 changed files with 24 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

77
gnu/packages/gtk.scm
View file

@ -1009,19 +1009,19 @@ application suites.")
(package (package
(inherit gtk+-2) (inherit gtk+-2)
(name "gtk+") (name "gtk+")
(version "3.24.43") (version "3.24.49")
(replacement gtk+/fixed) (source (origin
(source (method git-fetch)
(origin (uri (git-reference
(method url-fetch) (url "https://gitlab.gnome.org/GNOME/gtk")
(uri (string-append "mirror://gnome/sources/" name "/" (commit version)))
(version-major+minor version) "/" (file-name (git-file-name name version))
name "-" version ".tar.xz")) (sha256
(sha256 (base32
(base32 "0flsnh3f0l9v3y2hmnxz1h15nw1l12ixmiwcpiy1ywplrlgq4j00"))
"1izky8dxaxp4bg5nii4n58dgpkw79mvmvbkldf04n0qmhmjg013y")) (patches (search-patches
(patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_PATH.patch"
"gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
;; There is no "doc" output, because adding gtk-doc here would introduce a ;; There is no "doc" output, because adding gtk-doc here would introduce a
;; dependency cycle with itself. ;; dependency cycle with itself.
(outputs '("out" "bin")) (outputs '("out" "bin"))
@ -1097,11 +1097,17 @@ application suites.")
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'disable-failing-tests (add-after 'unpack 'disable-failing-tests
(lambda _ (lambda _
;; These tests fail only in the containerized environment, for ;; These tests fail only in the containerized environment, for
;; unknown reasons. ;; unknown reasons.
(substitute* "testsuite/gtk/meson.build" (substitute* "testsuite/gtk/meson.build"
((".*\\['defaultvalue'],.*") "") ((".*\\['defaultvalue'],.*") "")
((".*\\['objects-finalize',.*") "")))) ((".*\\['objects-finalize',.*") ""))
;; The 'flipping-icons.ui' and 'gtk-icontheme-sizing.ui' tests
;; fail for unknown reasons (see:
;; <https://gitlab.gnome.org/GNOME/gtk/-/issues/7679>).
(substitute* "testsuite/reftests/meson.build"
((" 'flipping-icons.ui',.*") "")
((" 'gtk-icontheme-sizing.ui',.*") ""))))
(add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
(assoc-ref glib-or-gtk:%standard-phases (assoc-ref glib-or-gtk:%standard-phases
'generate-gdk-pixbuf-loaders-cache-file)) 'generate-gdk-pixbuf-loaders-cache-file))
@ -1128,41 +1134,6 @@ application suites.")
(variable "GUIX_GTK3_PATH") (variable "GUIX_GTK3_PATH")
(files '("lib/gtk-3.0"))))))) (files '("lib/gtk-3.0")))))))
(define-public gtk+/fixed
(package
(inherit gtk+)
(name "gtk+")
(version "3.24.49")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://gitlab.gnome.org/GNOME/gtk")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0flsnh3f0l9v3y2hmnxz1h15nw1l12ixmiwcpiy1ywplrlgq4j00"))
(patches (search-patches
"gtk3-respect-GUIX_GTK3_PATH.patch"
"gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
(arguments
(substitute-keyword-arguments (package-arguments gtk+)
((#:phases phases)
#~(modify-phases #$phases
(replace 'disable-failing-tests
(lambda _
;; These tests fail only in the containerized environment, for
;; unknown reasons.
(substitute* "testsuite/gtk/meson.build"
((".*\\['defaultvalue'],.*") "")
((".*\\['objects-finalize',.*") ""))
;; The 'flipping-icons.ui' and 'gtk-icontheme-sizing.ui' tests
;; fail for unknown reasons (see:
;; <https://gitlab.gnome.org/GNOME/gtk/-/issues/7679>).
(substitute* "testsuite/reftests/meson.build"
((" 'flipping-icons.ui',.*") "")
((" 'gtk-icontheme-sizing.ui',.*") ""))))))))))
(define-public gtk (define-public gtk
(package (package
(name "gtk") (name "gtk")