~ruther/guix-local: gnu: librsvg@2.40: Depend on the default Pango version.

c19f968cbd189ae4b7c2d0dba1c2040f1c560c2c — Ludovic Courtès 4 years ago a9d426c

gnu: librsvg@2.40: Depend on the default Pango version.

This avoids conflicts where, say, gtk+ would pull pango@1.44 whereas
mate-control-center would additionally pull pango@1.42 via librsvg@2.40
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.

patch browse .tar.gz .zip

1 files changed, 8 insertions(+), 5 deletions(-)

M gnu/packages/gnome.scm

M gnu/packages/gnome.scm => gnu/packages/gnome.scm +8 -5

@@ 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)