[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/11: gnu: gtk+: Use gexps and replace iso-codes/official with iso-code
From: |
guix-commits |
Subject: |
11/11: gnu: gtk+: Use gexps and replace iso-codes/official with iso-codes. |
Date: |
Sun, 20 Nov 2022 14:10:14 -0500 (EST) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit affaacf4f46639dcc8239a438cad11c2a6ef6c9a
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Nov 18 21:32:33 2022 -0500
gnu: gtk+: Use gexps and replace iso-codes/official with iso-codes.
* gnu/packages/gtk.scm (gtk+) [inputs]: Replace iso-codes/official with
iso-codes.
[arguments]: Use gexps.
---
gnu/packages/gtk.scm | 109 +++++++++++++++++++++++++--------------------------
1 file changed, 54 insertions(+), 55 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 015044c268..354a5b026d 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1023,64 +1023,63 @@ application suites.")
xorg-server-for-tests
libxslt))
(arguments
- `(#:imported-modules ((guix build glib-or-gtk-build-system)
+ (list
+ #:imported-modules `((guix build glib-or-gtk-build-system)
,@%gnu-build-system-modules)
- #:modules ((guix build utils)
+ #: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="
- (assoc-ref %outputs "doc")
- "/share/gtk-doc/html")
- "--enable-cloudproviders"
- ;; The header file <gdk/gdkwayland.h> is
required
- ;; by gnome-control-center
- "--enable-wayland-backend"
- ;; This is necessary to build both backends.
- "--enable-x11-backend"
- ;; This enables the HTML5 websocket backend.
- "--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"
- (("builderparser cellarea check-icon-names check-cursor-names")
- "builderparser cellarea check-cursor-names")
- (("notify no-gtk-init object objects-finalize papersize rbtree")
- "no-gtk-init papersize rbtree")
- (("stylecontext templates textbuffer textiter treemodel
treepath")
- "stylecontext textbuffer textiter treemodel treepath"))
- (substitute* "testsuite/a11y/Makefile.in"
- (("accessibility-dump tree-performance text children derive")
- "tree-performance text children derive"))
- (substitute* "testsuite/reftests/Makefile.in"
- (("TEST_PROGS = gtk-reftest")
- "TEST_PROGS = "))))
- (add-before 'check 'pre-check
- (lambda _
- ;; Tests require a running X server.
- (system "Xvfb :1 +extension GLX &")
- (setenv "DISPLAY" ":1")
- ;; Tests write to $HOME.
- (setenv "HOME" (getcwd))
- ;; Tests look for $XDG_RUNTIME_DIR.
- (setenv "XDG_RUNTIME_DIR" (getcwd))
- ;; For missing '/etc/machine-id'.
- (setenv "DBUS_FATAL_WARNINGS" "0")))
- (add-after 'install 'move-desktop-files
- ;; Move desktop files into 'bin' to avoid cycle references.
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (bin (assoc-ref outputs "bin")))
- (mkdir-p (string-append bin "/share"))
- (rename-file (string-append out "/share/applications")
- (string-append bin "/share/applications"))))))))
+ #:disallowed-references (list 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="
+ #$output "/share/gtk-doc/html")
+ "--enable-cloudproviders"
+ ;; The header file <gdk/gdkwayland.h> is
required
+ ;; by gnome-control-center
+ "--enable-wayland-backend"
+ ;; This is necessary to build both backends.
+ "--enable-x11-backend"
+ ;; This enables the HTML5 websocket backend.
+ "--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"
+ (("builderparser cellarea check-icon-names check-cursor-names")
+ "builderparser cellarea check-cursor-names")
+ (("notify no-gtk-init object objects-finalize papersize
rbtree")
+ "no-gtk-init papersize rbtree")
+ (("stylecontext templates textbuffer textiter treemodel
treepath")
+ "stylecontext textbuffer textiter treemodel treepath"))
+ (substitute* "testsuite/a11y/Makefile.in"
+ (("accessibility-dump tree-performance text children derive")
+ "tree-performance text children derive"))
+ (substitute* "testsuite/reftests/Makefile.in"
+ (("TEST_PROGS = gtk-reftest")
+ "TEST_PROGS = "))))
+ (add-before 'check 'pre-check
+ (lambda _
+ ;; Tests require a running X server.
+ (system "Xvfb :1 +extension GLX &")
+ (setenv "DISPLAY" ":1")
+ ;; Tests write to $HOME.
+ (setenv "HOME" (getcwd))
+ ;; Tests look for $XDG_RUNTIME_DIR.
+ (setenv "XDG_RUNTIME_DIR" (getcwd))
+ ;; For missing '/etc/machine-id'.
+ (setenv "DBUS_FATAL_WARNINGS" "0")))
+ (add-after 'install 'move-desktop-files
+ ;; Move desktop files into 'bin' to avoid cycle references.
+ (lambda* (#:key outputs #:allow-other-keys)
+ (mkdir-p (string-append #$output:bin "/share"))
+ (rename-file (string-append #$output "/share/applications")
+ (string-append #$output:bin
+ "/share/applications")))))))
(native-search-paths
(list (search-path-specification
(variable "GUIX_GTK3_PATH")
- branch core-updates updated (8da7e38773 -> affaacf4f4), guix-commits, 2022/11/20
- 01/11: gnu: pango: Update to 1.50.10 and remove input labels., guix-commits, 2022/11/20
- 04/11: gnu: harfbuzz: Update to 5.3.1., guix-commits, 2022/11/20
- 06/11: gnu: graphviz: Update to 7.0.1 and remove input labels., guix-commits, 2022/11/20
- 07/11: gnu: wayland-protocols: Update to 1.29., guix-commits, 2022/11/20
- 09/11: gnu: gtk+-2: Remove trailing #t and use gexps., guix-commits, 2022/11/20
- 10/11: gnu: gtk+-2: Use librsvg-for-system., guix-commits, 2022/11/20
- 03/11: gnu: libdrm: Update to 2.4.114., guix-commits, 2022/11/20
- 05/11: gnu: mesa: Update to 22.2.4., guix-commits, 2022/11/20
- 02/11: gnu: mesa-headers: Strip trailing #t., guix-commits, 2022/11/20
- 11/11: gnu: gtk+: Use gexps and replace iso-codes/official with iso-codes.,
guix-commits <=
- 08/11: gnu: pangomm: Update to 2.50.1 and remove input labels., guix-commits, 2022/11/20