From f77de3169f885d346bd7dc140e326d3456dcabac Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 3 May 2018 22:02:26 -0700 Subject: [PATCH] Update rust dependencies. --- librsvg-2.42.3-update-rust-deps.diff | 43 ++++++++++++++++++++++++++++ librsvg2.spec | 18 +++++++----- 2 files changed, 54 insertions(+), 7 deletions(-) create mode 100644 librsvg-2.42.3-update-rust-deps.diff diff --git a/librsvg-2.42.3-update-rust-deps.diff b/librsvg-2.42.3-update-rust-deps.diff new file mode 100644 index 0000000..f49a438 --- /dev/null +++ b/librsvg-2.42.3-update-rust-deps.diff @@ -0,0 +1,43 @@ +--- librsvg-2.42.3/rsvg_internals/Cargo.toml.orig 2018-02-24 08:11:59.000000000 -0800 ++++ librsvg-2.42.3/rsvg_internals/Cargo.toml 2018-03-22 16:07:55.041261092 -0700 +@@ -13,14 +13,14 @@ libc = "0.2" + downcast-rs = "^1.0.0" + regex = "^0.2.1" + itertools = "0.7.4" +-pango = "0.3.0" +-pango-sys = "0.5.0" ++pango = "0.4.0" ++pango-sys = "0.6.0" + cssparser = "0.23" + lazy_static = "1.0.0" + phf = "0.7.21" + + [dependencies.cairo-sys-rs] +-version = "0.5.0" ++version = "0.6.0" + #git = "https://github.com/gtk-rs/cairo.git" + #branch = "master" + #git = "https://github.com/federicomenaquintero/cairo.git" +@@ -29,19 +29,19 @@ version = "0.5.0" + #features = ["png"] + + [dependencies.cairo-rs] +-version = "0.3.0" ++version = "0.4.0" + #git = "https://github.com/gtk-rs/cairo.git" + #branch = "master" + #git = "file:///home/federico/src/gtk-rs/cairo" + #features = ["png"] + + [dependencies.glib] +-version = "0.4.0" ++version = "0.5.0" + #git = "https://github.com/gtk-rs/glib.git" + #branch = "master" + + [dependencies.glib-sys] +-version = "0.5.0" ++version = "0.6.0" + #git = "https://github.com/gtk-rs/sys" + #branch = "master" + diff --git a/librsvg2.spec b/librsvg2.spec index 6424b81..ec83873 100644 --- a/librsvg2.spec +++ b/librsvg2.spec @@ -7,11 +7,12 @@ Name: librsvg2 Summary: An SVG library based on cairo Version: 2.42.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://wiki.gnome.org/Projects/LibRsvg Source: http://download.gnome.org/sources/librsvg/2.42/librsvg-%{version}.tar.xz +Patch0: librsvg-2.42.3-update-rust-deps.diff BuildRequires: gcc BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.20 @@ -32,16 +33,16 @@ BuildRequires: pkgconfig(fontconfig) BuildRequires: chrpath BuildRequires: rust-packaging # [dependencies] -BuildRequires: (crate(cairo-rs) >= 0.3.0 with crate(cairo-rs) < 0.4.0) -BuildRequires: (crate(cairo-sys-rs) >= 0.5.0 with crate(cairo-sys-rs) < 0.6.0) +BuildRequires: (crate(cairo-rs) >= 0.4.0 with crate(cairo-rs) < 0.5.0) +BuildRequires: (crate(cairo-sys-rs) >= 0.6.0 with crate(cairo-sys-rs) < 0.7.0) BuildRequires: (crate(cssparser) >= 0.23.0 with crate(cssparser) < 0.24.0) BuildRequires: (crate(downcast-rs) >= 1.0.0 with crate(downcast-rs) < 2.0.0) -BuildRequires: (crate(glib) >= 0.4.0 with crate(glib) < 0.5.0) -BuildRequires: (crate(glib-sys) >= 0.5.0 with crate(glib-sys) < 0.6.0) +BuildRequires: (crate(glib) >= 0.5.0 with crate(glib) < 0.6.0) +BuildRequires: (crate(glib-sys) >= 0.6.0 with crate(glib-sys) < 0.7.0) BuildRequires: (crate(itertools) >= 0.7.4 with crate(itertools) < 0.8.0) BuildRequires: (crate(libc) >= 0.2.0 with crate(libc) < 0.3.0) -BuildRequires: (crate(pango) >= 0.3.0 with crate(pango) < 0.4.0) -BuildRequires: (crate(pango-sys) >= 0.5.0 with crate(pango-sys) < 0.6.0) +BuildRequires: (crate(pango) >= 0.4.0 with crate(pango) < 0.5.0) +BuildRequires: (crate(pango-sys) >= 0.6.0 with crate(pango-sys) < 0.7.0) BuildRequires: (crate(regex) >= 0.2.1 with crate(regex) < 0.3.0) # for file triggers @@ -121,6 +122,9 @@ rm -vrf %{buildroot}%{_datadir}/doc %{_mandir}/man1/rsvg-convert.1* %changelog +* Thu May 03 2018 Josh Stone - 2.42.3-2 +- Update rust dependencies. + * Mon Mar 05 2018 Kalev Lember - 2.42.3-1 - Update to 2.42.3