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

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f98ab27c4ae04a7c3a37277aeb581feb8035a8b1e1937b06e27423a176a0a73
-size 581026

librsvg-2.35.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df2dfe55d9ea777bf208aacd49d8d4f6ea3f6fd87d1f4ff66b876aa751fd16b5
+size 596218

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.35.0.orig/configure.in
-+++ librsvg-2.31.0/configure.in
++++ librsvg-2.35.0/configure.in
-@@ -273,10 +273,10 @@ gdk_pixbuf_moduledir=
+@@ -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.35.0.orig/configure
-+++ librsvg-2.31.0/configure
++++ librsvg-2.35.0/configure
-@@ -13186,8 +13186,8 @@ $as_echo "yes" >&6; }
+@@ -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 :
+ if ${ac_cv_path_GDK_PIXBUF_QUERYLOADERS+:} false; then :
-@@ -13229,7 +13229,7 @@ fi
+@@ -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 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-64 not found in path" "$LINENO" 5
    fi
  
    # First try the standalone gdk-pixbuf

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
 

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(cairo) >= 1.2.0
-BuildRequires:  pkgconfig(fontconfig)
-BuildRequires:  pkgconfig(freetype2)
 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(libxml-2.0) >= 2.7.0
-BuildRequires:  pkgconfig(pangoft2)
 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