Fix some leaks; bug #181532

Package-Manager: portage-2.1.2.9

5 files changed, 148 insertions, 5 deletions

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index f7bb7481a901..1da8df37144a 100644
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/librsvg
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.146 2007/06/02 02:54:26 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.147 2007/06/11 21:02:38 dang Exp $
+
+*librsvg-2.16.1-r2 (11 Jun 2007)
+
+  11 Jun 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/librsvg-2.16.1-leak-fixes.patch, +librsvg-2.16.1-r2.ebuild:
+  Fix some leaks; bug #181532
 
   02 Jun 2007; Brent Baude <ranger@gentoo.org> librsvg-2.16.1-r1.ebuild:
   Marking librsvg-2.16.1-r1 ppc stable for bug #171107
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 2b0c812485fb..e265cdb713ba 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,7 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX librsvg-2.15.90-die-gtk-doc-die.patch 581 RMD160 94e7da4d6260daebd5e7b298911d1888f234ce91 SHA1 fe31e163db3afbe028b6499a20301c5278ab3966 SHA256 b85d7c1b58905258c75fd86a360a0ba2eebd5d530793d359e4be7913fffb2201
 MD5 83cc3db2d44688434536e2470020a2af files/librsvg-2.15.90-die-gtk-doc-die.patch 581
 RMD160 94e7da4d6260daebd5e7b298911d1888f234ce91 files/librsvg-2.15.90-die-gtk-doc-die.patch 581
 SHA256 b85d7c1b58905258c75fd86a360a0ba2eebd5d530793d359e4be7913fffb2201 files/librsvg-2.15.90-die-gtk-doc-die.patch 581
+AUX librsvg-2.16.1-leak-fixes.patch 1503 RMD160 2d9fa76342acc32bce9606b65bb6b9dd336e2f6b SHA1 7c03a0f1324f181d62bae36bd71330cd6c396220 SHA256 8014d46af6996b8547034358389910ab9098ab5cb0f3183cf1c66ed157b3d52f
+MD5 d1c910175324247a8dedc9053b3ef88c files/librsvg-2.16.1-leak-fixes.patch 1503
+RMD160 2d9fa76342acc32bce9606b65bb6b9dd336e2f6b files/librsvg-2.16.1-leak-fixes.patch 1503
+SHA256 8014d46af6996b8547034358389910ab9098ab5cb0f3183cf1c66ed157b3d52f files/librsvg-2.16.1-leak-fixes.patch 1503
 AUX librsvg-2.16.1-uninit.patch 765 RMD160 abfb6af1fd08aab3fafacd19c1c216a3420f7115 SHA1 71549540d317402a08168bd5f3ad66750a3c05fe SHA256 b2fea4b59407fff1ccf1474412acf2296d43cf9b83a35abba6acb65a8ad45a0b
 MD5 c07b0821c3b3ee8dcf255aec46b3cb11 files/librsvg-2.16.1-uninit.patch 765
 RMD160 abfb6af1fd08aab3fafacd19c1c216a3420f7115 files/librsvg-2.16.1-uninit.patch 765
@@ -17,6 +24,10 @@ EBUILD librsvg-2.16.1-r1.ebuild 2007 RMD160 db7780fa7c3019740322216bff9f79670e62
 MD5 b62145adfb84e24661178446703a0603 librsvg-2.16.1-r1.ebuild 2007
 RMD160 db7780fa7c3019740322216bff9f79670e62e49b librsvg-2.16.1-r1.ebuild 2007
 SHA256 bf80f81b9a8da99d553900f15ad7e339c4bc706442c1c71988b0a3bfbb17dee7 librsvg-2.16.1-r1.ebuild 2007
+EBUILD librsvg-2.16.1-r2.ebuild 2090 RMD160 41969942ec4056c441372f0c357de3c401ad9699 SHA1 c3dec37b6a609a3ba7fd4d31a24f0aa20a587775 SHA256 a590eeedfd8b210ec3c01bb03863c7b351653898eb8c4d3783f2c45ffebb6259
+MD5 7249e878b7e8a2dffb7261db3af41f42 librsvg-2.16.1-r2.ebuild 2090
+RMD160 41969942ec4056c441372f0c357de3c401ad9699 librsvg-2.16.1-r2.ebuild 2090
+SHA256 a590eeedfd8b210ec3c01bb03863c7b351653898eb8c4d3783f2c45ffebb6259 librsvg-2.16.1-r2.ebuild 2090
 EBUILD librsvg-2.16.1.ebuild 1901 RMD160 3b9162aef26d87439a28b840f00281b8ae179634 SHA1 a779743c88fb644a21780dc08ecba0ee57044e55 SHA256 b45b0165233835541b437ac54f84a83e8a2ef88ed77c61dd6b81dd9c98251638
 MD5 25338f86810888e7e7454857d4073d0e librsvg-2.16.1.ebuild 1901
 RMD160 3b9162aef26d87439a28b840f00281b8ae179634 librsvg-2.16.1.ebuild 1901
