diff --git a/baselibs.conf b/baselibs.conf index 9416467..abf7e13 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,5 @@ -librsvg - supplements "packageand(librsvg:gtk2-)" +librsvg-2-2 +gdk-pixbuf-loader-rsvg + supplements "packageand(librsvg-2-2-:gdk-pixbuf-)" + post "%gdk_pixbuf_loader_post" + postun "%gdk_pixbuf_loader_postun" diff --git a/librsvg-2.26.3.tar.bz2 b/librsvg-2.26.3.tar.bz2 deleted file mode 100644 index bd1fdd8..0000000 --- a/librsvg-2.26.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0005f9471b4bd3ba4873d165d8e481ee6b1d124dda4efc6bdc24b7da024b7e5 -size 511876 diff --git a/librsvg-2.31.0.tar.bz2 b/librsvg-2.31.0.tar.bz2 new file mode 100644 index 0000000..e876dbc --- /dev/null +++ b/librsvg-2.31.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:320b61ef5e6d65624f3733a83134df012a4156ed7f7ae38a6ed19febe1bfa732 +size 514232 diff --git a/librsvg-gdk-pixbuf-query-loaders-64.patch b/librsvg-gdk-pixbuf-query-loaders-64.patch new file mode 100644 index 0000000..b172fed --- /dev/null +++ b/librsvg-gdk-pixbuf-query-loaders-64.patch @@ -0,0 +1,41 @@ +Index: librsvg-2.31.0/configure.in +=================================================================== +--- librsvg-2.31.0.orig/configure.in ++++ librsvg-2.31.0/configure.in +@@ -273,10 +273,10 @@ gdk_pixbuf_moduledir= + if test "$enable_pixbuf_loader" = "yes"; then + PKG_CHECK_MODULES([GDK_PIXBUF],[gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED]) + +- AC_PATH_PROG([GDK_PIXBUF_QUERYLOADERS],[gdk-pixbuf-query-loaders],[none]) ++ AC_PATH_PROG([GDK_PIXBUF_QUERYLOADERS],[gdk-pixbuf-query-loaders-64],[none]) + + if test "x$GDK_PIXBUF_QUERYLOADERS" = "xnone"; then +- AC_MSG_ERROR([gdk-pixbuf-query-loaders not found in path]) ++ AC_MSG_ERROR([gdk-pixbuf-query-loaders-64 not found in path]) + fi + + # First try the standalone gdk-pixbuf +Index: librsvg-2.31.0/configure +=================================================================== +--- librsvg-2.31.0.orig/configure ++++ librsvg-2.31.0/configure +@@ -13186,8 +13186,8 @@ $as_echo "yes" >&6; } + : + fi + +- # Extract the first word of "gdk-pixbuf-query-loaders", so it can be a program name with args. +-set dummy gdk-pixbuf-query-loaders; ac_word=$2 ++ # Extract the first word of "gdk-pixbuf-query-loaders-64", so it can be a program name with args. ++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 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 + fi + + # First try the standalone gdk-pixbuf diff --git a/librsvg.changes b/librsvg.changes index 1b5851e..4e441bc 100644 --- a/librsvg.changes +++ b/librsvg.changes @@ -1,3 +1,52 @@ +------------------------------------------------------------------- +Fri Jul 23 09:26:51 CEST 2010 - vuntz@opensuse.org + +- Make devel package Require librsvg-2-2 instead of librsvg. + +------------------------------------------------------------------- +Wed Jul 21 15:06:21 CEST 2010 - vuntz@opensuse.org + +- Update to version 2.31.0: + + bgo#337979: text size not rendered correctly + + bgo#545158: Segfault or bad rendering when displaying a SVG + file + + bgo#614556: Background pixbuf in filter process should not be + created if it's not needed. + + bgo#616018: cairo-freetype font rendering code should be + removed. + + bgo#620130: Decode base64 inplace + + bgo#620238: crashes rending a trivial file + + bgo#620592: Use correct free func + + bgo#620649: Simplify code by using g_clear_error + + bgo#620693: presentation attributes in svg element are ignored + + bgo#620822: Build fails with make -jx" + + bgo#621699: make librsvg gio friendly + + bgo#622790: use standalone gdk-pixbuf + + bgo#623383: crash on rsvg-gobject.c:141, in instance_dispose + function +- Add librsvg-gdk-pixbuf-query-loaders-64.patch to fix the build on + x86_64, since gdk-pixbuf-query-loaders is renamed to + gdk-pixbuf-query-loaders-64 there. +- Remove coreutils PreReq. +- Change gtk2-devel, libcroco-devel, libgsf-devel BuildRequires to + pkgconfig() BuildRequires: cairo, fontconfig, freetype2, + gdk-pixbuf-2.0, glib-2.0, gio-2.0, gtk+-2.0, libcroco-0.6, + libgsf-1, libxml-2.0, pangoft2. +- Add pkgconfig(gtk+-3.0) BuildRequires. +- Remove the cairo-devel, libcroco-devel, glib2-devel, gtk2-devel, + libgsf-devel Requires in devel package: pkgconfig() Requires will + automatically get added now. +- Version the Provides/Obsoletes of librsvg2 and librsvg2-devel in + librsvg-2-2 and librsvg-devel to avoid rpmlint warning. +- Split the gdk-pixbuf loader in a gdk-pixbuf-loader-rsvg + subpackage (that gets installed automatically when gdk-pixbuf is + installed thanks to a Supplements). +- Create a librsvg-2-2 subpackage that provides/obsoletes librsvg + (since the main package is empty), and follow the shared library + policy. +- Create gtk2-engine-svg and gtk3-engine-svg subpackages, + containing the svg-based theme engines. + ------------------------------------------------------------------- Sat May 8 18:53:22 CEST 2010 - dimstar@opensuse.org diff --git a/librsvg.spec b/librsvg.spec index c3ab3f9..34debec 100644 --- a/librsvg.spec +++ b/librsvg.spec @@ -1,5 +1,5 @@ # -# spec file for package librsvg (Version 2.26.3) +# spec file for package librsvg (Version 2.31.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: librsvg -Version: 2.26.3 +Version: 2.31.0 Release: 1 License: GPLv2+ Summary: A Library for Rendering SVG Data @@ -27,21 +27,42 @@ Url: http://librsvg.sourceforge.net/ Group: System/Libraries Source: ftp://ftp.gnome.org/pub/GNOME/sources/librsvg/2.18/%{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: gtk2-devel -BuildRequires: libcroco-devel -BuildRequires: libgsf-devel -PreReq: coreutils +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libcroco-0.6) +BuildRequires: pkgconfig(libgsf-1) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(pangoft2) +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +This package contains a library to render SVG (scalable vector +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 # bug437293 %ifarch ppc64 Obsoletes: librsvg-64bit %endif # -Provides: librsvg2 -Obsoletes: librsvg2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Provides: librsvg2 = %{name} +Obsoletes: librsvg2 < %{name} +Provides: librsvg = %{name} +Obsoletes: librsvg < %{name} -%description +%description -n librsvg-2-2 This package contains a library to render SVG (scalable vector graphics) data. This format has been specified by the W3C (see http://www.w3c.org). @@ -50,9 +71,9 @@ http://www.w3c.org). License: GPLv2+ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ -Provides: librsvg2-devel -Obsoletes: librsvg2-devel -Requires: %{name} = %{version} cairo-devel libcroco-devel glib2-devel gtk2-devel libgsf-devel +Provides: librsvg2-devel = %{version} +Obsoletes: librsvg2-devel < %{version} +Requires: librsvg-2-2 = %{version} # bug437293 %ifarch ppc64 Obsoletes: librsvg-devel-64bit @@ -63,6 +84,36 @@ Obsoletes: librsvg-devel-64bit 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 +Group: System/Libraries +Supplements: packageand(librsvg-2-2:gdk-pixbuf) +%gdk_pixbuf_loader_requires + +%description -n gdk-pixbuf-loader-rsvg +This package contains a library to render SVG (scalable vector +graphics) data. This format has been specified by the W3C (see +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 +Group: System/Libraries + +%description -n gtk2-engine-svg +This package provides a librsvg-based GTK+ 2 theme engine. + +%package -n gtk3-engine-svg +License: LGPLv2.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. + %package -n rsvg-view License: LGPLv2.1+ Summary: SVG View using the GNOME Render SVG library @@ -76,6 +127,11 @@ http://www.w3c.org). %prep %setup -q +%if "%_lib" == "lib64" +%patch0 -p1 +# don't have configure auto-regenerated +touch aclocal.m4 +%endif %patch1 %build @@ -91,34 +147,52 @@ find %{buildroot} -type f -name "*.la" -delete -print %clean rm -rf $RPM_BUILD_ROOT -%post -/sbin/ldconfig -touch var/adm/SuSEconfig/run-gtk +%post -n librsvg-2-2 -p /sbin/ldconfig -%postun -/sbin/ldconfig -touch var/adm/SuSEconfig/run-gtk +%post -n gdk-pixbuf-loader-rsvg +%gdk_pixbuf_loader_post -%files +%postun -n librsvg-2-2 -p /sbin/ldconfig + +%postun -n gdk-pixbuf-loader-rsvg +%gdk_pixbuf_loader_postun + +%files -n librsvg-2-2 %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README %{_libdir}/*.so.* -%{_libdir}/gtk-2.0/*/*/*.so + +%files -n gdk-pixbuf-loader-rsvg +%defattr(-,root,root) +%{_libdir}/gdk-pixbuf-2.0/*/loaders/libpixbufloader-svg.so + +%files -n gtk2-engine-svg +%defattr(-,root,root) +%{_libdir}/gtk-2.0/*/engines/libsvg.so +%dir %{_datadir}/themes/bubble +%{_datadir}/themes/bubble/gtk-2.0/ + +%files -n gtk3-engine-svg +%defattr(-,root,root) +%{_libdir}/gtk-3.0/*/engines/libsvg-3.so +%dir %{_datadir}/themes/bubble +%{_datadir}/themes/bubble/gtk-3.0/ %files -n rsvg-view %defattr(-,root,root) %{_bindir}/rsvg %{_bindir}/rsvg-convert %{_bindir}/rsvg-view -%{_datadir}/pixmaps/*.svg -%doc %{_mandir}/man?/*.* +%{_bindir}/rsvg-view-3 +%{_datadir}/pixmaps/svg-viewer.svg +%doc %{_mandir}/man?/rsvg.1* %files devel %defattr(-,root,root) -%{_includedir}/librsvg-2 +%{_includedir}/librsvg-2.0/ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc -%{_datadir}/gtk-doc/html/* +%{_datadir}/gtk-doc/html/rsvg-2.0/ # Own these repositories to not depend on gtk-doc while building: %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html