From 79f56e7940ce56e4179c8118d7c947657deab3ca Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Fri, 19 Nov 2010 21:39:45 +0000 Subject: Version bump: make sure the surfaces own their pixels, remove stray comma from enum, dist testcase input file. Remove old. (Portage version: 2.1.9.24/cvs/Linux x86_64) --- gnome-base/librsvg/ChangeLog | 12 +++- .../librsvg-2.22.3-fix-segfault-with-firefox.patch | 19 ------ .../files/librsvg-2.26.2-choosable-tools.patch | 76 ---------------------- gnome-base/librsvg/librsvg-2.26.0.ebuild | 71 -------------------- gnome-base/librsvg/librsvg-2.26.2.ebuild | 74 --------------------- gnome-base/librsvg/librsvg-2.32.0.ebuild | 58 ----------------- gnome-base/librsvg/librsvg-2.32.1.ebuild | 58 +++++++++++++++++ 7 files changed, 69 insertions(+), 299 deletions(-) delete mode 100644 gnome-base/librsvg/files/librsvg-2.22.3-fix-segfault-with-firefox.patch delete mode 100644 gnome-base/librsvg/files/librsvg-2.26.2-choosable-tools.patch delete mode 100644 gnome-base/librsvg/librsvg-2.26.0.ebuild delete mode 100644 gnome-base/librsvg/librsvg-2.26.2.ebuild delete mode 100644 gnome-base/librsvg/librsvg-2.32.0.ebuild create mode 100644 gnome-base/librsvg/librsvg-2.32.1.ebuild diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog index 090899975604..c4c66a3de4e7 100644 --- a/gnome-base/librsvg/ChangeLog +++ b/gnome-base/librsvg/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for gnome-base/librsvg # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.227 2010/11/08 21:21:25 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.228 2010/11/19 21:39:45 pacho Exp $ + +*librsvg-2.32.1 (19 Nov 2010) + + 19 Nov 2010; Pacho Ramos + -files/librsvg-2.22.3-fix-segfault-with-firefox.patch, + -librsvg-2.26.0.ebuild, -librsvg-2.26.2.ebuild, + -files/librsvg-2.26.2-choosable-tools.patch, -librsvg-2.32.0.ebuild, + +librsvg-2.32.1.ebuild: + Version bump: make sure the surfaces own their pixels, remove stray comma + from enum, dist testcase input file. Remove old. *librsvg-2.32.0 (08 Nov 2010) diff --git a/gnome-base/librsvg/files/librsvg-2.22.3-fix-segfault-with-firefox.patch b/gnome-base/librsvg/files/librsvg-2.22.3-fix-segfault-with-firefox.patch deleted file mode 100644 index 86c03e5b7e77..000000000000 --- a/gnome-base/librsvg/files/librsvg-2.22.3-fix-segfault-with-firefox.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Xu Li -Date: Thu, 16 Apr 2009 22:52:32 -Subject: [PATCH] A temporal patch to fix the crash issue when parse path element - -Index: librsvg-2.26.0/rsvg-path.c -=================================================================== ---- librsvg-2.26.0.orig/rsvg-path.c -+++ librsvg-2.26.0/rsvg-path.c -@@ -142,8 +142,8 @@ rsvg_path_arc (RSVGParsePathCtx * ctx, - return; - } - -- if(rx < 0)rx = -rx; -- if(ry < 0)ry = -ry; -+ rx = fabs(rx); -+ ry = fabs(ry); - - k1 = (x1 - x2)/2; - k2 = (y1 - y2)/2; diff --git a/gnome-base/librsvg/files/librsvg-2.26.2-choosable-tools.patch b/gnome-base/librsvg/files/librsvg-2.26.2-choosable-tools.patch deleted file mode 100644 index 3d9c9a1cd02d..000000000000 --- a/gnome-base/librsvg/files/librsvg-2.26.2-choosable-tools.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 4e7f090d1b2e2bb7c6a47d6f45edc8adb335e9a3 Mon Sep 17 00:00:00 2001 -From: Didier Barvaux -Date: Sat, 17 Apr 2010 21:25:29 +0000 -Subject: Add --enable-tools/--disable-tools options to avoid building miscellaneous tools - -Fix for bug #614123. ---- -diff --git a/Makefile.am b/Makefile.am -index 67e6411..c562c32 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -8,7 +8,9 @@ SUBDIRS = . gdk-pixbuf-loader gtk-engine data tests doc - - lib_LTLIBRARIES = librsvg-2.la - bin_PROGRAMS = rsvg-convert $(target_rsvg_view) -+if BUILD_MISC_TOOLS - noinst_PROGRAMS = test-performance rsvg-dimensions -+endif - - man_MANS = rsvg.1 - -diff --git a/configure.in b/configure.in -index 6e102ae..a1b547a 100644 ---- a/configure.in -+++ b/configure.in -@@ -286,6 +286,23 @@ GTK_DOC_CHECK([1.0]) - AM_CONDITIONAL(GTK_DOC_INSTALLED, $gtk_doc_installed) - - dnl =========================================================================== -+dnl Do we build the miscellaenous tools provided with librsvg ? -+ -+AC_ARG_ENABLE(tools, -+ AC_HELP_STRING([--disable-tools], -+ [do not build miscellaenous tools [default=no]]), -+ [build_misc_tools=$enableval], -+ [build_misc_tools=yes]) -+ -+AC_MSG_CHECKING(whether to build miscellaenous tools) -+if test "x$build_misc_tools" = "xyes" ; then -+ AC_MSG_RESULT(yes) -+else -+ AC_MSG_RESULT(no) -+fi -+AM_CONDITIONAL([BUILD_MISC_TOOLS], [test "x$build_misc_tools" = "xyes"]) -+ -+dnl =========================================================================== - - m4_copy([AC_DEFUN],[glib_DEFUN]) - glib_DEFUN([GLIB_LC_MESSAGES], -@@ -334,6 +351,7 @@ librsvg-$LIBRSVG_VERSION - - Build GdkPixbuf loader: ${enable_pixbuf_loader} - Build theme engine: ${enable_gtk_theme} -+ Build miscellaenous tools: ${build_misc_tools} - Handle svgz files: ${test_gsf} - Use GIO: ${test_gio} - Use libcroco for css parsing: ${test_croco} -diff --git a/tests/pdiff/Makefile.am b/tests/pdiff/Makefile.am -index 47ed8c1..8e77972 100644 ---- a/tests/pdiff/Makefile.am -+++ b/tests/pdiff/Makefile.am -@@ -1,3 +1,5 @@ -+if BUILD_MISC_TOOLS -+ - noinst_PROGRAMS = perceptualdiff - - noinst_LTLIBRARIES = libpdiff.la -@@ -14,3 +16,6 @@ perceptualdiff_SOURCES = \ - - INCLUDES = $(LIBRSVG_CFLAGS) - LDADD = libpdiff.la $(LIBRSVG_LIBS) -lm -+ -+endif -+ --- -cgit v0.8.3.1 diff --git a/gnome-base/librsvg/librsvg-2.26.0.ebuild b/gnome-base/librsvg/librsvg-2.26.0.ebuild deleted file mode 100644 index 2bf92dc0ca8a..000000000000 --- a/gnome-base/librsvg/librsvg-2.26.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.26.0.ebuild,v 1.10 2010/01/16 17:21:43 armin76 Exp $ - -inherit eutils gnome2 multilib - -DESCRIPTION="Scalable Vector Graphics (SVG) rendering library" -HOMEPAGE="http://librsvg.sourceforge.net/" - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="doc zlib" - -RDEPEND=">=media-libs/fontconfig-1.0.1 - >=media-libs/freetype-2 - >=x11-libs/gtk+-2.6 - >=dev-libs/glib-2.15.4 - >=x11-libs/cairo-1.2 - >=x11-libs/pango-1.10 - >=dev-libs/libxml2-2.4.7 - >=dev-libs/libcroco-0.6.1 - zlib? ( >=gnome-extra/libgsf-1.6 )" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.12 - doc? ( >=dev-util/gtk-doc-1 )" - -DOCS="AUTHORS ChangeLog README NEWS TODO" - -pkg_setup() { - # mozilla support is disabled because it's redundant w/ newer firefox - # croco is forced on to respect SVG specification - G2CONF="${G2CONF} - $(use_with zlib svgz) - --disable-mozilla-plugin - --with-croco - --enable-pixbuf-loader - --enable-gtk-theme" -} - -src_unpack() { - gnome2_src_unpack - - # gcc-4.3.2-r3 related segfault with various apps like firefox -- bug 239992 - epatch "${FILESDIR}/${PN}-2.22.3-fix-segfault-with-firefox.patch" -} - -set_gtk_confdir() { - # An arch specific config directory is used on multilib systems - has_multilib_profile && GTK2_CONFDIR="${ROOT}etc/gtk-2.0/${CHOST}" - GTK2_CONFDIR="${GTK2_CONFDIR:-/etc/gtk-2.0}" -} - -src_install() { - gnome2_src_install - - # remove gdk-pixbuf loaders (#47766) - rm -fr "${D}/etc" - # Remove empty "mozilla plugins" directory - rm -rf "${D}/usr/$(get_libdir)/mozilla" -} - -pkg_postinst() { - set_gtk_confdir - gdk-pixbuf-query-loaders > "${GTK2_CONFDIR}/gdk-pixbuf.loaders" -} - -pkg_postrm() { - set_gtk_confdir - gdk-pixbuf-query-loaders > "${GTK2_CONFDIR}/gdk-pixbuf.loaders" -} diff --git a/gnome-base/librsvg/librsvg-2.26.2.ebuild b/gnome-base/librsvg/librsvg-2.26.2.ebuild deleted file mode 100644 index b4d11c3c8e98..000000000000 --- a/gnome-base/librsvg/librsvg-2.26.2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.26.2.ebuild,v 1.9 2010/08/18 20:57:52 maekke Exp $ - -inherit autotools eutils gnome2 multilib - -DESCRIPTION="Scalable Vector Graphics (SVG) rendering library" -HOMEPAGE="http://librsvg.sourceforge.net/" - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="doc tools zlib" - -RDEPEND=">=media-libs/fontconfig-1.0.1 - >=media-libs/freetype-2 - >=x11-libs/gtk+-2.16 - >=dev-libs/glib-2.15.4 - >=x11-libs/cairo-1.2 - >=x11-libs/pango-1.10 - >=dev-libs/libxml2-2.4.7 - >=dev-libs/libcroco-0.6.1 - zlib? ( >=gnome-extra/libgsf-1.6 )" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.12 - >=dev-util/gtk-doc-am-1.13 - doc? ( >=dev-util/gtk-doc-1 )" -# >=dev-util/gtk-doc-am-1.13 needed by eautoreconf, feel free to drop it when not run it - -DOCS="AUTHORS ChangeLog README NEWS TODO" - -pkg_setup() { - # croco is forced on to respect SVG specification - G2CONF="${G2CONF} - $(use_enable tools) - $(use_with zlib svgz) - --with-croco - --enable-pixbuf-loader - --enable-gtk-theme" -} - -src_unpack() { - gnome2_src_unpack - - # gcc-4.3.2-r3 related segfault with various apps like firefox -- bug 239992 - epatch "${FILESDIR}/${PN}-2.22.3-fix-segfault-with-firefox.patch" - - # Build extra tools only when desired, bug 226231 - epatch "${FILESDIR}/${P}-choosable-tools.patch" - eautoreconf -} - -set_gtk_confdir() { - # An arch specific config directory is used on multilib systems - has_multilib_profile && GTK2_CONFDIR="${ROOT}etc/gtk-2.0/${CHOST}" - GTK2_CONFDIR="${GTK2_CONFDIR:-/etc/gtk-2.0}" -} - -src_install() { - gnome2_src_install - - # remove gdk-pixbuf loaders (#47766) - rm -fr "${D}/etc" -} - -pkg_postinst() { - set_gtk_confdir - gdk-pixbuf-query-loaders > "${GTK2_CONFDIR}/gdk-pixbuf.loaders" -} - -pkg_postrm() { - set_gtk_confdir - gdk-pixbuf-query-loaders > "${GTK2_CONFDIR}/gdk-pixbuf.loaders" -} diff --git a/gnome-base/librsvg/librsvg-2.32.0.ebuild b/gnome-base/librsvg/librsvg-2.32.0.ebuild deleted file mode 100644 index 5e4710c297ae..000000000000 --- a/gnome-base/librsvg/librsvg-2.32.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.32.0.ebuild,v 1.1 2010/11/08 21:21:25 pacho Exp $ - -EAPI="3" -GCONF_DEBUG="no" - -inherit gnome2 multilib - -DESCRIPTION="Scalable Vector Graphics (SVG) rendering library" -HOMEPAGE="http://librsvg.sourceforge.net/" - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc +gtk tools" - -RDEPEND=">=media-libs/fontconfig-1.0.1 - >=media-libs/freetype-2 - >=dev-libs/glib-2.24:2 - >=x11-libs/cairo-1.2 - >=x11-libs/pango-1.10 - >=dev-libs/libxml2-2.4.7 - >=dev-libs/libcroco-0.6.1 - || ( x11-libs/gdk-pixbuf - x11-libs/gtk+:2 ) - gtk? ( >=x11-libs/gtk+-2.16:2 )" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.12 - doc? ( >=dev-util/gtk-doc-1 )" -# >=dev-util/gtk-doc-am-1.13 needed by eautoreconf - -pkg_setup() { - # croco is forced on to respect SVG specification - G2CONF="${G2CONF} - --disable-static - $(use_enable tools) - $(use_enable gtk gtk-theme) - --with-croco - --enable-pixbuf-loader" - DOCS="AUTHORS ChangeLog README NEWS TODO" -} - -src_install() { - gnome2_src_install - - # Remove .la files, these libraries are dlopen()-ed. - rm -vf "${ED}"/usr/lib*/gtk-2.0/*/engines/libsvg.la - rm -vf "${ED}"/usr/lib*/gdk-pixbuf-2.0/*/loaders/libpixbufloader-svg.la -} - -pkg_postinst() { - gdk-pixbuf-query-loaders > "${EROOT}/usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" -} - -pkg_postrm() { - gdk-pixbuf-query-loaders > "${EROOT}/usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" -} diff --git a/gnome-base/librsvg/librsvg-2.32.1.ebuild b/gnome-base/librsvg/librsvg-2.32.1.ebuild new file mode 100644 index 000000000000..f3f7df212030 --- /dev/null +++ b/gnome-base/librsvg/librsvg-2.32.1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.32.1.ebuild,v 1.1 2010/11/19 21:39:45 pacho Exp $ + +EAPI="3" +GCONF_DEBUG="no" + +inherit gnome2 multilib + +DESCRIPTION="Scalable Vector Graphics (SVG) rendering library" +HOMEPAGE="http://librsvg.sourceforge.net/" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc +gtk tools" + +RDEPEND=">=media-libs/fontconfig-1.0.1 + >=media-libs/freetype-2 + >=dev-libs/glib-2.24:2 + >=x11-libs/cairo-1.2 + >=x11-libs/pango-1.10 + >=dev-libs/libxml2-2.4.7 + >=dev-libs/libcroco-0.6.1 + || ( x11-libs/gdk-pixbuf + x11-libs/gtk+:2 ) + gtk? ( >=x11-libs/gtk+-2.16:2 )" +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.12 + doc? ( >=dev-util/gtk-doc-1 )" +# >=dev-util/gtk-doc-am-1.13 needed by eautoreconf + +pkg_setup() { + # croco is forced on to respect SVG specification + G2CONF="${G2CONF} + --disable-static + $(use_enable tools) + $(use_enable gtk gtk-theme) + --with-croco + --enable-pixbuf-loader" + DOCS="AUTHORS ChangeLog README NEWS TODO" +} + +src_install() { + gnome2_src_install + + # Remove .la files, these libraries are dlopen()-ed. + rm -vf "${ED}"/usr/lib*/gtk-2.0/*/engines/libsvg.la + rm -vf "${ED}"/usr/lib*/gdk-pixbuf-2.0/*/loaders/libpixbufloader-svg.la +} + +pkg_postinst() { + gdk-pixbuf-query-loaders > "${EROOT}/usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" +} + +pkg_postrm() { + gdk-pixbuf-query-loaders > "${EROOT}/usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" +} -- cgit v1.2.3-65-gdbad