diff --git a/.gitignore b/.gitignore index bb2a9f6..cf158f3 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ librsvg-2.31.0.tar.bz2 /librsvg-2.40.19.tar.xz /librsvg-2.40.20.tar.xz /librsvg-2.42.1.tar.xz +/librsvg-2.42.2.tar.xz diff --git a/0001-rust-Update-cssparser-to-0.23.patch b/0001-rust-Update-cssparser-to-0.23.patch deleted file mode 100644 index 9ca3464..0000000 --- a/0001-rust-Update-cssparser-to-0.23.patch +++ /dev/null @@ -1,85 +0,0 @@ -From c1de6d5db7a9375e78bf72474718f8b88551842a Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Wed, 24 Jan 2018 16:55:05 +0100 -Subject: [PATCH] rust: Update cssparser to 0.23 - -Signed-off-by: Igor Gnatenko ---- - rust/Cargo.lock | 12 ++++++------ - rust/Cargo.toml | 2 +- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/rust/Cargo.lock b/rust/Cargo.lock -index dbfe5f8..68faf02 100644 ---- a/rust/Cargo.lock -+++ b/rust/Cargo.lock -@@ -41,7 +41,7 @@ dependencies = [ - - [[package]] - name = "cssparser" --version = "0.22.1" -+version = "0.23.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -51,7 +51,7 @@ dependencies = [ - "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", - "procedural-masquerade 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", -- "smallvec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", - ] - -@@ -278,7 +278,7 @@ version = "0.0.1" - dependencies = [ - "cairo-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-sys-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "cssparser 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cssparser 0.23.2 (registry+https://github.com/rust-lang/crates.io-index)", - "downcast-rs 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -296,7 +296,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "smallvec" --version = "0.4.4" -+version = "0.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] -@@ -360,7 +360,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - "checksum c_vec 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6237ac5a4b1e81c213c24c6437964c61e646df910a914b4ab1487b46df20bd13" - "checksum cairo-rs 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6b5695f59fd036fe5741bc5a4eb20c78fbe42256e3b08a2af26bbcbe8070bf3" - "checksum cairo-sys-rs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c6e18fecaeac51809db57f45f4553cc0975225a7eb435a7a7e91e5e8113a84d" --"checksum cssparser 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2debe29d742180c2d5772c82fd3b024dc399b34afaf04fc7a30ed81af3dc6d67" -+"checksum cssparser 0.23.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8a807ac3ab7a217829c2a3b65732b926b2befe6a35f33b4bf8b503692430f223" - "checksum cssparser-macros 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "079adec4af52bb5275eadd004292028c79eb3c5f5b4ee8086a36d4197032f6df" - "checksum downcast-rs 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "917042ca6e6c9fe735a63cd4d5d4c43c64ea8deb456fc5465d3f78df24e68d86" - "checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab" -@@ -390,7 +390,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - "checksum regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "744554e01ccbd98fff8c457c3b092cd67af62a555a43bfe97ae8a0451f7799fa" - "checksum regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e" - "checksum siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537" --"checksum smallvec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ee4f357e8cd37bf8822e1b964e96fd39e2cb5a0424f8aaa284ccaccc2162411c" -+"checksum smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44db0ecb22921ef790d17ae13a3f6d15784183ff5f2a01aa32098c7498d2b4b9" - "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" - "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" - "checksum thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "279ef31c19ededf577bfd12dfae728040a21f635b06a24cd670ff510edd38963" -diff --git a/rust/Cargo.toml b/rust/Cargo.toml -index 9ae34a7..8e2b450 100644 ---- a/rust/Cargo.toml -+++ b/rust/Cargo.toml -@@ -10,7 +10,7 @@ regex = "^0.2.1" - itertools = "0.7.4" - pango = "0.3.0" - pango-sys = "0.5.0" --cssparser = "^0.22.1" -+cssparser = "0.23" - - [dependencies.cairo-sys-rs] - version = "0.5.0" --- -2.16.1 - diff --git a/librsvg2.spec b/librsvg2.spec index af84432..1920bf9 100644 --- a/librsvg2.spec +++ b/librsvg2.spec @@ -6,14 +6,12 @@ Name: librsvg2 Summary: An SVG library based on cairo -Version: 2.42.1 -Release: 2%{?dist} +Version: 2.42.2 +Release: 1%{?dist} License: LGPLv2+ URL: https://wiki.gnome.org/Projects/LibRsvg Source: http://download.gnome.org/sources/librsvg/2.42/librsvg-%{version}.tar.xz -# https://gitlab.gnome.org/GNOME/librsvg/merge_requests/4 -Patch0001: 0001-rust-Update-cssparser-to-0.23.patch BuildRequires: gcc BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.20 @@ -123,6 +121,9 @@ rm -vrf %{buildroot}%{_datadir}/doc %{_mandir}/man1/rsvg-convert.1* %changelog +* Fri Feb 02 2018 Kalev Lember - 2.42.2-1 +- Update to 2.42.2 + * Wed Jan 31 2018 Igor Gnatenko - 2.42.1-2 - Switch to %%ldconfig_scriptlets diff --git a/sources b/sources index a75df8b..41ebfe1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (librsvg-2.42.1.tar.xz) = 1053598b2460815454b7877cbdbb48caf370628c97850ce352c44b1eab34125ad45743e507cf16cd703a71dc223558ab54918710abf7c3d07982c370052af255 +SHA512 (librsvg-2.42.2.tar.xz) = d93220fce5d4fbafbe9ab87d834c56d3471230d5cee7f369fde3db9db5f41de4cef282ddde7bc5aedbcc259a56683ca31e0217b83893aec1300050f17f8fd57a