Add a fix for icon loading with some gtk+ themes. See bug #83607. Thanks to Alexander Kaiser for the fix.

(Portage version: 2.0.51.19)

5 files changed, 110 insertions, 5 deletions

diff --git a/dev-util/monodevelop/ChangeLog b/dev-util/monodevelop/ChangeLog
index 5dc1d664421d..6438f07a70b9 100644
--- a/dev-util/monodevelop/ChangeLog
+++ b/dev-util/monodevelop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/monodevelop
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/ChangeLog,v 1.19 2005/02/19 22:07:02 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/ChangeLog,v 1.20 2005/03/07 19:54:39 latexer Exp $
+
+*monodevelop-0.5.1-r4 (07 Mar 2005)
+
+  07 Mar 2005; Peter Johanson <latexer@gentoo.org>
+  +files/monodevelop-0.5.1-iconloader.diff, +monodevelop-0.5.1-r4.ebuild:
+  Add a fix for icon loading with some gtk+ themes. See bug #83607. Thanks to
+  Alexander Kaiser for the fix.
 
 *monodevelop-0.5.1-r3 (08 Feb 2005)
 
diff --git a/dev-util/monodevelop/Manifest b/dev-util/monodevelop/Manifest
index 0d7fbc431a8c..8be197189549 100644
--- a/dev-util/monodevelop/Manifest
+++ b/dev-util/monodevelop/Manifest
@@ -1,9 +1,12 @@
-MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
-MD5 866de7d3398c8bf4ceac05aa3623590c monodevelop-0.5.1-r1.ebuild 1266
 MD5 6e53856bb29e79f0a31dfafcde24228b monodevelop-0.5.1-r2.ebuild 1401
-MD5 5a2c47c2bafb930341b1722905b45a92 monodevelop-0.5.1-r3.ebuild 1524
+MD5 b27a57ea8fb4132a71ba94088fb27f89 monodevelop-0.5.1-r4.ebuild 1572
+MD5 866de7d3398c8bf4ceac05aa3623590c monodevelop-0.5.1-r1.ebuild 1266
 MD5 df2331e12d14c78ada8350222c8efa9b ChangeLog 3339
-MD5 39c4b9f9bcd677a6fa78835308948564 files/digest-monodevelop-0.5.1-r1 70
+MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
+MD5 5a2c47c2bafb930341b1722905b45a92 monodevelop-0.5.1-r3.ebuild 1524
+MD5 f36ce806f3552f974021d1a56021f67c files/monodevelop-0.5.1-iconloader.diff 1255
 MD5 9e3ea3908c299c9240a5f7689f83909a files/monodevelop-0.5.1-nemerle-gtk-sharp.diff 1874
+MD5 39c4b9f9bcd677a6fa78835308948564 files/digest-monodevelop-0.5.1-r1 70
 MD5 39c4b9f9bcd677a6fa78835308948564 files/digest-monodevelop-0.5.1-r2 70
 MD5 8c9f33855ebcc0bd8100baec6a00fb50 files/digest-monodevelop-0.5.1-r3 157
