civodul pushed a commit to branch core-updates-frozen
in repository guix.
commit c19f968cbd189ae4b7c2d0dba1c2040f1c560c2c
Author: Ludovic Courtès <[email protected]>
AuthorDate: Sun Dec 5 21:37:06 2021 +0100
gnu: [email protected]: Depend on the default Pango version.
This avoids conflicts where, say, gtk+ would pull [email protected] whereas
mate-control-center would additionally pull [email protected] via [email protected]
on i686-linux.
* gnu/packages/gnome.scm (librsvg-2.40)[arguments]: In
'remove-failing-tests' phase, remove two additional tests.
[inputs]: Change PANGO-1.42 to PANGO.
---
gnu/packages/gnome.scm | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 04632ad..df6f294 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3675,16 +3675,19 @@ diagrams.")
;; This test fails on armhf:
"svg1.1/masking-mask-01-b.svg"
;; This test fails on aarch64:
- "bugs/777834-empty-text-children.svg")))
- #t)))))
+ "bugs/777834-empty-text-children.svg"
+
+ ;; These two tests fail due to slightly different
+ ;; text rendering (different kerning or similar),
+ ;; nothing alarming.
+ "bugs/340047.svg"
+ "bugs/749415.svg"))))))))
(native-inputs
`(("pkg-config" ,pkg-config)
("glib" ,glib "bin") ; glib-mkenums, etc.
("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
(inputs
- `(;; XXX: 1.44 causes some test failures, so we stick with 1.42 for
- ;; this ancient version of librsvg.
- ("pango" ,pango-1.42)
+ `(("pango" ,pango)
("libcroco" ,libcroco)
("bzip2" ,bzip2)
("libgsf" ,libgsf)