Accepting request 99103 from GNOME:Factory

Pushing G:F

OBS-URL: https://build.opensuse.org/request/show/99103
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/librsvg?expand=0&rev=42
This commit is contained in:
Stephan Kulow
2012-01-09 14:42:31 +00:00
committed by Git OBS Bridge
5 changed files with 72 additions and 39 deletions

View File

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

3
librsvg-2.35.1.tar.xz Normal file
View File

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

View File

@@ -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

View File

@@ -1,3 +1,39 @@
-------------------------------------------------------------------
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 BuildRequires to avoid implicit dependency.
-------------------------------------------------------------------
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.
- Drop no longer needed pkgconfig() BuildRequires following
upstream changes: fontconfig, freetype2,, libgsf-1, pangoft2.
- Rebase librsvg-gdk-pixbuf-query-loaders-64.patch.
-------------------------------------------------------------------
Tue Sep 6 23:01:11 UTC 2011 - vuntz@opensuse.org

View File

@@ -14,36 +14,35 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
#
%define build_gtk3_support 0
Name: librsvg
Version: 2.34.1
Release: 1
License: GPLv2+
Version: 2.35.1
Release: 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.34/%{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: pkgconfig(cairo)
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(freetype2)
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)
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
BuildRequires: pkgconfig(pangocairo) >= 1.16.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -52,8 +51,8 @@ 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
License: LGPL-2.0+
Group: Development/Libraries/C and C++
# bug437293
%ifarch ppc64
@@ -71,8 +70,8 @@ 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
License: LGPL-2.0+
Group: Development/Libraries/C and C++
Provides: librsvg2-devel = %{version}
Obsoletes: librsvg2-devel < %{version}
@@ -88,8 +87,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+
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
@@ -102,8 +101,8 @@ http://www.w3c.org).
This package provides a librsvg-based gdk-pixbuf loader.
%package -n gtk2-engine-svg
License: LGPLv2.1+
Summary: SVG-based GTK+ 2 Theme Engine
License: LGPL-2.0+
Group: System/Libraries
%description -n gtk2-engine-svg
@@ -112,9 +111,8 @@ 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
License: LGPL-2.0+
Group: System/Libraries
%description -n gtk3-engine-svg
@@ -122,8 +120,8 @@ This package provides a librsvg-based GTK+ 3 theme engine.
%endif
%package -n rsvg-view
License: LGPLv2.1+
Summary: SVG View using the GNOME Render SVG library
License: LGPL-2.0+
Group: System/Libraries
Provides: librsvg:/usr/bin/rsvg
@@ -166,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
@@ -196,7 +194,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