+MD5 8c9f33855ebcc0bd8100baec6a00fb50 files/digest-monodevelop-0.5.1-r4 157
diff --git a/dev-util/monodevelop/files/digest-monodevelop-0.5.1-r4 b/dev-util/monodevelop/files/digest-monodevelop-0.5.1-r4
new file mode 100644
index 000000000000..b7d171cb1f78
--- /dev/null
+++ b/dev-util/monodevelop/files/digest-monodevelop-0.5.1-r4
@@ -0,0 +1,2 @@
+MD5 d89458a2d909da09b2cc1f37e16d8990 monodevelop-0.5.1.tar.gz 1806990
+MD5 ef72a432a4da1cb79733d691dc6edd40 monodevelop-0.5.1-mono-1.1.x-compat.diff.bz2 4087
diff --git a/dev-util/monodevelop/files/monodevelop-0.5.1-iconloader.diff b/dev-util/monodevelop/files/monodevelop-0.5.1-iconloader.diff
new file mode 100644
index 000000000000..942d71ceb0c7
--- /dev/null
+++ b/dev-util/monodevelop/files/monodevelop-0.5.1-iconloader.diff
@@ -0,0 +1,32 @@
+Index: Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs
+===================================================================
+--- ./src/Libraries/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs	(revision 2122)
++++ ./src/Libraries/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs	(working copy)
+@@ -44,20 +44,21 @@
+ 		{
+ 			Gdk.Pixbuf bf = (Gdk.Pixbuf) iconHash [type];
+ 			if (bf == null) {
+-				int i;
+-				string p_filename = "gnome-fs-regular";
++				const string default_icon_location = "../data/resources/icons/gnome-fs-regular.png";
++				string p_filename = "";
+ 				try {
++					int i;
+ 					p_filename = iconTheme.LookupIcon (type, 24, new Gnome.IconData (), out i);
+-					if (p_filename == "") {
+-						return new Gdk.Pixbuf ("../data/resources/icons/gnome-fs-regular.png");
++					if (p_filename.Equals ("")) {
++						p_filename = default_icon_location;
+ 					}
+ 				} catch {
+-					return new Gdk.Pixbuf ("../data/resources/icons/gnome-fs-regular.png");
++					p_filename = default_icon_location;
+ 				}
+ 				try {
+ 					bf = new Gdk.Pixbuf (p_filename);
+ 				} catch {
+-					bf = new Gdk.Pixbuf ("../data/resources/icons/gnome-fs-regular.png");
++					bf = new Gdk.Pixbuf (default_icon_location);
+ 				}
+ 				iconHash [type] = bf;
+ 			}
diff --git a/dev-util/monodevelop/monodevelop-0.5.1-r4.ebuild b/dev-util/monodevelop/monodevelop-0.5.1-r4.ebuild
new file mode 100644
index 000000000000..d0ef00dd4096
--- /dev/null
+++ b/dev-util/monodevelop/monodevelop-0.5.1-r4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/monodevelop/monodevelop-0.5.1-r4.ebuild,v 1.1 2005/03/07 19:54:39 latexer Exp $
+
+inherit mono eutils
+
+DESCRIPTION="MonoDevelop is a project to port SharpDevelop to Gtk#"
+SRC_URI="http://www.go-mono.com/archive/1.0.2/${P}.tar.gz
+		mirror://gentoo/${P}-mono-1.1.x-compat.diff.bz2"
+HOMEPAGE="http://monodevelop.com/"
+LICENSE="GPL-2"
+
+IUSE=""
+DEPEND=">=dev-libs/icu-2.6
+	>=dev-dotnet/mono-1.0
+	>=dev-util/monodoc-1.0
+	>=dev-dotnet/gtk-sharp-1.0.4-r1
+	>=dev-dotnet/glade-sharp-1.0.4
+	>=dev-dotnet/gnome-sharp-1.0.4
+	>=dev-dotnet/gconf-sharp-1.0.4
+	>=dev-dotnet/gtkhtml-sharp-1.0.4
+	>=dev-dotnet/gtksourceview-sharp-0.5
+	>=dev-dotnet/gecko-sharp-0.5-r2
+	>=sys-devel/automake-1.8"
+
+KEYWORDS="~x86 ~ppc"
+SLOT="0"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${WORKDIR}/${P}-mono-1.1.x-compat.diff || die
+	epatch ${FILESDIR}/${P}-nemerle-gtk-sharp.diff || die
+	epatch ${FILESDIR}/${P}-iconloader.diff || die
+	export WANT_AUTOMAKE=1.8
+	aclocal || die
+	automake || die
+}
+
+src_compile() {
+	econf || die
+	MAKEOPTS="-j1" make || die
+}
+
+src_install () {
+	# Needed if update-mime-info is run
+	addwrite ${ROOT}/usr/share/mime
+
+	make DESTDIR=${D} install || die
+
+	# Install documentation.
+	dodoc ChangeLog README
+}
+
+pkg_postinst() {
+	echo
+	ewarn "If you experience problems with syntax highlighting,"
+	ewarn "Re-emerge gtksourceview. Previous versions of monodevelop"
+	ewarn "installed a .lang file that gtksourceview now handles."
+	echo
+}