@@ -25,10 +36,10 @@ EBUILD librsvg-2.9.5.ebuild 1546 RMD160 777f3aea5e829d1f22486075d8e73cf4f509d26d
 MD5 51b920b38ffcdc52216f68508a398312 librsvg-2.9.5.ebuild 1546
 RMD160 777f3aea5e829d1f22486075d8e73cf4f509d26d librsvg-2.9.5.ebuild 1546
 SHA256 5703b19d40542b06a83245bd890e4ddc76da5edd1ee4faa34616668ca2e01d83 librsvg-2.9.5.ebuild 1546
-MISC ChangeLog 17898 RMD160 953d633ca790f4c018b70a812bf28fa1e49a4c2c SHA1 73570b57d0e1163bfc39904832b523fa7a1ec839 SHA256 23879a792df8a0e15f46a683e4b587751da2ea72ea3c7c68aea71447b5685307
-MD5 f063591edc5f4674956f06b333dae76e ChangeLog 17898
-RMD160 953d633ca790f4c018b70a812bf28fa1e49a4c2c ChangeLog 17898
-SHA256 23879a792df8a0e15f46a683e4b587751da2ea72ea3c7c68aea71447b5685307 ChangeLog 17898
+MISC ChangeLog 18081 RMD160 eae7168638c5c363c963b0819df20d12f172d73e SHA1 1b37514b138f120dac8e003c67e82aa14e0fac81 SHA256 3ef64eff7fa7f77b5e18a0e0cd92fef021a3da9922b5ae79deefbe63576220d9
+MD5 368d7bb74a0e3c62f9c073e09f94d08a ChangeLog 18081
+RMD160 eae7168638c5c363c963b0819df20d12f172d73e ChangeLog 18081
+SHA256 3ef64eff7fa7f77b5e18a0e0cd92fef021a3da9922b5ae79deefbe63576220d9 ChangeLog 18081
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -42,6 +53,16 @@ SHA256 f6489e69f2820d8401eec1ae48aeac109aeaccde26dfb0681895322fe151f787 files/di
 MD5 ab99525f3daaac5586f216d17dfa3dde files/digest-librsvg-2.16.1-r1 247
 RMD160 ce4d7ae96c7ec8cd9d22a11d2f9ce377e27baf88 files/digest-librsvg-2.16.1-r1 247
 SHA256 f6489e69f2820d8401eec1ae48aeac109aeaccde26dfb0681895322fe151f787 files/digest-librsvg-2.16.1-r1 247
+MD5 ab99525f3daaac5586f216d17dfa3dde files/digest-librsvg-2.16.1-r2 247
+RMD160 ce4d7ae96c7ec8cd9d22a11d2f9ce377e27baf88 files/digest-librsvg-2.16.1-r2 247
+SHA256 f6489e69f2820d8401eec1ae48aeac109aeaccde26dfb0681895322fe151f787 files/digest-librsvg-2.16.1-r2 247
 MD5 b8c85108b58132e8c5a435cc0d6d7683 files/digest-librsvg-2.9.5 244
 RMD160 fa8202d0e49d55d83606f5974dd0b664b6076240 files/digest-librsvg-2.9.5 244
 SHA256 7603e00573b3e1c94a065ec0c1d10f79d54ad33aed86a223ba233220e77b4c0a files/digest-librsvg-2.9.5 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGbbiMomPajV0RnrERAv5fAJ9IHNYQHsEF4Lce40dklbdddo8QuACcCvm/
