From daaf74aec01e3dee5ef5d2dddd34e224cd2c6e590279618deac3787058975daa Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 15 Nov 2011 09:31:46 +0000 Subject: [PATCH 1/4] Accepting request 91420 from home:dimstar:branches:GNOME:Factory Update to 2.35.0 OBS-URL: https://build.opensuse.org/request/show/91420 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/librsvg?expand=0&rev=42 --- librsvg-2.34.1.tar.bz2 | 3 --- librsvg-2.35.0.tar.bz2 | 3 +++ librsvg-gdk-pixbuf-query-loaders-64.patch | 26 +++++++++++------------ librsvg.changes | 15 +++++++++++++ librsvg.spec | 16 ++++++-------- 5 files changed, 38 insertions(+), 25 deletions(-) delete mode 100644 librsvg-2.34.1.tar.bz2 create mode 100644 librsvg-2.35.0.tar.bz2 diff --git a/librsvg-2.34.1.tar.bz2 b/librsvg-2.34.1.tar.bz2 deleted file mode 100644 index 5f4061d..0000000 --- a/librsvg-2.34.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f98ab27c4ae04a7c3a37277aeb581feb8035a8b1e1937b06e27423a176a0a73 -size 581026 diff --git a/librsvg-2.35.0.tar.bz2 b/librsvg-2.35.0.tar.bz2 new file mode 100644 index 0000000..4735dac --- /dev/null +++ b/librsvg-2.35.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df2dfe55d9ea777bf208aacd49d8d4f6ea3f6fd87d1f4ff66b876aa751fd16b5 +size 596218 diff --git a/librsvg-gdk-pixbuf-query-loaders-64.patch b/librsvg-gdk-pixbuf-query-loaders-64.patch index b172fed..82c314f 100644 --- a/librsvg-gdk-pixbuf-query-loaders-64.patch +++ b/librsvg-gdk-pixbuf-query-loaders-64.patch @@ -1,8 +1,8 @@ -Index: librsvg-2.31.0/configure.in +Index: librsvg-2.35.0/configure.in =================================================================== ---- librsvg-2.31.0.orig/configure.in -+++ librsvg-2.31.0/configure.in -@@ -273,10 +273,10 @@ gdk_pixbuf_moduledir= +--- librsvg-2.35.0.orig/configure.in ++++ librsvg-2.35.0/configure.in +@@ -193,10 +193,10 @@ gdk_pixbuf_moduledir= if test "$enable_pixbuf_loader" = "yes"; then PKG_CHECK_MODULES([GDK_PIXBUF],[gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED]) @@ -15,12 +15,12 @@ Index: librsvg-2.31.0/configure.in fi # First try the standalone gdk-pixbuf -Index: librsvg-2.31.0/configure +Index: librsvg-2.35.0/configure =================================================================== ---- librsvg-2.31.0.orig/configure -+++ librsvg-2.31.0/configure -@@ -13186,8 +13186,8 @@ $as_echo "yes" >&6; } - : +--- librsvg-2.35.0.orig/configure ++++ librsvg-2.35.0/configure +@@ -13726,8 +13726,8 @@ $as_echo "yes" >&6; } + fi - # Extract the first word of "gdk-pixbuf-query-loaders", so it can be a program name with args. @@ -29,13 +29,13 @@ Index: librsvg-2.31.0/configure +set dummy gdk-pixbuf-query-loaders-64; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } - if test "${ac_cv_path_GDK_PIXBUF_QUERYLOADERS+set}" = set; then : -@@ -13229,7 +13229,7 @@ fi + if ${ac_cv_path_GDK_PIXBUF_QUERYLOADERS+:} false; then : +@@ -13769,7 +13769,7 @@ fi if test "x$GDK_PIXBUF_QUERYLOADERS" = "xnone"; then -- as_fn_error "gdk-pixbuf-query-loaders not found in path" "$LINENO" 5 -+ as_fn_error "gdk-pixbuf-query-loaders-64 not found in path" "$LINENO" 5 +- as_fn_error $? "gdk-pixbuf-query-loaders not found in path" "$LINENO" 5 ++ as_fn_error $? "gdk-pixbuf-query-loaders-64 not found in path" "$LINENO" 5 fi # First try the standalone gdk-pixbuf diff --git a/librsvg.changes b/librsvg.changes index a7b8c38..c5fb4e5 100644 --- a/librsvg.changes +++ b/librsvg.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Nov 14 22:33:17 UTC 2011 - dimstar@opensuse.org + +- Update to version 2.35.0: + + Update libxml2 dependency to 2.7.0 + + Make GIO and libcroco hard requirements + + Use attributes for deprecations instead of defines + + Many memory leaks plugged + + Bugs fixed: bgo#621636, bgo#630112, bgo#624820, bgo#624835, + bgo#581108, bgo#614157, bgo#630733, bgo#473862, + bgo#590788, bgo#626559, bgo#663049, bgo#663049. +- Rebase librsvg-gdk-pixbuf-query-loaders-64.patch. +- Drop no longer needed pkgconfig() - BuildRequires: pangoft2, + freetype2, fontconfig, following upstream changes. + ------------------------------------------------------------------- Tue Sep 6 23:01:11 UTC 2011 - vuntz@opensuse.org diff --git a/librsvg.spec b/librsvg.spec index 9079296..0f5d4c7 100644 --- a/librsvg.spec +++ b/librsvg.spec @@ -19,31 +19,28 @@ %define build_gtk3_support 0 Name: librsvg -Version: 2.34.1 +Version: 2.35.0 Release: 1 License: GPLv2+ Summary: A Library for Rendering SVG Data Url: http://librsvg.sourceforge.net/ Group: System/Libraries -Source: http://download.gnome.org/sources/librsvg/2.34/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/librsvg/2.35/%{name}-%{version}.tar.bz2 Source99: baselibs.conf # PATCH-FIX-OPENSUSE librsvg-gdk-pixbuf-query-loaders-64.patch vuntz@opensuse.org -- Fix check for gdk-pixbuf-query-loaders on 64bit systems Patch0: librsvg-gdk-pixbuf-query-loaders-64.patch Patch1: env-paths.diff -BuildRequires: pkgconfig(cairo) -BuildRequires: pkgconfig(fontconfig) -BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(cairo) >= 1.2.0 BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gio-2.0) >= 2.24.0 BuildRequires: pkgconfig(gtk+-2.0) %if %{build_gtk3_support} BuildRequires: pkgconfig(gtk+-3.0) %endif BuildRequires: pkgconfig(libcroco-0.6) BuildRequires: pkgconfig(libgsf-1) -BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(pangoft2) +BuildRequires: pkgconfig(libxml-2.0) >= 2.7.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,6 +51,7 @@ http://www.w3c.org). %package -n librsvg-2-2 License: GPLv2+ Summary: A Library for Rendering SVG Data +Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 Obsoletes: librsvg-64bit @@ -111,6 +109,7 @@ This package provides a librsvg-based GTK+ 2 theme engine. %if %{build_gtk3_support} %package -n gtk3-engine-svg + License: LGPLv2.1+ Summary: SVG-based GTK+ 3 Theme Engine Group: System/Libraries @@ -194,7 +193,6 @@ rm -rf $RPM_BUILD_ROOT %if %{build_gtk3_support} %{_bindir}/rsvg-view-3 %endif -%{_datadir}/pixmaps/svg-viewer.svg %doc %{_mandir}/man?/rsvg.1* %files devel From 6e7fac73e50b9d11a5c051f83d27c3edadaa2290271654cbc4b1f68d34ad44a0 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 15 Nov 2011 09:46:01 +0000 Subject: [PATCH 2/4] Accepting request 91451 from home:vuntz:branches:GNOME:Factory Remove libgsf buildrequires OBS-URL: https://build.opensuse.org/request/show/91451 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/librsvg?expand=0&rev=43 --- librsvg.changes | 8 ++++---- librsvg.spec | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/librsvg.changes b/librsvg.changes index c5fb4e5..441984c 100644 --- a/librsvg.changes +++ b/librsvg.changes @@ -7,11 +7,11 @@ Mon Nov 14 22:33:17 UTC 2011 - dimstar@opensuse.org + Use attributes for deprecations instead of defines + Many memory leaks plugged + Bugs fixed: bgo#621636, bgo#630112, bgo#624820, bgo#624835, - bgo#581108, bgo#614157, bgo#630733, bgo#473862, - bgo#590788, bgo#626559, bgo#663049, bgo#663049. + bgo#581108, bgo#614157, bgo#630733, bgo#473862, bgo#590788, + bgo#626559, bgo#663049, bgo#663049. +- Drop no longer needed pkgconfig() BuildRequires following + upstream changes: fontconfig, freetype2,, libgsf-1, pangoft2. - Rebase librsvg-gdk-pixbuf-query-loaders-64.patch. -- Drop no longer needed pkgconfig() - BuildRequires: pangoft2, - freetype2, fontconfig, following upstream changes. ------------------------------------------------------------------- Tue Sep 6 23:01:11 UTC 2011 - vuntz@opensuse.org diff --git a/librsvg.spec b/librsvg.spec index 0f5d4c7..8017fe9 100644 --- a/librsvg.spec +++ b/librsvg.spec @@ -39,7 +39,6 @@ BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) %endif BuildRequires: pkgconfig(libcroco-0.6) -BuildRequires: pkgconfig(libgsf-1) BuildRequires: pkgconfig(libxml-2.0) >= 2.7.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build From 6f5c7bd0159e1cda6d5ded052cf6ffab8f3a4ef23a9bd9bf85c360f38b9ff1d0 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 14 Dec 2011 13:44:06 +0000 Subject: [PATCH 3/4] Accepting request 94665 from home:coolo:removeautomake add automake to buildrequires OBS-URL: https://build.opensuse.org/request/show/94665 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/librsvg?expand=0&rev=44 --- librsvg.changes | 5 +++++ librsvg.spec | 21 +++++++-------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/librsvg.changes b/librsvg.changes index 441984c..840319d 100644 --- a/librsvg.changes +++ b/librsvg.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 1 10:27:17 UTC 2011 - coolo@suse.com + +- add automake as buildrequire to avoid implicit dependency + ------------------------------------------------------------------- Mon Nov 14 22:33:17 UTC 2011 - dimstar@opensuse.org diff --git a/librsvg.spec b/librsvg.spec index 8017fe9..3bf9cca 100644 --- a/librsvg.spec +++ b/librsvg.spec @@ -14,14 +14,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - %define build_gtk3_support 0 Name: librsvg Version: 2.35.0 -Release: 1 -License: GPLv2+ +Release: 0 +License: GPL-2.0+ Summary: A Library for Rendering SVG Data Url: http://librsvg.sourceforge.net/ Group: System/Libraries @@ -30,6 +28,7 @@ Source99: baselibs.conf # PATCH-FIX-OPENSUSE librsvg-gdk-pixbuf-query-loaders-64.patch vuntz@opensuse.org -- Fix check for gdk-pixbuf-query-loaders on 64bit systems Patch0: librsvg-gdk-pixbuf-query-loaders-64.patch Patch1: env-paths.diff +BuildRequires: automake BuildRequires: pkgconfig(cairo) >= 1.2.0 BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glib-2.0) @@ -48,7 +47,6 @@ graphics) data. This format has been specified by the W3C (see http://www.w3c.org). %package -n librsvg-2-2 -License: GPLv2+ Summary: A Library for Rendering SVG Data Group: Development/Libraries/C and C++ # bug437293 @@ -67,7 +65,6 @@ graphics) data. This format has been specified by the W3C (see http://www.w3c.org). %package devel -License: GPLv2+ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Provides: librsvg2-devel = %{version} @@ -84,9 +81,8 @@ This package contains all necessary include files and libraries needed to develop applications that require these. %package -n gdk-pixbuf-loader-rsvg -License: LGPLv2.1+ +License: LGPL-2.1+ Summary: A Library for Rendering SVG Data -- gdk-pixbuf loader -Group: System/Libraries Supplements: packageand(librsvg-2-2:gdk-pixbuf) %gdk_pixbuf_loader_requires @@ -98,9 +94,8 @@ http://www.w3c.org). This package provides a librsvg-based gdk-pixbuf loader. %package -n gtk2-engine-svg -License: LGPLv2.1+ +License: LGPL-2.1+ Summary: SVG-based GTK+ 2 Theme Engine -Group: System/Libraries %description -n gtk2-engine-svg This package provides a librsvg-based GTK+ 2 theme engine. @@ -109,18 +104,16 @@ This package provides a librsvg-based GTK+ 2 theme engine. %package -n gtk3-engine-svg -License: LGPLv2.1+ +License: LGPL-2.1+ Summary: SVG-based GTK+ 3 Theme Engine -Group: System/Libraries %description -n gtk3-engine-svg This package provides a librsvg-based GTK+ 3 theme engine. %endif %package -n rsvg-view -License: LGPLv2.1+ +License: LGPL-2.1+ Summary: SVG View using the GNOME Render SVG library -Group: System/Libraries Provides: librsvg:/usr/bin/rsvg %description -n rsvg-view From c710cef1b20204978969b54318cb77cc303b1cfcc47e578766bcc456ae578f22 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 21 Dec 2011 04:43:51 +0000 Subject: [PATCH 4/4] Accepting request 97458 from home:vuntz:branches:GNOME:Factory Update to 2.35.1 OBS-URL: https://build.opensuse.org/request/show/97458 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/librsvg?expand=0&rev=45 --- librsvg-2.35.0.tar.bz2 | 3 --- librsvg-2.35.1.tar.xz | 3 +++ librsvg.changes | 18 +++++++++++++++++- librsvg.spec | 29 +++++++++++++++++++---------- 4 files changed, 39 insertions(+), 14 deletions(-) delete mode 100644 librsvg-2.35.0.tar.bz2 create mode 100644 librsvg-2.35.1.tar.xz diff --git a/librsvg-2.35.0.tar.bz2 b/librsvg-2.35.0.tar.bz2 deleted file mode 100644 index 4735dac..0000000 --- a/librsvg-2.35.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df2dfe55d9ea777bf208aacd49d8d4f6ea3f6fd87d1f4ff66b876aa751fd16b5 -size 596218 diff --git a/librsvg-2.35.1.tar.xz b/librsvg-2.35.1.tar.xz new file mode 100644 index 0000000..c66e811 --- /dev/null +++ b/librsvg-2.35.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e277659d048aa4f3b19755951795ffabb8596ba0d1f0bc255a5ac780a7455ca +size 501596 diff --git a/librsvg.changes b/librsvg.changes index 840319d..4f62cec 100644 --- a/librsvg.changes +++ b/librsvg.changes @@ -1,7 +1,23 @@ +------------------------------------------------------------------- +Tue Dec 20 09:43:35 UTC 2011 - vuntz@opensuse.org + +- Update to version 2.35.1: + + Support basic vertical writing (bgo#664533). + + Bugs fixed: bgo#664684, bgo#665905, bgo#665824. + + Several misc. code changes. +- Add xz BuildRequires because we can't build a package for a + xz-compressed tarball without explicitly specifying that... See + bnc#697467 for more details. +- Add explicit pkgconfig(pangocairo) BuildRequires: it was missing + before. +- Fix license of subpackages: all the code is LGPL-2.0+, except + some tests that are not shipped in subpackages. The overall + license of the source package is "LGPL-2.0+ ; GPL-2.0+". + ------------------------------------------------------------------- Thu Dec 1 10:27:17 UTC 2011 - coolo@suse.com -- add automake as buildrequire to avoid implicit dependency +- Add automake BuildRequires to avoid implicit dependency. ------------------------------------------------------------------- Mon Nov 14 22:33:17 UTC 2011 - dimstar@opensuse.org diff --git a/librsvg.spec b/librsvg.spec index 3bf9cca..fb7af2a 100644 --- a/librsvg.spec +++ b/librsvg.spec @@ -14,21 +14,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# %define build_gtk3_support 0 Name: librsvg -Version: 2.35.0 +Version: 2.35.1 Release: 0 -License: GPL-2.0+ Summary: A Library for Rendering SVG Data -Url: http://librsvg.sourceforge.net/ +License: LGPL-2.0+ ; GPL-2.0+ Group: System/Libraries -Source: http://download.gnome.org/sources/librsvg/2.35/%{name}-%{version}.tar.bz2 +Url: http://librsvg.sourceforge.net/ +Source: http://download.gnome.org/sources/librsvg/2.35/%{name}-%{version}.tar.xz Source99: baselibs.conf # PATCH-FIX-OPENSUSE librsvg-gdk-pixbuf-query-loaders-64.patch vuntz@opensuse.org -- Fix check for gdk-pixbuf-query-loaders on 64bit systems Patch0: librsvg-gdk-pixbuf-query-loaders-64.patch Patch1: env-paths.diff BuildRequires: automake +# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 +BuildRequires: xz BuildRequires: pkgconfig(cairo) >= 1.2.0 BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(glib-2.0) @@ -39,6 +42,7 @@ BuildRequires: pkgconfig(gtk+-3.0) %endif BuildRequires: pkgconfig(libcroco-0.6) BuildRequires: pkgconfig(libxml-2.0) >= 2.7.0 +BuildRequires: pkgconfig(pangocairo) >= 1.16.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -48,6 +52,7 @@ http://www.w3c.org). %package -n librsvg-2-2 Summary: A Library for Rendering SVG Data +License: LGPL-2.0+ Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 @@ -66,6 +71,7 @@ http://www.w3c.org). %package devel Summary: Include Files and Libraries mandatory for Development +License: LGPL-2.0+ Group: Development/Libraries/C and C++ Provides: librsvg2-devel = %{version} Obsoletes: librsvg2-devel < %{version} @@ -81,8 +87,9 @@ This package contains all necessary include files and libraries needed to develop applications that require these. %package -n gdk-pixbuf-loader-rsvg -License: LGPL-2.1+ Summary: A Library for Rendering SVG Data -- gdk-pixbuf loader +License: LGPL-2.0+ +Group: System/Libraries Supplements: packageand(librsvg-2-2:gdk-pixbuf) %gdk_pixbuf_loader_requires @@ -94,8 +101,9 @@ http://www.w3c.org). This package provides a librsvg-based gdk-pixbuf loader. %package -n gtk2-engine-svg -License: LGPL-2.1+ Summary: SVG-based GTK+ 2 Theme Engine +License: LGPL-2.0+ +Group: System/Libraries %description -n gtk2-engine-svg This package provides a librsvg-based GTK+ 2 theme engine. @@ -103,17 +111,18 @@ This package provides a librsvg-based GTK+ 2 theme engine. %if %{build_gtk3_support} %package -n gtk3-engine-svg - -License: LGPL-2.1+ Summary: SVG-based GTK+ 3 Theme Engine +License: LGPL-2.0+ +Group: System/Libraries %description -n gtk3-engine-svg This package provides a librsvg-based GTK+ 3 theme engine. %endif %package -n rsvg-view -License: LGPL-2.1+ Summary: SVG View using the GNOME Render SVG library +License: LGPL-2.0+ +Group: System/Libraries Provides: librsvg:/usr/bin/rsvg %description -n rsvg-view @@ -155,7 +164,7 @@ rm -rf $RPM_BUILD_ROOT %files -n librsvg-2-2 %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README +%doc AUTHORS COPYING.LIB ChangeLog NEWS README %{_libdir}/*.so.* %files -n gdk-pixbuf-loader-rsvg