me
/
guix
Archived
1
0
Fork 0
Code

gnu: librsvg: Update to 2.56.4. 

* gnu/packages/gnome.scm (librsvg): Update to 2.56.4.
[source]: Remove snippet.
[cargo-inputs]: Add rust-anyhow-1, rust-clap-complete-4,
rust-encoding-rs-0.8, rust-system-deps-6, rust-thiserror-1. Replace
rust-cairo-rs-0.15 with 0.17, rust-clap-2 with 4, rust-cssparser-0.28
with 0.29, rust-data-url-0.1 with 0.2, rust-gdk-gdkixbuf-0.15 with 0.17,
rust-gio-0.15 with 0.17, rust-glib-0.15 with 0.17, rust-markup5ever-0.10
with 0.11, rust-nalgebra-0.29 with 0.32, rust-pango-0.15 with 0.17,
rust-pangocairo-0.15 with 0.17, rust-rctree-0.4 with 0.5,
rust-selectors-0.23 with 0.24, rust-xml5ever-0.16 with 0.17.  Remove
rust-encoding-0.2.
[cargo-development-inputs]: Add rust-cast-0.3, rust-pango-0.17,
rust-pangocairo-0.17.  Replace rust-cairo-rs-0.15 with 0.17,
rust-criterion-0.3 with 0.4, rust-glib-0.15 with 0.17, rust-lopdf-0.26
with 0.29, rust-yeslogic-fontconfig-sys-3 with 4.  Remove
rust-test-generator-0.3.
[arguments]: Adjust custom phase 'loosen-test-boundaries to changes in
the test suite.
Efraim Flashner 2023-10-01 16:50:04 +03:00
parent 21804ae4bf
commit 5f10c3551b
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
gnu/packages/gnome.scm
View File