+afyq7J/vrnXyP+l1HFz4ATI=
+=FziZ
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/librsvg/files/digest-librsvg-2.16.1-r2 b/gnome-base/librsvg/files/digest-librsvg-2.16.1-r2
new file mode 100644
index 000000000000..1b7bd6ad85a3
--- /dev/null
+++ b/gnome-base/librsvg/files/digest-librsvg-2.16.1-r2
@@ -0,0 +1,3 @@
+MD5 37e046571097ff7ce77ae6e07f096324 librsvg-2.16.1.tar.bz2 423624
+RMD160 27d293693d050a8a326311b4b0b5366baf400573 librsvg-2.16.1.tar.bz2 423624
+SHA256 2989d6a969b6f80d354f8120a5dd625d2c0b4e9e04bf178e9e7b34ae28e2ac69 librsvg-2.16.1.tar.bz2 423624
diff --git a/gnome-base/librsvg/files/librsvg-2.16.1-leak-fixes.patch b/gnome-base/librsvg/files/librsvg-2.16.1-leak-fixes.patch
new file mode 100644
index 000000000000..d8f0d9938a72
--- /dev/null
+++ b/gnome-base/librsvg/files/librsvg-2.16.1-leak-fixes.patch
@@ -0,0 +1,33 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN librsvg-2.16.1.orig/rsvg-cairo-draw.c librsvg-2.16.1/rsvg-cairo-draw.c
+--- librsvg-2.16.1.orig/rsvg-cairo-draw.c	2006-08-22 09:00:38.000000000 -0400
++++ librsvg-2.16.1/rsvg-cairo-draw.c	2007-06-11 16:47:32.000000000 -0400
+@@ -963,7 +963,7 @@ rsvg_cairo_pop_render_stack (RsvgDrawing
+ 		surface = cairo_get_target (child_cr);
+ 
+ 	render->cr = (cairo_t *)render->cr_stack->data;
+-	render->cr_stack = g_list_remove_link (render->cr_stack, render->cr_stack);
++    render->cr_stack = g_list_delete_link (render->cr_stack, render->cr_stack);
+ 
+ 	cairo_set_source_surface (render->cr,
+ 							  surface,
+@@ -989,7 +989,7 @@ rsvg_cairo_pop_render_stack (RsvgDrawing
+ 	render->bbox = *((RsvgBbox *)render->bb_stack->data);
+ 
+ 	g_free(render->bb_stack->data);
+-	render->bb_stack = g_list_remove_link (render->bb_stack, render->bb_stack);
++    render->bb_stack = g_list_delete_link (render->bb_stack, render->bb_stack);
+ 
+ 	if (state->filter)
+ 		{
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN librsvg-2.16.1.orig/rsvg-text.c librsvg-2.16.1/rsvg-text.c
+--- librsvg-2.16.1.orig/rsvg-text.c	2006-08-23 09:05:44.000000000 -0400
++++ librsvg-2.16.1/rsvg-text.c	2007-06-11 16:48:54.000000000 -0400
+@@ -946,6 +946,8 @@ rsvg_text_render_text (RsvgDrawingCtx *c
+ 			pango_layout_iter_free (iter);
+ 			ctx->render->render_pango_layout (ctx, layout, *x, *y - baseline);
+ 			*x += w;
++			g_object_unref (layout);
++			g_object_unref (context);
+ 		}
+ 	else
+ 		{
diff --git a/gnome-base/librsvg/librsvg-2.16.1-r2.ebuild b/gnome-base/librsvg/librsvg-2.16.1-r2.ebuild
new file mode 100644
index 000000000000..905d142fa2c9
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.16.1-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.16.1-r2.ebuild,v 1.1 2007/06/11 21:02:38 dang Exp $
+
+inherit multilib gnome2 eutils
+
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
+HOMEPAGE="http://librsvg.sourceforge.net/"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc gnome zlib"
+
+RDEPEND=">=media-libs/fontconfig-1.0.1
+	>=x11-libs/gtk+-2.6
+	>=dev-libs/glib-2.12
+	>=dev-libs/libxml2-2.4.7
+	>=x11-libs/cairo-1.2
+	>=x11-libs/pango-1.2
+	>=dev-libs/libcroco-0.6.1
+	>=media-libs/freetype-2
+	gnome? ( >=gnome-base/gnome-vfs-2 )
+	zlib? ( >=gnome-extra/libgsf-1.6 )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	doc? ( >=dev-util/gtk-doc-0.9 )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+set_gtk_confdir() {
+	# An arch specific config directory is used on multilib systems
+	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
+}
+
+pkg_setup() {
+	G2CONF="--enable-gtk-theme --enable-pixbuf-loader \
+			--disable-mozilla-plugin --with-croco \
+			--disable-gnome-print \
+			$(use_enable gnome gnome-vfs) \
+			$(use_with zlib svgz)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Still fails even with disable-gtk-doc
+	if ! use doc; then
+		epatch ${FILESDIR}/${PN}-2.15.90-die-gtk-doc-die.patch
+	fi
+
+	# Patch from truedfx to prevent floating point exceptions
+	epatch ${FILESDIR}/${PN}-2.16.1-uninit.patch
+
+	# Fix leaks; bug #181532
+	epatch ${FILESDIR}/${PN}-2.16.1-leak-fixes.patch
+
+	cp /usr/share/libtool/install-sh .
+}
+
+src_install() {
+	gnome2_src_install plugindir=/usr/$(get_libdir)/nsbrowser/plugins/
+
+	# remove gdk-pixbuf loaders (#47766)
+	rm -fr ${D}/etc
+
+	# remove plugins dir since we disable the plugin
+	rm -fr ${D}/usr/lib/nsbrowser
+}
+
+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
+}