patch from gnome cvs to fix behavior when dealing with whitespaces in filenames. thanks to bug 85218

(Portage version: 2.0.51.19)

5 files changed, 130 insertions, 20 deletions

diff --git a/app-arch/file-roller/ChangeLog b/app-arch/file-roller/ChangeLog
index 48ab19897086..d59c20b558ca 100644
--- a/app-arch/file-roller/ChangeLog
+++ b/app-arch/file-roller/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-arch/file-roller
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.96 2005/03/11 20:32:31 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.97 2005/03/15 21:12:20 joem Exp $
+
+*file-roller-2.10.0-r1 (15 Mar 2005)
+
+  15 Mar 2005; Joe McCann <joem@gentoo.org>
+  +files/file-roller-2.10.0-fix_whitespace.patch,
+  +file-roller-2.10.0-r1.ebuild:
+  patch from gnome cvs to fix behavior when dealing with whitespaces in
+  filenames. thanks to bug 85218
 
   11 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   file-roller-2.10.0.ebuild:
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 5e84ac98d6a3..b501970ecb6a 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,28 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 68643268aa87f8b089e797957c862dc3 ChangeLog 11703
-MD5 f601b9f8bff005cc3f9ec4e1ddf1a34d file-roller-2.8.4.ebuild 1204
-MD5 32cde970c17f66cf68a813b054cbc343 file-roller-2.10.0.ebuild 1243
-MD5 3395c0d78a82cca00565749f09618c02 file-roller-2.8.3.ebuild 1200
 MD5 45f34e07323606deac952fb8275d00cd file-roller-2.6.1.ebuild 1209
 MD5 1a1a406af1ceaa03a4f6637160424087 file-roller-2.8.0.ebuild 1200
-MD5 762daf169c908a33e04b670097c4a4fc files/file-roller-2.6-use_fr_rpm2cpio.patch 949
+MD5 3395c0d78a82cca00565749f09618c02 file-roller-2.8.3.ebuild 1200
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 f601b9f8bff005cc3f9ec4e1ddf1a34d file-roller-2.8.4.ebuild 1204
+MD5 32cde970c17f66cf68a813b054cbc343 file-roller-2.10.0.ebuild 1243
+MD5 32cde970c17f66cf68a813b054cbc343 file-roller-2.10.0-r1.ebuild 1243
 MD5 a2afcaf32ad39410e36d24188021895e files/digest-file-roller-2.6.1 71
 MD5 519fed8816b9e6198b4cd9f6cdf9e525 files/digest-file-roller-2.8.0 71
+MD5 08b8885901c763ef33125b33b52e890f files/digest-file-roller-2.8.3 71
+MD5 7c3bf595636ee254e23445ccf07c4075 files/file-roller-2.4.4-64bit.patch 2808
 MD5 0a8f1b361ffded42281e52d734654f48 files/file-roller-2.4.4-gentoo.patch 566
-MD5 67f58f96b7c00be703c9bf9cf38cd191 files/file-roller-2.8.0-use_bin_tar.patch 405
-MD5 7e51d88b0a0bfe30944615eff903d0af files/digest-file-roller-2.8.4 71
 MD5 cc549bc88cee498549b0ed92538c4e3e files/file-roller-2.6-use_bin_tar.patch 493
+MD5 762daf169c908a33e04b670097c4a4fc files/file-roller-2.6-use_fr_rpm2cpio.patch 949
+MD5 67f58f96b7c00be703c9bf9cf38cd191 files/file-roller-2.8.0-use_bin_tar.patch 405
 MD5 d23f66e1c734a44ce6ee89b0e724b371 files/rpm2cpio-file-roller 2556
