ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 23:46:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
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 @@ (define-public libhandy
(search-input-file inputs
"/xml/dtd/docbook/docbookx.dtd"))))
(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
(lambda _
;; Tests require a running X server.

19
gnu/packages/gtk.scm
View file

@ -966,11 +966,7 @@ (define-public gtk+
("fribidi" ,fribidi)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
;; SVG support is optional and requires librsvg, which pulls in rust.
;; Rust is not supported well on every architecture yet.
("gdk-pixbuf" ,(if (target-x86-64?)
librsvg
gdk-pixbuf))
("gdk-pixbuf" ,(librsvg-for-system))
("glib" ,glib)
("libcloudproviders" ,libcloudproviders-minimal)
("libepoxy" ,libepoxy)
@ -1045,19 +1041,10 @@ (define-public gtk+
(("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")
;; 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"))
'()))
"stylecontext textbuffer textiter treemodel treepath"))
(substitute* "testsuite/a11y/Makefile.in"
(("accessibility-dump tree-performance text children derive")
"tree-performance text children derive")
,@(if (not (target-x86-64?))
'((("value misc tree-relationships util")
"value misc util"))
'()))
"tree-performance text children derive"))
(substitute* "testsuite/reftests/Makefile.in"
(("TEST_PROGS = gtk-reftest")
"TEST_PROGS = "))