Applies patch which prevents crash when no svg libs are installed and the appdir has an SVG .DirIcon (Bug 166649)

Package-Manager: portage-2.1.2-r8

5 files changed, 80 insertions, 6 deletions

diff --git a/rox-base/rox-lib/ChangeLog b/rox-base/rox-lib/ChangeLog
index 3717e1462cfa..7bb5e863f473 100644
--- a/rox-base/rox-lib/ChangeLog
+++ b/rox-base/rox-lib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for rox-base/rox-lib
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-lib/ChangeLog,v 1.12 2006/11/24 19:36:28 lack Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-lib/ChangeLog,v 1.13 2007/02/13 17:03:46 lack Exp $
+
+*rox-lib-2.0.3-r2 (13 Feb 2007)
+
+  13 Feb 2007; Jim Ramsay <lack@gentoo.org>
+  +files/rox-lib-2.0.3-nosvg.patch, +rox-lib-2.0.3-r2.ebuild:
+  Applied patch which prevents crash when no svg libs are installed and the
+  appdir has an SVG .DirIcon (Bug 166649)
 
   24 Nov 2006; Jim Ramsay <lack@gentoo.org> -rox-lib-2.0.3.ebuild:
   Version cleanup
diff --git a/rox-base/rox-lib/Manifest b/rox-base/rox-lib/Manifest
index 56cd6864d41b..4346b3b88b8b 100644
--- a/rox-base/rox-lib/Manifest
+++ b/rox-base/rox-lib/Manifest
@@ -1,12 +1,20 @@
+AUX rox-lib-2.0.3-nosvg.patch 543 RMD160 93469b0c7dc749706ca677eac084e025ed1afc44 SHA1 23abeb104f0e3a00e4f9622bdcbe83bbba93c342 SHA256 a1150d8a208071f5e1d0b207374a6cdd86502fde5a51ca4f5bc0d8ab2de18746
+MD5 b8b19daebf704b3fdd327b3ca127d5e7 files/rox-lib-2.0.3-nosvg.patch 543
+RMD160 93469b0c7dc749706ca677eac084e025ed1afc44 files/rox-lib-2.0.3-nosvg.patch 543
+SHA256 a1150d8a208071f5e1d0b207374a6cdd86502fde5a51ca4f5bc0d8ab2de18746 files/rox-lib-2.0.3-nosvg.patch 543
 DIST rox-lib2-2.0.3.tar.bz2 127605 RMD160 dd5a1472a8e5db1c7af330d2c0f4a03e5088b899 SHA1 7c51c93bc335ecb614767f79bb6a1e4a21eb216b SHA256 8d2f7475f2ab131d03453b1da7ed4472a564a93927836add77291d8fc6cdd355
 EBUILD rox-lib-2.0.3-r1.ebuild 807 RMD160 d73fef433293fed34816b3761bd903a17c98da2c SHA1 083a24f35db961f38ae2980de6cddfe2cba01fc2 SHA256 c5dee3cfe776c65e9523cd1b732c7a76a08b0b3bfd5591df1afc5c5cbfb999e2
 MD5 e69c591252d717b6ad096692e9287907 rox-lib-2.0.3-r1.ebuild 807
 RMD160 d73fef433293fed34816b3761bd903a17c98da2c rox-lib-2.0.3-r1.ebuild 807
 SHA256 c5dee3cfe776c65e9523cd1b732c7a76a08b0b3bfd5591df1afc5c5cbfb999e2 rox-lib-2.0.3-r1.ebuild 807
-MISC ChangeLog 1813 RMD160 abd3978c03762193bc079bb9f438291b8bdb0ee4 SHA1 c200d33028ffe287f606519c838c14187f72f433 SHA256 1adb75ba3ce039ace95cb33aeb547287b701f5978b7c07ddf060d3733b390e40
-MD5 0de70a95356040c805ae386eeb53db6b ChangeLog 1813
-RMD160 abd3978c03762193bc079bb9f438291b8bdb0ee4 ChangeLog 1813
-SHA256 1adb75ba3ce039ace95cb33aeb547287b701f5978b7c07ddf060d3733b390e40 ChangeLog 1813
+EBUILD rox-lib-2.0.3-r2.ebuild 895 RMD160 fc3a767361b5f422e6fa41c62c3b64faa296e9f3 SHA1 7ed2bc21ed690d6f42c3e54e80ce7dc3f504d0e0 SHA256 e532f8c61c26caac7b9957e79e7a2d9a562ba9178a82a821c6d0e32ec5b527a2
+MD5 5c493cddbb8297b3d9b60e9ee42e372d rox-lib-2.0.3-r2.ebuild 895
+RMD160 fc3a767361b5f422e6fa41c62c3b64faa296e9f3 rox-lib-2.0.3-r2.ebuild 895
+SHA256 e532f8c61c26caac7b9957e79e7a2d9a562ba9178a82a821c6d0e32ec5b527a2 rox-lib-2.0.3-r2.ebuild 895
+MISC ChangeLog 2071 RMD160 bbac5af83fc73a18914cd23b003d867c3b8bf425 SHA1 1502ae391b3fc96741289f682df5244b5e48f8f8 SHA256 cc9fbd64521812d366e9ae0f238e3993195eba4d1be7726e2b3de239705564f0
+MD5 3d8b6dd83e63c24ff35950bda88fc283 ChangeLog 2071
+RMD160 bbac5af83fc73a18914cd23b003d867c3b8bf425 ChangeLog 2071
+SHA256 cc9fbd64521812d366e9ae0f238e3993195eba4d1be7726e2b3de239705564f0 ChangeLog 2071
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
 MD5 94ae74afbf5ec6b3f8cdcb4ea7c917bb metadata.xml 157
 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f metadata.xml 157