-MD5 08b8885901c763ef33125b33b52e890f files/digest-file-roller-2.8.3 71
-MD5 7c3bf595636ee254e23445ccf07c4075 files/file-roller-2.4.4-64bit.patch 2808
+MD5 7e51d88b0a0bfe30944615eff903d0af files/digest-file-roller-2.8.4 71
 MD5 d779986864325c09e5caba951a634f9a files/digest-file-roller-2.10.0 72
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCMgBZKRy60XGEcJIRAmaFAJ9qsbYTffGthO1afAApdSMisMJcxwCfUgKd
-jnUwgO9Hn21CxcwpmoZMpXA=
-=4PYU
------END PGP SIGNATURE-----
+MD5 d779986864325c09e5caba951a634f9a files/digest-file-roller-2.10.0-r1 72
diff --git a/app-arch/file-roller/file-roller-2.10.0-r1.ebuild b/app-arch/file-roller/file-roller-2.10.0-r1.ebuild
new file mode 100644
index 000000000000..a48afd6b4bf3
--- /dev/null
+++ b/app-arch/file-roller/file-roller-2.10.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.10.0-r1.ebuild,v 1.1 2005/03/15 21:12:20 joem Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="archive manager for GNOME"
+HOMEPAGE="http://fileroller.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.6
+	>=gnome-base/libgnome-2.6
+	>=gnome-base/libgnomeui-2.6
+	>=gnome-base/gnome-vfs-2.9
+	>=gnome-base/libglade-2.4
+	>=gnome-base/libbonobo-2.6
+	>=gnome-base/libbonoboui-2.6
+	>=gnome-base/nautilus-2.9
+	>=gnome-base/gconf-2"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29
+	>=app-text/scrollkeeper-0.3.11"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	# Use absolute path to GNU tar since star doesn't have the same
+	# options.  On Gentoo, star is /usr/bin/tar, GNU tar is /bin/tar
+	epatch ${FILESDIR}/${PN}-2.8.0-use_bin_tar.patch
+	# use a local rpm2cpio script to avoid the dep
+	epatch ${FILESDIR}/${PN}-2.6-use_fr_rpm2cpio.patch
+	#allow filenames with whitespaces
+	epatch ${FILESDIR}/${P}-fix_whitespace.patch
+}
+
+src_install() {
+
+	gnome2_src_install
+	dobin ${FILESDIR}/rpm2cpio-file-roller
+
+}
+USE_DESTDIR="1"
diff --git a/app-arch/file-roller/files/digest-file-roller-2.10.0-r1 b/app-arch/file-roller/files/digest-file-roller-2.10.0-r1
new file mode 100644
index 000000000000..6f0df710fa92
--- /dev/null
+++ b/app-arch/file-roller/files/digest-file-roller-2.10.0-r1
@@ -0,0 +1 @@
+MD5 0cb5b09aad7c9d352922994a6e8cf088 file-roller-2.10.0.tar.bz2 1311026
diff --git a/app-arch/file-roller/files/file-roller-2.10.0-fix_whitespace.patch b/app-arch/file-roller/files/file-roller-2.10.0-fix_whitespace.patch
new file mode 100644
index 000000000000..cf774aab124e
--- /dev/null
+++ b/app-arch/file-roller/files/file-roller-2.10.0-fix_whitespace.patch
@@ -0,0 +1,56 @@
+diff -u -r1.125 -r1.128
+--- src/window.c	2005/03/07 12:33:45	1.125
++++ src/window.c	2005/03/14 10:17:51	1.128
+@@ -1842,10 +1842,8 @@
+         FRWindow         *window = data;
+ 	GtkTreeSelection *selection;
+ 
+-	/* FIXME: uncomment after freeze 
+ 	if (event->window != gtk_tree_view_get_bin_window (GTK_TREE_VIEW (window->list_view))) 
+                 return FALSE;
+-	*/
+ 
+ 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (window->list_view));
+ 	if (selection == NULL)
+@@ -1917,10 +1915,8 @@
+         FRWindow         *window = data;
+ 	GtkTreeSelection *selection;
+ 
+-	/* FIXME: uncomment after freeze 
+ 	if (event->window != gtk_tree_view_get_bin_window (GTK_TREE_VIEW (window->list_view))) 
+                 return FALSE;
+-	*/
+ 
+ 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (window->list_view));
+ 	if (selection == NULL)
+@@ -5436,8 +5432,9 @@
+ 		
+ 		fr_process_begin_command (proc, cdata->command);
+ 		for (scan = cdata->file_list; scan; scan = scan->next) {
+-			char *filename = scan->data;
++			char *filename = shell_escape (scan->data);
+ 			fr_process_add_arg (proc, filename);
++			g_free (filename);
+ 		}
+ 		fr_process_end_command (proc);
+ 		
+@@ -5452,6 +5449,7 @@
+ 			uris = g_list_prepend (uris, gnome_vfs_get_uri_from_local_path (filename));
+ 		}
+ 
++		command_list = g_list_prepend (command_list, cdata);
+ 		gnome_vfs_mime_application_launch (cdata->app, uris);
+ 
+ 		path_list_free (uris);
+@@ -5488,9 +5486,7 @@
+ 					"/",
+ 					file,
+ 					NULL);
+-		cdata->file_list = g_list_prepend (cdata->file_list,
+-						   shell_escape (filename));
+-		g_free (filename);
++		cdata->file_list = g_list_prepend (cdata->file_list, filename);
+ 	}
+ 
+ 	g_signal_connect (G_OBJECT (window->archive), 
+