@ -3500,7 +3500,7 @@ for dealing with different structured file formats.")
(define-public librsvg (define-public librsvg
(package (package
(name "librsvg") (name "librsvg")
(version "2.54.5") (version "2.56.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/librsvg/" (uri (string-append "mirror://gnome/sources/librsvg/"
@ -3508,10 +3508,7 @@ for dealing with different structured file formats.")
"librsvg-" version ".tar.xz")) "librsvg-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0vmfgihhf35bxn7giqiskgsflr0zxp6xyy9aynhiyk9j8l7ij0sg")) "1xa0cxdvc6vis5ssh1i0vi2rwgcx3bll6k5i135qyd2ra77zv1za"))))
(modules '((guix build utils)))
(snippet
'(begin (delete-file-recursively "vendor")))))
(build-system cargo-build-system) (build-system cargo-build-system)
(outputs '("out" "doc" "debug")) (outputs '("out" "doc" "debug"))
(arguments (arguments
@ -3522,55 +3519,61 @@ for dealing with different structured file formats.")
(guix build utils) (guix build utils)
((guix build gnu-build-system) #:prefix gnu:)) ((guix build gnu-build-system) #:prefix gnu:))
#:cargo-inputs #:cargo-inputs
`(("rust-byteorder" ,rust-byteorder-1) `(("rust-anyhow" ,rust-anyhow-1)
("rust-cairo-rs" ,rust-cairo-rs-0.15) ("rust-byteorder" ,rust-byteorder-1)
("rust-cairo-rs" ,rust-cairo-rs-0.17)
("rust-cast" ,rust-cast-0.3) ("rust-cast" ,rust-cast-0.3)
("rust-chrono" ,rust-chrono-0.4) ("rust-chrono" ,rust-chrono-0.4)
("rust-clap" ,rust-clap-2) ("rust-clap" ,rust-clap-4)
("rust-cssparser" ,rust-cssparser-0.28) ("rust-clap-complete" ,rust-clap-complete-4)
("rust-data-url" ,rust-data-url-0.1) ("rust-cssparser" ,rust-cssparser-0.29)
("rust-encoding" ,rust-encoding-0.2) ("rust-data-url" ,rust-data-url-0.2)
("rust-encoding-rs" ,rust-encoding-rs-0.8)
("rust-float-cmp" ,rust-float-cmp-0.9) ("rust-float-cmp" ,rust-float-cmp-0.9)
("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.15) ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.17)
("rust-gio" ,rust-gio-0.15) ("rust-gio" ,rust-gio-0.17)
("rust-glib" ,rust-glib-0.15) ("rust-glib" ,rust-glib-0.17)
("rust-itertools" ,rust-itertools-0.10) ("rust-itertools" ,rust-itertools-0.10)
("rust-language-tags" ,rust-language-tags-0.3) ("rust-language-tags" ,rust-language-tags-0.3)
("rust-libc" ,rust-libc-0.2) ("rust-libc" ,rust-libc-0.2)
("rust-locale-config" ,rust-locale-config-0.3) ("rust-locale-config" ,rust-locale-config-0.3)
("rust-markup5ever" ,rust-markup5ever-0.10) ("rust-markup5ever" ,rust-markup5ever-0.11)
("rust-nalgebra" ,rust-nalgebra-0.29) ("rust-nalgebra" ,rust-nalgebra-0.32)
("rust-num-traits" ,rust-num-traits-0.2) ("rust-num-traits" ,rust-num-traits-0.2)
("rust-once-cell" ,rust-once-cell-1) ("rust-once-cell" ,rust-once-cell-1)
("rust-pango" ,rust-pango-0.15) ("rust-pango" ,rust-pango-0.17)
("rust-pangocairo" ,rust-pangocairo-0.15) ("rust-pangocairo" ,rust-pangocairo-0.17)
("rust-rayon" ,rust-rayon-1) ("rust-rayon" ,rust-rayon-1)
("rust-rctree" ,rust-rctree-0.4) ("rust-rctree" ,rust-rctree-0.5)
("rust-rgb" ,rust-rgb-0.8)
("rust-regex" ,rust-regex-1) ("rust-regex" ,rust-regex-1)
("rust-selectors" ,rust-selectors-0.23) ("rust-rgb" ,rust-rgb-0.8)
("rust-selectors" ,rust-selectors-0.24)
("rust-string-cache" ,rust-string-cache-0.8) ("rust-string-cache" ,rust-string-cache-0.8)
("rust-system-deps" ,rust-system-deps-6)
("rust-thiserror" ,rust-thiserror-1)
("rust-tinyvec" ,rust-tinyvec-1) ("rust-tinyvec" ,rust-tinyvec-1)
("rust-url" ,rust-url-2) ("rust-url" ,rust-url-2)
("rust-xml5ever" ,rust-xml5ever-0.16)) ("rust-xml5ever" ,rust-xml5ever-0.17))
#:cargo-development-inputs #:cargo-development-inputs
`(("rust-anyhow" ,rust-anyhow-1) `(("rust-anyhow" ,rust-anyhow-1)
("rust-assert-cmd" ,rust-assert-cmd-2) ("rust-assert-cmd" ,rust-assert-cmd-2)
("rust-cairo-rs" ,rust-cairo-rs-0.15) ("rust-cairo-rs" ,rust-cairo-rs-0.17)
("rust-cast" ,rust-cast-0.3)
("rust-chrono" ,rust-chrono-0.4) ("rust-chrono" ,rust-chrono-0.4)
("rust-criterion" ,rust-criterion-0.3) ("rust-criterion" ,rust-criterion-0.4)
("rust-glib" ,rust-glib-0.15) ("rust-glib" ,rust-glib-0.17)
("rust-libc" ,rust-libc-0.2) ("rust-libc" ,rust-libc-0.2)
("rust-lopdf" ,rust-lopdf-0.26) ("rust-lopdf" ,rust-lopdf-0.29)
("rust-matches" ,rust-matches-0.1) ("rust-matches" ,rust-matches-0.1)
("rust-pango" ,rust-pango-0.17)
("rust-pangocairo" ,rust-pangocairo-0.17)
("rust-png" ,rust-png-0.17) ("rust-png" ,rust-png-0.17)
("rust-predicates" ,rust-predicates-2) ("rust-predicates" ,rust-predicates-2)
("rust-proptest" ,rust-proptest-1) ("rust-proptest" ,rust-proptest-1)
("rust-serde" ,rust-serde-1) ("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1) ("rust-serde-json" ,rust-serde-json-1)
("rust-tempfile" ,rust-tempfile-3) ("rust-tempfile" ,rust-tempfile-3)
("rust-test-generator" ,rust-test-generator-0.3) ("rust-yeslogic-fontconfig-sys" ,rust-yeslogic-fontconfig-sys-4))
("rust-yeslogic-fontconfig-sys" ,rust-yeslogic-fontconfig-sys-2))
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-gdk-pixbuf-thumbnailer (add-after 'unpack 'patch-gdk-pixbuf-thumbnailer
@ -3594,12 +3597,9 @@ for dealing with different structured file formats.")
;; Increase reftest tolerance a bit to account for different ;; Increase reftest tolerance a bit to account for different
;; harfbuzz, pango, etc. ;; harfbuzz, pango, etc.
(setenv "RSVG_TEST_TOLERANCE" "20") (setenv "RSVG_TEST_TOLERANCE" "20")
;; These two tests even fail after loosening the tolerance. ;; This test fails even after loosening the tolerance.
(for-each delete-file (substitute* "tests/src/reference.rs"
'("tests/fixtures/reftests/bugs/730-font-scaling.svg" ((".*svg1_1_text_align_03_b_svg.*") ""))))
"tests/fixtures/reftests/bugs/730-font-scaling-ref.png"
"tests/fixtures/reftests/svg1.1/text-text-03-b.svg"
"tests/fixtures/reftests/svg1.1/text-text-03-b-ref.png"))))
(add-before 'configure 'pre-configure (add-before 'configure 'pre-configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(substitute* "gdk-pixbuf-loader/Makefile.in" (substitute* "gdk-pixbuf-loader/Makefile.in"