me
/
guix
Archived
1
0
Fork 0
Code

gnu: gtk+: Use 'librsvg-for-system'. 

This brings back SVG support on non-x86_64 platforms.

* gnu/packages/gtk.scm (gtk+)[inputs]: Use 'librsvg-for-system'
unconditionally.
[arguments]: In 'disable-failing-tests' phase, remove conditional
substitutions aimed for non-x86_64 targets lacking librsvg support.
* gnu/packages/gnome.scm (libhandy)[arguments]: Likewise, remove
'skip-test-that-requires-svg' phase.
master
Ludovic Courtès 2021-12-05 22:38:50 +01:00
parent 3bd7ce6053
commit 2561f2720f
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/gnome.scm
View File

@ -11474,14 +11474,6 @@ tabs, and it supports drag and drop re-ordering of terminals.")
(search-input-file inputs (search-input-file inputs
"/xml/dtd/docbook/docbookx.dtd")))) "/xml/dtd/docbook/docbookx.dtd"))))
(find-files "doc" "\\.xml")))) (find-files "doc" "\\.xml"))))
,@(if (target-x86-64?)
'()
'((add-after 'unpack 'skip-test-that-requires-svg
(lambda _
;; On non-x86-64, gdk-pixbuf lacks librsvg support, so
;; skip the test that requires it.
(substitute* "tests/meson.build"
(("'test-avatar',") ""))))))
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
;; Tests require a running X server. ;; Tests require a running X server.

19
gnu/packages/gtk.scm
View File

@ -966,11 +966,7 @@ application suites.")
("fribidi" ,fribidi) ("fribidi" ,fribidi)
("fontconfig" ,fontconfig) ("fontconfig" ,fontconfig)
("freetype" ,freetype) ("freetype" ,freetype)
;; SVG support is optional and requires librsvg, which pulls in rust. ("gdk-pixbuf" ,(librsvg-for-system))
;; Rust is not supported well on every architecture yet.
("gdk-pixbuf" ,(if (target-x86-64?)
librsvg
gdk-pixbuf))
("glib" ,glib) ("glib" ,glib)
("libcloudproviders" ,libcloudproviders-minimal) ("libcloudproviders" ,libcloudproviders-minimal)
("libepoxy" ,libepoxy) ("libepoxy" ,libepoxy)
@ -1045,19 +1041,10 @@ application suites.")
(("notify no-gtk-init object objects-finalize papersize rbtree") (("notify no-gtk-init object objects-finalize papersize rbtree")
"no-gtk-init papersize rbtree") "no-gtk-init papersize rbtree")
(("stylecontext templates textbuffer textiter treemodel treepath") (("stylecontext templates textbuffer textiter treemodel treepath")
"stylecontext textbuffer textiter treemodel treepath") "stylecontext textbuffer textiter treemodel treepath"))
;; The ‘icontheme’ test needs SVG support.
,@(if (not (target-x86-64?))
'((("floating focus gestures grid gtkmenu icontheme keyhash listbox")
"floating focus gestures grid gtkmenu keyhash listbox"))
'()))
(substitute* "testsuite/a11y/Makefile.in" (substitute* "testsuite/a11y/Makefile.in"
(("accessibility-dump tree-performance text children derive") (("accessibility-dump tree-performance text children derive")
"tree-performance text children derive") "tree-performance text children derive"))
,@(if (not (target-x86-64?))
'((("value misc tree-relationships util")
"value misc util"))
'()))
(substitute* "testsuite/reftests/Makefile.in" (substitute* "testsuite/reftests/Makefile.in"
(("TEST_PROGS = gtk-reftest") (("TEST_PROGS = gtk-reftest")
"TEST_PROGS = ")) "TEST_PROGS = "))