added patch

4 files changed, 63 insertions, 4 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 8581f8273852..f9c2b33e9cf3 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.38 2003/02/12 16:00:39 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.39 2003/02/19 19:46:39 foser Exp $
 
 *nautilus-2.2.1 (12 Feb 2003)
 
+  19 Feb 2003; foser <foser@gentoo.org> nautilus-2.2.[1,0.2].ebuild :
+  Added patch for double entry bug (#15984)
+
   12 Feb 2003; foser <foser@gentoo.org> nautilus-2.2.1.ebuild :
   New version 
 
diff --git a/gnome-base/nautilus/files/nautilus-2.2-double_menu_entry_fix.patch b/gnome-base/nautilus/files/nautilus-2.2-double_menu_entry_fix.patch
new file mode 100644
index 000000000000..3772bcf09cba
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.2-double_menu_entry_fix.patch
@@ -0,0 +1,43 @@
+diff -ur nautilus-2.2.0.2/src/file-manager/fm-directory-view.c nautilus-2.2.0.2.patched/src/file-manager/fm-directory-view.c
+--- nautilus-2.2.0.2/src/file-manager/fm-directory-view.c	2003-01-20 18:29:21.000000000 +0100
++++ nautilus-2.2.0.2.patched/src/file-manager/fm-directory-view.c	2003-02-19 19:08:36.000000000 +0100
+@@ -3727,6 +3727,29 @@
+ 
+ }
+ 
++static gboolean
++no_locale_at_end (const char *str)
++{
++	int len;
++	len = strlen (str);
++	if (len > 3 &&
++		str[len-3] == '-' &&
++		g_ascii_isalpha (str[len-2]) &&
++		g_ascii_isalpha (str[len-1])) {
++			return FALSE;
++		}
++	if (len > 6 &&
++		str[len-6] == '-' &&
++		g_ascii_isalpha (str[len-5]) &&
++		g_ascii_isalpha (str[len-4]) &&
++		str[len-3] == '_' &&
++		g_ascii_isalpha (str[len-2]) &&
++		g_ascii_isalpha (str[len-1])) {
++			return FALSE;
++		}
++	return TRUE;
++}
++
+ static GList *
+ get_bonobo_menu_verb_names (Bonobo_ServerInfo *info)
+ {
+@@ -3742,7 +3765,8 @@
+ 		/* look for properties that start with "nautilusverb:".  The
+ 		 * part following the colon is the verb name
+ 		 */
+-		if (strstr (info->props._buffer[i].name, "nautilusverb:")) {
++		if (strstr (info->props._buffer[i].name, "nautilusverb:") &&
++			no_locale_at_end (info->props._buffer[i].name)) {           
+ 			l = g_list_prepend (l,
+ 			      g_strdup (&info->props._buffer[i].name[offset]));	
+ 		}
diff --git a/gnome-base/nautilus/nautilus-2.2.0.2.ebuild b/gnome-base/nautilus/nautilus-2.2.0.2.ebuild
index 11a3ccb2f959..b36bb95c3876 100644
--- a/gnome-base/nautilus/nautilus-2.2.0.2.ebuild
+++ b/gnome-base/nautilus/nautilus-2.2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.2.0.2.ebuild,v 1.4 2003/02/13 12:15:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.2.0.2.ebuild,v 1.5 2003/02/19 19:46:39 foser Exp $
 
 inherit gnome2 eutils
 
@@ -50,4 +50,6 @@ src_unpack() {
 	# Fix bug 15450: nautilus-2.2.0.2 doesn't build without
 	# optimization.  We'll need this patch until it's fixed upstream.
 	epatch ${FILESDIR}/${PN}-2.2.0.2-locale.patch
+        # Fix bug #15984: double rightclick menus on localized systems
+        epatch ${FILESDIR}/${PN}-2.2-double_menu_entry_fix.patch
 }
diff --git a/gnome-base/nautilus/nautilus-2.2.1.ebuild b/gnome-base/nautilus/nautilus-2.2.1.ebuild
index 846523c98a3e..615486635d78 100644
--- a/gnome-base/nautilus/nautilus-2.2.1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.2.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.2.1.ebuild,v 1.2 2003/02/13 12:15:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.2.1.ebuild,v 1.3 2003/02/19 19:46:39 foser Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A filemanager for the Gnome2 desktop"
@@ -42,3 +42,14 @@ DEPEND="${RDEPEND}
 G2CONF="${G2CONF} --enable-gdialog=yes"
 
 DOCS="AUTHORS COPYIN* ChangeLo* HACKING INSTALL MAINTAINERS NEWS README THANKS TODO"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+                                                                                
+        # Fix bug 15450: nautilus-2.2.0.2 doesn't build without
+        # optimization.  We'll need this patch until it's fixed upstream.
+        epatch ${FILESDIR}/${PN}-2.2.0.2-locale.patch
+	# Fix bug #15984: double rightclick menus on localized systems
+	epatch ${FILESDIR}/${PN}-2.2-double_menu_entry_fix.patch
+}