@@ -14,3 +22,6 @@ SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c metadata
 MD5 0fdbbe25286342052db1014b52cd1646 files/digest-rox-lib-2.0.3-r1 247
 RMD160 ae5cc6500f426daf69161ae94b5efc3abeafd6ab files/digest-rox-lib-2.0.3-r1 247
 SHA256 e769d4f4bff8ca39352c7fb3f4178d4cd5ab2c1ef48eb3193e9757c7e741e5c8 files/digest-rox-lib-2.0.3-r1 247
+MD5 0fdbbe25286342052db1014b52cd1646 files/digest-rox-lib-2.0.3-r2 247
+RMD160 ae5cc6500f426daf69161ae94b5efc3abeafd6ab files/digest-rox-lib-2.0.3-r2 247
+SHA256 e769d4f4bff8ca39352c7fb3f4178d4cd5ab2c1ef48eb3193e9757c7e741e5c8 files/digest-rox-lib-2.0.3-r2 247
diff --git a/rox-base/rox-lib/files/digest-rox-lib-2.0.3-r2 b/rox-base/rox-lib/files/digest-rox-lib-2.0.3-r2
new file mode 100644
index 000000000000..b1fd12970c36
--- /dev/null
+++ b/rox-base/rox-lib/files/digest-rox-lib-2.0.3-r2
@@ -0,0 +1,3 @@
+MD5 16ebb244896d92c3a1dec3eab512d1cf rox-lib2-2.0.3.tar.bz2 127605
+RMD160 dd5a1472a8e5db1c7af330d2c0f4a03e5088b899 rox-lib2-2.0.3.tar.bz2 127605
+SHA256 8d2f7475f2ab131d03453b1da7ed4472a564a93927836add77291d8fc6cdd355 rox-lib2-2.0.3.tar.bz2 127605
diff --git a/rox-base/rox-lib/files/rox-lib-2.0.3-nosvg.patch b/rox-base/rox-lib/files/rox-lib-2.0.3-nosvg.patch
new file mode 100644
index 000000000000..eff2aa325c40
--- /dev/null
+++ b/rox-base/rox-lib/files/rox-lib-2.0.3-nosvg.patch
@@ -0,0 +1,18 @@
+Index: ROX-Lib2/python/rox/__init__.py
+===================================================================
+--- ROX-Lib2/python/rox/__init__.py	(revision 4953)
++++ ROX-Lib2/python/rox/__init__.py	(working copy)
+@@ -197,8 +197,11 @@
+ 	try:
+ 		g.window_set_default_icon_list(g.gdk.pixbuf_new_from_file(_icon_path))
+ 	except:
+-		# Older pygtk
+-		_window_icon = g.gdk.pixbuf_new_from_file(_icon_path)
++		try:
++			# Older pygtk
++			_window_icon = g.gdk.pixbuf_new_from_file(_icon_path)
++		except:
++			pass
+ del _icon_path
+ 
+ class Window(g.Window):
diff --git a/rox-base/rox-lib/rox-lib-2.0.3-r2.ebuild b/rox-base/rox-lib/rox-lib-2.0.3-r2.ebuild
new file mode 100644
index 000000000000..6f3026eb2a4e
--- /dev/null
+++ b/rox-base/rox-lib/rox-lib-2.0.3-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-lib/rox-lib-2.0.3-r2.ebuild,v 1.1 2007/02/13 17:03:46 lack Exp $
+
+NEED_PYTHON="2.3"
+inherit python eutils
+
+MY_PN="rox-lib2"
+DESCRIPTION="ROX-Lib2 - Shared code for ROX applications by Thomas Leonard"
+HOMEPAGE="http://rox.sourceforge.net/desktop/ROX-Lib"
+SRC_URI="mirror://sourceforge/rox/${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND=">=rox-base/rox-2.2.0
+		>=dev-python/pygtk-2.8.2"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-nosvg.patch"
+}
+
+src_install() {
+	dodir /usr/lib/
+	cp -r ROX-Lib2/ ${D}/usr/lib/
+	python_mod_optimize ${D}/usr/lib/ROX-Lib2/ >/dev/null 2>&1
+	dodir /usr/share/doc/
+	dosym /usr/lib/ROX-Lib2/Help /usr/share/doc/${P}
+}