futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: librsvg-next: Update to 2.50.1.

Browse Source 
* gnu/packages/gnome.scm (librsvg-next): Update to 2.50.1.
[arguments]: Build with rust-1.40. In cargo-inputs remove
rust-downcast-1.1. Replace rust-float-cmp-0.6 with 0.8,
rust-itertools-0.8 with 0.9, rust-nalgebra-0.19 with 0.21. Add
rust-string-cache-0.8, rust-tinyvec-0.3. In cargo-development-inputs add
rust-assert-cmd-1, rust-chrono-0.4, rust-float-cmp-0.8, rust-lopdf-0.25,
rust-png-0.16, rust-predicates-1, rust-tempfile-3. Add phase to work
around failing tests.
This commit is contained in:
Efraim Flashner 2020-10-05 00:12:57 +03:00
parent 9e3084a3d3
commit ff25829843
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
gnu/packages/gnome.scm
View File

@ -3203,7 +3203,7 @@ library.")
(define-public librsvg-next
(package
(name "librsvg")
(version "2.48.8")
(version "2.50.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/librsvg/"
@ -3211,7 +3211,7 @@ library.")
"librsvg-" version ".tar.xz"))
(sha256
(base32
"14i6xzghcidv64cyd3g0wdjbl82rph737yxn9s3x29nzpcjs707l"))
"02csvx2nzygh8kyal2qiy3y6xb7d52vszxxr37dzav704a9pkncv"))
(modules '((guix build utils)))
(snippet
'(begin (delete-file-recursively "vendor")
@ -3223,6 +3223,7 @@ library.")
((guix build cargo-build-system)
(guix build utils)
((guix build gnu-build-system) #:prefix gnu:))
#:rust ,rust-1.40
#:cargo-inputs
(("rust-bitflags" ,rust-bitflags-1)
("rust-cairo-rs" ,rust-cairo-rs-0.8)
@ -3230,9 +3231,8 @@ library.")
("rust-cast" ,rust-cast-0.2)
("rust-cssparser" ,rust-cssparser-0.27)
("rust-data-url" ,rust-data-url-0.1)
("rust-downcast-rs" ,rust-downcast-rs-1.1)
("rust-encoding" ,rust-encoding-0.2)
("rust-float-cmp" ,rust-float-cmp-0.6)
("rust-float-cmp" ,rust-float-cmp-0.8)
("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.8)
("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.9)
("rust-gio" ,rust-gio-0.8)
@ -3240,12 +3240,12 @@ library.")
("rust-glib" ,rust-glib-0.9)
("rust-glib-sys" ,rust-glib-sys-0.9)
("rust-gobject-sys" ,rust-gobject-sys-0.9)
("rust-itertools" ,rust-itertools-0.8)
("rust-itertools" ,rust-itertools-0.9)
("rust-language-tags" ,rust-language-tags-0.2)
("rust-libc" ,rust-libc-0.2)
("rust-locale-config" ,rust-locale-config-0.3)
("rust-markup5ever" ,rust-markup5ever-0.10)
("rust-nalgebra" ,rust-nalgebra-0.19)
("rust-nalgebra" ,rust-nalgebra-0.21)
("rust-num-traits" ,rust-num-traits-0.2)
("rust-once-cell" ,rust-once-cell-1)
("rust-pkg-config" ,rust-pkg-config-0.3)
@ -3257,11 +3257,20 @@ library.")
("rust-rgb" ,rust-rgb-0.8)
("rust-regex" ,rust-regex-1)
("rust-selectors" ,rust-selectors-0.22)
("rust-string-cache" ,rust-string-cache-0.8)
("rust-tinyvec" ,rust-tinyvec-0.3)
("rust-url" ,rust-url-2.1)
("rust-xml5ever" ,rust-xml5ever-0.16))
#:cargo-development-inputs
(("rust-cairo-rs" ,rust-cairo-rs-0.8)
("rust-criterion" ,rust-criterion-0.3))
(("rust-assert-cmd" ,rust-assert-cmd-1)
("rust-cairo-rs" ,rust-cairo-rs-0.8)
("rust-chrono" ,rust-chrono-0.4)
("rust-criterion" ,rust-criterion-0.3)
("rust-float-cmp" ,rust-float-cmp-0.8)
("rust-lopdf" ,rust-lopdf-0.25)
("rust-png" ,rust-png-0.16)
("rust-predicates" ,rust-predicates-1)
("rust-tempfile" ,rust-tempfile-3))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-docbook-xml
@ -3314,6 +3323,31 @@ library.")
#t))
(replace 'build
(assoc-ref gnu:%standard-phases 'build))
(add-before 'check 'ignore-failing-tests
;; stderr=```/tmp/guix-build-.../librsvg-2.50.1/rsvg-convert: line 150: ls: command not found
(lambda _
(substitute* "tests/src/cmdline/rsvg_convert.rs"
(("fn background_color_option_invalid_color_yields_error" all)
(string-append "#[ignore] " all))
(("fn empty_input_yields_error" all)
(string-append "#[ignore] " all))
(("fn empty_svg_yields_error" all)
(string-append "#[ignore] " all))
(("fn env_source_data_epoch_empty" all)
(string-append "#[ignore] " all))
(("fn env_source_data_epoch_no_digits" all)
(string-append "#[ignore] " all))
(("fn env_source_data_epoch_trailing_garbage" all)
(string-append "#[ignore] " all))
(("fn export_id_option_error" all)
(string-append "#[ignore] " all))
(("fn huge_zoom_factor_yields_error" all)
(string-append "#[ignore] " all))
(("fn multiple_input_files_not_allowed_for_png_output" all)
(string-append "#[ignore] " all))
(("fn stylesheet_option_error" all)
(string-append "#[ignore] " all)))
#t))
(replace 'check
(lambda* args
((assoc-ref gnu:%standard-phases 'check)