Add patch to workaround gcc-related segfault in firefox -- bug 239992

(Portage version: 2.2_rc31/cvs/Linux i686)

3 files changed, 96 insertions, 1 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index ce84d135863e..02418095cd5d 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/librsvg
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.190 2009/04/28 10:55:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.191 2009/05/01 23:53:03 nirbheek Exp $
+
+*librsvg-2.22.3-r1 (01 May 2009)
+
+  01 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +files/librsvg-2.22.3-fix-segfault-with-firefox.patch,
+  +librsvg-2.22.3-r1.ebuild:
+  Add patch to workaround gcc-related segfault in firefox -- bug 239992
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org> librsvg-2.22.3.ebuild:
   sh stable
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
new file mode 100644
index 000000000000..86c03e5b7e77
--- /dev/null
+++ b/gnome-base/librsvg/files/librsvg-2.22.3-fix-segfault-with-firefox.patch
@@ -0,0 +1,19 @@
+From: Xu Li <xu.li@intel.com>
+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/librsvg-2.22.3-r1.ebuild b/gnome-base/librsvg/librsvg-2.22.3-r1.ebuild
new file mode 100644
index 000000000000..8b92b569a265
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.22.3-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.22.3-r1.ebuild,v 1.1 2009/05/01 23:53:03 nirbheek Exp $
+
+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"
+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() {
+	# FIXME: USEify mozilla support (?)
+	# 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"
+}
+
+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_unpack() {
+	gnome2_src_unpack
+
+	# gcc-4.3.2-r3 related segfault with various apps like firefox -- bug 239992
+	epatch "${FILESDIR}/${P}-fix-segfault-with-firefox.patch"
+}
+
+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"
+}