Add upstream patch to fix bug #133880

(Portage version: 2.1_rc1-r3)

4 files changed, 98 insertions, 1 deletions

diff --git a/gnome-base/gnome-mount/ChangeLog b/gnome-base/gnome-mount/ChangeLog
index 3839c1bc1fd3..c5f81a1e64f3 100644
--- a/gnome-base/gnome-mount/ChangeLog
+++ b/gnome-base/gnome-mount/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-mount
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.8 2006/05/17 02:33:30 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.9 2006/05/21 23:35:50 dang Exp $
+
+*gnome-mount-0.4-r3 (21 May 2006)
+
+  21 May 2006; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gnome-mount-0.4-fix-segv-on-no-media.patch,
+  +gnome-mount-0.4-r3.ebuild:
+  Add upstream patch to fix bug #133880
 
 *gnome-mount-0.4-r2 (17 May 2006)
 
diff --git a/gnome-base/gnome-mount/files/digest-gnome-mount-0.4-r3 b/gnome-base/gnome-mount/files/digest-gnome-mount-0.4-r3
new file mode 100644
index 000000000000..8b49c8a43c9e
--- /dev/null
+++ b/gnome-base/gnome-mount/files/digest-gnome-mount-0.4-r3
@@ -0,0 +1,3 @@
+MD5 75f260ea6b0ec3c5e0af3c722fbd9568 gnome-mount-0.4.tar.gz 364546
+RMD160 a4f28e3111bfcfce2101cbf53f9c57f63d9ba2be gnome-mount-0.4.tar.gz 364546
+SHA256 fa9456c0cd1adeda962721fed955914bdc23723a403bebf31bd95a1f54211dd8 gnome-mount-0.4.tar.gz 364546
diff --git a/gnome-base/gnome-mount/files/gnome-mount-0.4-fix-segv-on-no-media.patch b/gnome-base/gnome-mount/files/gnome-mount-0.4-fix-segv-on-no-media.patch
new file mode 100644
index 000000000000..5c1c3e433b42
--- /dev/null
+++ b/gnome-base/gnome-mount/files/gnome-mount-0.4-fix-segv-on-no-media.patch
@@ -0,0 +1,48 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-mount-0.4.orig/src/gnome-mount.c gnome-mount-0.4/src/gnome-mount.c
+--- gnome-mount-0.4.orig/src/gnome-mount.c	2006-02-24 00:14:23.000000000 -0500
++++ gnome-mount-0.4/src/gnome-mount.c	2006-05-21 19:26:17.000000000 -0400
+@@ -238,7 +238,8 @@
+ /* #define MOUNT_ERROR_DIALOG_RESPONSE_INSTALL_DRIVER 10 see below */
+ 
+ static void
+-show_error_dialog_mount (LibHalVolume *volume, const char *error_name, const char *error_detail, 
++show_error_dialog_mount (LibHalVolume *volume, LibHalDrive *drive,
++			 const char *error_name, const char *error_detail, 
+ 			 const char *fstype_requested)
+ {
+ 	GtkWidget *w;
+@@ -266,7 +267,10 @@
+ 					    0,
+ 					    _("Cannot mount volume"));
+ 
+-		volume_name = libhal_volume_get_label (volume);
++		if (volume != NULL)
++			volume_name = libhal_volume_get_label (volume);
++		else
++			volume_name = NULL;
+ 
+ 		if (strcmp (error_name, "org.freedesktop.Hal.Device.Volume.PermissionDenied") == 0) {
+ 			gtk_message_dialog_format_secondary_text (
+@@ -289,8 +293,8 @@
+ 				volume_name != NULL ? 
+ 				_("The volume '%s' uses the <i>%s</i> file system which is not supported by your system.") :
+ 				_("The volume uses the <i>%s</i> file system which is not supported by your system."),
+-				volume_name != NULL ? volume_name : fstype_requested,
+-				volume_name != NULL ? fstype_requested : "");
++				volume_name != NULL ? volume_name : (fstype_requested != NULL ? fstype_requested : ""),
++				volume_name != NULL ? (fstype_requested != NULL ? fstype_requested : "") : "");
+ 
+ 			/* some day.. :-)
+ 			gtk_dialog_add_buttons (GTK_DIALOG (w),
+@@ -463,9 +467,9 @@
+ 
+ 		notify_parent (FALSE);
+ 
+-		show_error_dialog_mount (volume, error.name, error.message, 
++		show_error_dialog_mount (volume, drive, error.name, error.message, 
+ 					 (fstype != NULL && strlen (fstype) > 0) ? 
+-					 fstype : libhal_volume_get_fstype (volume));
++					 fstype : (volume != NULL ? libhal_volume_get_fstype (volume) : NULL));
+ 
+ 		dbus_error_free (&error);
+ 		goto out;
diff --git a/gnome-base/gnome-mount/gnome-mount-0.4-r3.ebuild b/gnome-base/gnome-mount/gnome-mount-0.4-r3.ebuild
new file mode 100644
index 000000000000..019b5f5ae25f
--- /dev/null
+++ b/gnome-base/gnome-mount/gnome-mount-0.4-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/gnome-mount-0.4-r3.ebuild,v 1.1 2006/05/21 23:35:50 dang Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Wrapper for (un)mounting and ejecting disks"
+HOMEPAGE="http://freedesktop.org/~david/"
+SRC_URI="http://freedesktop.org/~david/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+RDEPEND=">=gnome-base/libgnomeui-2.13
+	>=sys-apps/dbus-0.60
+	>=sys-apps/hal-0.5.7-r1
+	>=x11-libs/gtk+-2.8
+	gnome-base/gnome-keyring
+	>=gnome-base/libglade-2
+	>=gnome-base/gconf-2"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29"
+
+DOCS="AUTHORS ChangeLog COPYING HACKING INSTALL NEWS README TODO"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Patch for bug #133549
+	epatch ${FILESDIR}/${P}-hal-mountable.patch
+
+	# Patch for bug #133880
+	epatch ${FILESDIR}/${P}-fix-segv-on-no-media.patch
+}