From 71016021f7cbbef976e7e47aa295ee0543cc2ce4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 24 Jan 2018 23:25:58 +0100 Subject: [PATCH] Update to 2.42.1 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + librsvg2.spec | 102 ++++++++++++++++++++++++++++++-------------------- sources | 2 +- 3 files changed, 63 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index cd0adb6..bb2a9f6 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ librsvg-2.31.0.tar.bz2 /librsvg-2.40.18.tar.xz /librsvg-2.40.19.tar.xz /librsvg-2.40.20.tar.xz +/librsvg-2.42.1.tar.xz diff --git a/librsvg2.spec b/librsvg2.spec index b1b5f36..1ccd751 100644 --- a/librsvg2.spec +++ b/librsvg2.spec @@ -1,32 +1,57 @@ +# https://github.com/rust-lang/rust/issues/47714 +%undefine _strict_symbol_defs_build + +# We want verbose builds +%global _configure_disable_silent_rules 1 + Name: librsvg2 Summary: An SVG library based on cairo -Version: 2.40.20 +Version: 2.42.1 Release: 1%{?dist} License: LGPLv2+ URL: https://wiki.gnome.org/Projects/LibRsvg -Source: http://download.gnome.org/sources/librsvg/2.40/librsvg-%{version}.tar.xz +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 +BuildRequires: pkgconfig(glib-2.0) >= 2.52.0 +BuildRequires: pkgconfig(gio-2.0) >= 2.24.0 +BuildRequires: pkgconfig(libxml-2.0) >= 2.9.0 +BuildRequires: pkgconfig(pangocairo) >= 1.38.0 +BuildRequires: pkgconfig(pangoft2) >= 1.38.0 +BuildRequires: pkgconfig(cairo) >= 1.2.0 +BuildRequires: pkgconfig(cairo-png) >= 1.2.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.10.0 +BuildRequires: pkgconfig(libcroco-0.6) >= 0.6.1 +BuildRequires: pkgconfig(gthread-2.0) >= 2.52.0 +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: gobject-introspection-devel +BuildRequires: %{_bindir}/vapigen +BuildRequires: pkgconfig(fontconfig) BuildRequires: chrpath -BuildRequires: pkgconfig(cairo) -BuildRequires: pkgconfig(cairo-png) -BuildRequires: pkgconfig(gdk-pixbuf-2.0) -BuildRequires: pkgconfig(gio-2.0) -BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(libcroco-0.6) -BuildRequires: pkgconfig(pangocairo) -BuildRequires: vala-devel -BuildRequires: vala +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(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(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(regex) >= 0.2.1 with crate(regex) < 0.3.0) # for file triggers -Requires: gdk-pixbuf2%{?_isa} >= 2.31.5-2.fc24 +Requires: gdk-pixbuf2%{?_isa} >= 2.31.5-2.fc24 %description An SVG library based on cairo. - %package devel Summary: Libraries and include files for developing with librsvg Requires: %{name}%{?_isa} = %{version}-%{release} @@ -35,7 +60,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package provides the necessary development libraries and include files to allow you to develop with librsvg. - %package tools Summary: Extra tools for librsvg Requires: %{name}%{?_isa} = %{version}-%{release} @@ -43,68 +67,64 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description tools This package provides extra utilities based on the librsvg library. - %prep -%setup -q -n librsvg-%{version} - +%autosetup -n librsvg-%{version} -p1 +# No bundled deps +rm -vrf rust/vendor +( cd rust && %cargo_prep ) %build -GDK_PIXBUF_QUERYLOADERS=/usr/bin/gdk-pixbuf-query-loaders-%{__isa_bits} -export GDK_PIXBUF_QUERYLOADERS -# work around an ordering problem in configure -enable_pixbuf_loader=yes -export enable_pixbuf_loader %configure --disable-static \ --disable-gtk-doc \ --enable-introspection \ --enable-vala -make %{?_smp_mflags} +%make_build %install %make_install -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' - -rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/ -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders -rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/svg-viewer.svg +find %{buildroot} -type f -name '*.la' -print -delete # Remove lib64 rpaths -chrpath --delete $RPM_BUILD_ROOT%{_bindir}/rsvg-convert -chrpath --delete $RPM_BUILD_ROOT%{_bindir}/rsvg-view-3 -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/*/loaders/libpixbufloader-svg.so - +chrpath --delete %{buildroot}%{_bindir}/rsvg-convert +chrpath --delete %{buildroot}%{_bindir}/rsvg-view-3 +chrpath --delete %{buildroot}%{_libdir}/gdk-pixbuf-2.0/*/loaders/libpixbufloader-svg.so %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files -%doc AUTHORS NEWS README +%{_pkgdocdir} %license COPYING COPYING.LIB %{_libdir}/librsvg-2.so.* %{_libdir}/gdk-pixbuf-2.0/*/loaders/libpixbufloader-svg.so -%{_libdir}/girepository-1.0/* +%dir %{_libdir}/girepository-1.0 +%{_libdir}/girepository-1.0/Rsvg-2.0.typelib %dir %{_datadir}/thumbnailers %{_datadir}/thumbnailers/librsvg.thumbnailer %files devel %{_libdir}/librsvg-2.so -%{_includedir}/librsvg-2.0 +%{_includedir}/librsvg-2.0/ %{_libdir}/pkgconfig/librsvg-2.0.pc -%{_datadir}/gir-1.0/* +%dir %{_datadir}/gir-1.0 +%{_datadir}/gir-1.0/Rsvg-2.0.gir %dir %{_datadir}/vala %dir %{_datadir}/vala/vapi %{_datadir}/vala/vapi/librsvg-2.0.vapi -%doc %{_datadir}/gtk-doc/html/rsvg-2.0 +%dir %{_datadir}/gtk-doc +%dir %{_datadir}/gtk-doc/html +%{_datadir}/gtk-doc/html/rsvg-2.0 %files tools %{_bindir}/rsvg-convert %{_bindir}/rsvg-view-3 %{_mandir}/man1/rsvg-convert.1* - %changelog +* Wed Jan 24 2018 Igor Gnatenko - 2.42.1-1 +- Update to 2.42.1 + * Sat Dec 16 2017 Kalev Lember - 2.40.20-1 - Update to 2.40.20 diff --git a/sources b/sources index 91a257a..a75df8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (librsvg-2.40.20.tar.xz) = cdd8224deb4c3786e29f48ed02c32ed9dff5cb15aba574a5ef845801ad3669cfcc3eedb9d359c22213dc7a29de24c363248825adad5877c40abf73b3688ff12f +SHA512 (librsvg-2.42.1.tar.xz) = 1053598b2460815454b7877cbdbb48caf370628c97850ce352c44b1eab34125ad45743e507cf16cd703a71dc223558ab54918710abf7c3d07982c370052af255