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.
This commit is contained in:
parent
a9d426c492
commit
c19f968cbd
1 changed files with 8 additions and 5 deletions
|
@ -3675,16 +3675,19 @@ diagrams.")
|
||||||
;; This test fails on armhf:
|
;; This test fails on armhf:
|
||||||
"svg1.1/masking-mask-01-b.svg"
|
"svg1.1/masking-mask-01-b.svg"
|
||||||
;; This test fails on aarch64:
|
;; This test fails on aarch64:
|
||||||
"bugs/777834-empty-text-children.svg")))
|
"bugs/777834-empty-text-children.svg"
|
||||||
#t)))))
|
|
||||||
|
;; These two tests fail due to slightly different
|
||||||
|
;; text rendering (different kerning or similar),
|
||||||
|
;; nothing alarming.
|
||||||
|
"bugs/340047.svg"
|
||||||
|
"bugs/749415.svg"))))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)
|
`(("pkg-config" ,pkg-config)
|
||||||
("glib" ,glib "bin") ; glib-mkenums, etc.
|
("glib" ,glib "bin") ; glib-mkenums, etc.
|
||||||
("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
|
("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc.
|
||||||
(inputs
|
(inputs
|
||||||
`(;; XXX: 1.44 causes some test failures, so we stick with 1.42 for
|
`(("pango" ,pango)
|
||||||
;; this ancient version of librsvg.
|
|
||||||
("pango" ,pango-1.42)
|
|
||||||
("libcroco" ,libcroco)
|
("libcroco" ,libcroco)
|
||||||
("bzip2" ,bzip2)
|
("bzip2" ,bzip2)
|
||||||
("libgsf" ,libgsf)
|
("libgsf" ,libgsf)
|
||||||
|
|
Reference in a new issue