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

Package-Manager: portage-2.2_rc31/cvs/Linux i686

4 files changed, 99 insertions, 2 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/Manifest b/gnome-base/librsvg/Manifest
index 950fbbcaf40e..695aabcf9579 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,11 +1,13 @@
 AUX librsvg-2.15.90-die-gtk-doc-die.patch 581 RMD160 94e7da4d6260daebd5e7b298911d1888f234ce91 SHA1 fe31e163db3afbe028b6499a20301c5278ab3966 SHA256 b85d7c1b58905258c75fd86a360a0ba2eebd5d530793d359e4be7913fffb2201
 AUX librsvg-2.16.1-leak-fixes.patch 1503 RMD160 2d9fa76342acc32bce9606b65bb6b9dd336e2f6b SHA1 7c03a0f1324f181d62bae36bd71330cd6c396220 SHA256 8014d46af6996b8547034358389910ab9098ab5cb0f3183cf1c66ed157b3d52f
 AUX librsvg-2.16.1-uninit.patch 765 RMD160 abfb6af1fd08aab3fafacd19c1c216a3420f7115 SHA1 71549540d317402a08168bd5f3ad66750a3c05fe SHA256 b2fea4b59407fff1ccf1474412acf2296d43cf9b83a35abba6acb65a8ad45a0b
+AUX librsvg-2.22.3-fix-segfault-with-firefox.patch 538 RMD160 e52da5a491d8b2a93b264a4d79b8a19307635dce SHA1 b773d7e022725f8bdc00707bfb8b5a3098d8e1a5 SHA256 bcd27c5d3662525cbc9df31c0f3bd4c36d7dc85c7ee867f9dd129cce233db2d7
 DIST librsvg-2.20.0.tar.bz2 463714 RMD160 76e657bce620ee677298110de9e8eedf2e39430e SHA1 906877feaa189606caa012cc51706cc7daef9fb4 SHA256 f980a58e766c42eb0d9d942fd2068f02aa19e68c7e57f822de60b739da1a1fb0
 DIST librsvg-2.22.2.tar.bz2 464857 RMD160 ead6af5c0b1c251f640d7eec06b354e33739a489 SHA1 a42ad2dd0a1b3b7195fe7d4e89c7e1f0352a51cf SHA256 2bfc1853ecdc545bf3767ed92c93b8796f2075f522c8eab1693c96f11d55a59e
 DIST librsvg-2.22.3.tar.bz2 491576 RMD160 54c834fbfb028b98f699bfeec94cd411b2d3f7bb SHA1 032f8142b1e41e07740cd91030b1873a0b9c42d2 SHA256 63f7cc948b60447c76e6797a2d521cba308ed42c673bd4b2212e1f0b4cd60f0a
 EBUILD librsvg-2.20.0.ebuild 1686 RMD160 2658d964269992815a7b7550f2a671858e503758 SHA1 7a81993165eb84a33b8c818d7d9915cbeeba8964 SHA256 2a7a18fd74f927514f0f3dc67d5dcb3655d57a644f054a044bdcaf4b3bc5be36
 EBUILD librsvg-2.22.2.ebuild 1579 RMD160 d21c38f2f36627027122ba76337acca93225628a SHA1 979f4a2817dcf579c32e0f9259167d7277328b36 SHA256 ffb8cc119b6b099f14d27264be0626220a824fc2974e5f0a256109e1dc5e8aff
+EBUILD librsvg-2.22.3-r1.ebuild 1767 RMD160 909afc1c780554b461de63733e76fb97ff11a9d9 SHA1 a8c58dd559aa02a2918f2644ca909e352ad15268 SHA256 2f31662fc429e3396d11ead9d5e130a6d41b7359aa6ac2201a6320736ef25816
 EBUILD librsvg-2.22.3.ebuild 1579 RMD160 5138015365adf25c32ced9b058256de28d471bfd SHA1 5d6be0136f05c276e556a161e12ab26e5a57a176 SHA256 6ee5ba5e1f51b741c82e24388b0eabf7e5456c25c28c7b01b2aac059685893ba
-MISC ChangeLog 23139 RMD160 dc363637dc66ffc58712b7aab8d31b58f7bbc672 SHA1 3a733abb8cf020707f983e49459d881f94ecd284 SHA256 1e8a9664f429710234ef7d61aaaaf77c575310cb16bc6a5c5280566b71ecec40
+MISC ChangeLog 23387 RMD160 2d4ea6c811a0d9d1f89d0b8ff2afff6bfd874771 SHA1 c18b822661abf3b583f920d1e0259f49e099c933 SHA256 1cd9cc09095a1d0acdae64e3dcdff4ab4b4b875d4690646532559412d1bb70cb
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
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"
+}