[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
136/142: gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase.
From: |
guix-commits |
Subject: |
136/142: gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase. |
Date: |
Wed, 20 Oct 2021 14:57:02 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 2097b1809c4ab3db3e134288734d2c631250e48e
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Oct 16 02:23:47 2021 -0400
gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase.
* gnu/packages/gtk.scm (gtk+)[arguments]: Import the (guix build
glib-or-gtk-build-system) module and put it in scope.
[phases]{generate-gdk-pixbuf-loaders-cache-file}: New phase.
(gtk): Likewise.
---
gnu/packages/gtk.scm | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 9e0438f..529e301 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1039,7 +1039,12 @@ application suites.")
("xorg-server" ,xorg-server-for-tests)
("xsltproc" ,libxslt)))
(arguments
- `(#:disallowed-references (,xorg-server-for-tests)
+ `(#:imported-modules ((guix build glib-or-gtk-build-system)
+ ,@%gnu-build-system-modules)
+ #:modules ((guix build utils)
+ (guix build gnu-build-system)
+ ((guix build glib-or-gtk-build-system) #:prefix
glib-or-gtk:))
+ #:disallowed-references (,xorg-server-for-tests)
;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB goes
;; to "doc".
#:configure-flags (list (string-append "--with-html-dir="
@@ -1055,6 +1060,9 @@ application suites.")
"--enable-broadway-backend")
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
+ (assoc-ref glib-or-gtk:%standard-phases
+ 'generate-gdk-pixbuf-loaders-cache-file))
(add-after 'unpack 'disable-failing-tests
(lambda _
(substitute* "testsuite/gtk/Makefile.in"
@@ -1119,7 +1127,12 @@ application suites.")
(build-system meson-build-system)
(outputs '("out" "bin" "doc"))
(arguments
- `(#:configure-flags
+ `(#:imported-modules ((guix build glib-or-gtk-build-system)
+ ,@%gnu-build-system-modules)
+ #:modules ((guix build utils)
+ (guix build gnu-build-system)
+ ((guix build glib-or-gtk-build-system) #:prefix
glib-or-gtk:))
+ #:configure-flags
(list
"-Dbroadway-backend=true" ;for broadway display-backend
"-Dcloudproviders=enabled" ;for cloud-providers support
@@ -1133,6 +1146,9 @@ application suites.")
"-Dman-pages=true")
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
+ (assoc-ref glib-or-gtk:%standard-phases
+ 'generate-gdk-pixbuf-loaders-cache-file))
(add-after 'unpack 'patch
(lambda* (#:key inputs native-inputs outputs #:allow-other-keys)
;; Correct DTD resources of docbook.
- 108/142: gnu: lsof: Fix indentation., (continued)
- 108/142: gnu: lsof: Fix indentation., guix-commits, 2021/10/20
- 127/142: gnu: vala: Update to 0.54.2., guix-commits, 2021/10/20
- 14/142: gnu: librsvg-next: Do not propagate gdk-pixbuf., guix-commits, 2021/10/20
- 115/142: gnu: inkscape: Remove the legacy 0.92 version., guix-commits, 2021/10/20
- 30/142: gnu: farstream: Enable tests., guix-commits, 2021/10/20
- 27/142: gnu: gst-editing-services: Update to 1.18.4., guix-commits, 2021/10/20
- 26/142: gnu: gst-plugins-bad: Add missing inputs to enable more features., guix-commits, 2021/10/20
- 46/142: gnu: gst-libav: Update to 1.19.2., guix-commits, 2021/10/20
- 102/142: gnu: meson: Patch to allow installing to independent prefixes., guix-commits, 2021/10/20
- 128/142: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal., guix-commits, 2021/10/20
- 136/142: gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase.,
guix-commits <=
- 141/142: gnu: gawk: Use regular bash to cope with test suite failures., guix-commits, 2021/10/20
- 104/142: build: glib-or-gtk-build-system: Fix indentation., guix-commits, 2021/10/20
- 08/142: gnu: gtk+: Add a debug output., guix-commits, 2021/10/20
- 17/142: gnu: mutter: Propagate gdk-pixbuf+svg rather than gdk-pixbuf., guix-commits, 2021/10/20
- 29/142: gnu: e2fsprogs: Update to 1.46.2., guix-commits, 2021/10/20
- 47/142: gnu: gst-editing-services: Update to 1.19.2., guix-commits, 2021/10/20
- 57/142: gnu: Add a missing copyright., guix-commits, 2021/10/20
- 60/142: gnu: gstreamer: Update to 1.18.5., guix-commits, 2021/10/20
- 63/142: gnu: gst-plugins-bad: Update to 1.18.5., guix-commits, 2021/10/20
- 73/142: bluez: Update to 5.61., guix-commits, 2021/10/20