add patches from bugs #229719, #229723, #216391

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

6 files changed, 248 insertions, 5 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 88f0bb02c57a..b122915743c5 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.265 2008/06/08 20:51:58 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.266 2008/06/29 22:34:34 eva Exp $
+
+*nautilus-2.22.3-r1 (29 Jun 2008)
+
+  29 Jun 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/nautilus-2.22.3-open-folder.patch,
+  +files/nautilus-2.22.3-preserve-metadata.patch,
+  +files/nautilus-2.22.3-prevent-recursive-mvcp.patch,
+  +nautilus-2.22.3-r1.ebuild:
+  add patches from bugs #229719, #229723, #216391
 
   08 Jun 2008; Gilles Dartiguelongue <eva@gentoo.org>
   -nautilus-2.18.1-r1.ebuild, -nautilus-2.18.3-r1.ebuild,
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index a061edfdc569..c4d11a035e62 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -11,18 +11,22 @@ AUX nautilus-2.20.0-statfs.patch 470 RMD160 860c6179e0b2796b1bb44fb53caf38b24360
 AUX nautilus-2.20.0-thumbnail-flashing.patch 4787 RMD160 d9cf1ace6cf1f367cfdd66317ee1bbfb96957b76 SHA1 db9503f51aefbe541aeb39541733543dcea551f2 SHA256 bec9d2a07c8b04137b50591b753e4913583dc673c889f44de40ddbadff5ab6ec
 AUX nautilus-2.22.2-fix_broken_configure.patch 609 RMD160 d5472a486da24afd15b45a7faf6975478cd29fd1 SHA1 84928f7ab3681ceac0537296d9d9dd96840c686b SHA256 e651559bdca5f3ba92278223ba01858e8984664d7c0c856698324ed9dc324e56
 AUX nautilus-2.22.2-no-esound.patch 2035 RMD160 6aa244b5962384a895bcbab386feb5058dc8e0fe SHA1 c134acdbfb566126a1788f1fc3fefdb6505bab1e SHA256 6abc000bf8f9e54b579ece3bf7ce2dbe7b1e4e660c79f0b148106d840e5d76d5
+AUX nautilus-2.22.3-open-folder.patch 1293 RMD160 42661a0e967fb3ba9c514c7fdfcc5e3f20672ef9 SHA1 37f82d9c7068b4d9d3fa02574da2dd2058a2ed0d SHA256 524457f21302e778bed37a83f955c78488fee0c6924c586677ce677e16324434
+AUX nautilus-2.22.3-preserve-metadata.patch 568 RMD160 209a143c3764a6d35af8648b54aff688802b40fb SHA1 7067b3fd12d5f00aef58546ad9591dbf2f14c2cd SHA256 83c8fcc0484fa6b4f70795c538d7f04868a1eec6e12e0349ccc16fe4070f7dc7
+AUX nautilus-2.22.3-prevent-recursive-mvcp.patch 3101 RMD160 2a1952958a6996675d4083c197b975570a554d43 SHA1 566cb4b33bb830e972b0c477e41a14e86f7a79e0 SHA256 b507d738b869b4fc55652dff67546711fec70bdef4ea7baad9ec4c6d8be3e979
 DIST nautilus-2.20.0.tar.bz2 4916284 RMD160 9eeb18c886795ebbdd6dfc61ccddaee8eab81808 SHA1 f6a75a854728ef308e2721424a9638d228661b1d SHA256 98f9d9f7bc89db67cbcc4c7d08ec72175b8c9b3eb9489f7869c5cec9f16feb08
 DIST nautilus-2.22.2.tar.bz2 5032921 RMD160 26787ee2e62e49acf5a03d4792e16a00034dd751 SHA1 fe20dfbfbd21e06dcb4fbb471cdb957c2d96f5cf SHA256 0abf783260ce3c60ffe28c14cb932384b2a1f67b92ba1a1d017a1e8880d05433
 DIST nautilus-2.22.3.tar.bz2 5024786 RMD160 6c21cd6d6f1c628105c1d6e4e1852bcd3d969ea9 SHA1 cc14a5201fe7357913a2a30c1c96aedc248a51b2 SHA256 1671d61fc01bf8d489fa7a1d840e7c51d92ce8fa9040a0f8bf630a18652c9fa5
 EBUILD nautilus-2.20.0-r1.ebuild 2964 RMD160 76dba02ab2886d3c655a2722024bd30161f72444 SHA1 d9d8156025de2342e6f73ea89b6455083d4182ff SHA256 dfa60ad31c56184611645499990aa8103f22c0ca23ca3c7f71770a4c6703f97a
 EBUILD nautilus-2.22.2.ebuild 1965 RMD160 39e25052fa91a431d3edd7b79ef4138f49885a14 SHA1 f6b2041d54806435a879624961961b9d99188568 SHA256 2231520d7b06c0004c5f1b457f7e887887a29c4f96b6337ae5f1a7108a7101da
+EBUILD nautilus-2.22.3-r1.ebuild 1939 RMD160 e3833bde252bd31c4b29b598fc9891c98795dcff SHA1 6ceb5b7501a7de84bebd018fa4df9f3e5ed307a8 SHA256 8a92e62e6ad19623ecc414d69d2f65828c6d8507debbf8ef7cf051a6fd7423c8
 EBUILD nautilus-2.22.3.ebuild 1724 RMD160 e28716bd40d476e7b9d3d8abf197f9612adba710 SHA1 0e5854c42a72d4cace269516649f5f1c4a2cf0ca SHA256 5e52153501fb8cdf5309d3859cb3847d45d1d4dba78c8b351401b0a6a46272d0
-MISC ChangeLog 36561 RMD160 cdc72924a93e5c6b7717232221f280e7cd692410 SHA1 98744b9bf571a5706c026f0bc23b5b5133060534 SHA256 f892490930df08622ed2435f878e3622224d507424ef170aa54f28a17730705f
+MISC ChangeLog 36880 RMD160 14dd9723e77a76fc6f15ce530879a51dac2cdcd0 SHA1 bc96883ba245eb6fac94e5b461b12308a5fbd51e SHA256 1dc3a1f56fb98a765b85a963bec0e63aef09d9216301ce55f7acf85637c868cc
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhMRnQACgkQ1fmVwcYIWAaqrQCfZKwdurFQYzx7kPGqRkmXtcVY
-bGIAoLj+x8QgSugDSI266nObWvuZ4/yU
-=wBk4
+iEUEARECAAYFAkhoDgEACgkQ1fmVwcYIWAaEaACdHIrnIC6lnDIQT/6VzXMPUexH
+c4QAl3qYarKPPo7H35/u4YAYH8SKTBQ=
+=I3qP
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/nautilus-2.22.3-open-folder.patch b/gnome-base/nautilus/files/nautilus-2.22.3-open-folder.patch
new file mode 100644
index 000000000000..1622374851e9
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.22.3-open-folder.patch
@@ -0,0 +1,37 @@
+diff -up nautilus-2.22.2/libnautilus-private/nautilus-autorun.c.fix-open-folder nautilus-2.22.2/libnautilus-private/nautilus-autorun.c
+--- nautilus-2.22.2/libnautilus-private/nautilus-autorun.c.fix-open-folder	2008-04-17 22:30:04.000000000 -0400
++++ nautilus-2.22.2/libnautilus-private/nautilus-autorun.c	2008-04-17 22:30:10.000000000 -0400
+@@ -1200,15 +1200,6 @@ typedef struct {
+ 	gpointer user_data;
+ } AutorunData;
+ 
+-
+-static void
+-autorun_open_folder_for_mount (AutorunData *data)
+-{
+-	if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_MEDIA_AUTOMOUNT_OPEN) && 
+-	    data->open_window_func != NULL)
+-		data->open_window_func (data->mount, data->user_data);
+-}
+-
+ static void
+ autorun_guessed_content_type_callback (GObject *source_object,
+ 				       GAsyncResult *res,
+@@ -1237,13 +1228,14 @@ autorun_guessed_content_type_callback (G
+ 			}
+ 			g_strfreev (guessed_content_type);
+ 		} else {
+-			open_folder = TRUE;
++			if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_MEDIA_AUTOMOUNT_OPEN))
++				open_folder = TRUE;
+ 		}
+ 	}
+ 
+ 	/* only open the folder once.. */
+-	if (open_folder) {
+-		autorun_open_folder_for_mount (data);
++	if (open_folder && data->open_window_func != NULL) {
++		data->open_window_func (data->mount, data->user_data);
+ 	}
+ 
+ 	g_object_unref (data->mount);
diff --git a/gnome-base/nautilus/files/nautilus-2.22.3-preserve-metadata.patch b/gnome-base/nautilus/files/nautilus-2.22.3-preserve-metadata.patch
new file mode 100644
index 000000000000..6a00eeb83756
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.22.3-preserve-metadata.patch
@@ -0,0 +1,12 @@
+diff -ru nautilus-2.22.1.orig/libnautilus-private/nautilus-file-operations.c nautilus-2.22.1/libnautilus-private/nautilus-file-operations.c
+--- nautilus-2.22.1.orig/libnautilus-private/nautilus-file-operations.c	2008-03-28 08:13:32.000000000 -0400
++++ nautilus-2.22.1/libnautilus-private/nautilus-file-operations.c	2008-04-05 16:24:39.674861333 -0400
+@@ -3245,7 +3245,7 @@
+  retry:
+ 	
+ 	error = NULL;
+-	flags = G_FILE_COPY_NOFOLLOW_SYMLINKS;
++	flags = G_FILE_COPY_NOFOLLOW_SYMLINKS | G_FILE_COPY_ALL_METADATA;
+ 	if (overwrite) {
+ 		flags |= G_FILE_COPY_OVERWRITE;
+ 	}
diff --git a/gnome-base/nautilus/files/nautilus-2.22.3-prevent-recursive-mvcp.patch b/gnome-base/nautilus/files/nautilus-2.22.3-prevent-recursive-mvcp.patch
new file mode 100644
index 000000000000..128475e08cf8
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.22.3-prevent-recursive-mvcp.patch
@@ -0,0 +1,113 @@
+Index: libnautilus-private/nautilus-file-operations.c
+===================================================================
+--- libnautilus-private/nautilus-file-operations.c	(revision 14108)
++++ libnautilus-private/nautilus-file-operations.c	(working copy)
+@@ -3224,6 +3224,24 @@
+ 	}
+ }
+ 
++static gboolean
++g_file_struct_contains (GFile *child, GFile *root)
++{
++    GFile *f;
++    
++    f = g_file_dup (child);
++    while (f) {
++	if (g_file_equal (f, root)) {
++	    g_object_unref (f);
++	    return TRUE;
++	}
++	f = g_file_get_parent (f);
++    }
++    
++    if (f)  g_object_unref (f);
++    return FALSE;
++}
++
+ /* Debuting files is non-NULL only for toplevel items */
+ static void
+ copy_move_file (CopyMoveJob *copy_job,
+@@ -3264,6 +3282,41 @@
+ 		dest = get_target_file (src, dest_dir, same_fs);
+ 	}
+ 
++
++	/* Don't allow recursive move/copy into itself.  
++         * (We would get a file system error if we proceeded but it is nicer to 
++         * detect and report it at this level) */
++	if (g_file_struct_contains (dest_dir, src)) {
++		if (job->skip_all_error) {
++			g_error_free (error);
++			goto out;
++		}
++		
++		/*  the run_warning() frees all strings passed in automatically  */
++		primary = copy_job->is_move ? g_strdup (_("You cannot move a folder into itself."))
++					    : g_strdup (_("You cannot copy a folder into itself."));
++		secondary = g_strdup (_("The destination folder is inside the source folder."));
++		
++		response = run_warning (job,
++					primary,
++					secondary,
++					NULL,
++					GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
++					NULL);
++
++		if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
++			abort_job (job);
++		} else if (response == 1) { /* skip all */
++			job->skip_all_error = TRUE;
++		} else if (response == 2) { /* skip */
++			/* do nothing */
++		} else {
++			g_assert_not_reached ();
++		}
++
++		goto out;
++	}
++	
+  retry:
+ 	
+ 	error = NULL;
+@@ -3791,6 +3844,41 @@
+ 	
+ 	dest = get_target_file (src, dest_dir, same_fs);
+ 
++
++	/* Don't allow recursive move/copy into itself.  
++         * (We would get a file system error if we proceeded but it is nicer to 
++         * detect and report it at this level) */
++	if (g_file_struct_contains (dest_dir, src)) {
++		if (job->skip_all_error) {
++			g_error_free (error);
++			goto out;
++		}
++		
++		/*  the run_warning() frees all strings passed in automatically  */
++		primary = move_job->is_move ? g_strdup (_("You cannot move a folder into itself."))
++					    : g_strdup (_("You cannot copy a folder into itself."));
++		secondary = g_strdup (_("The destination folder is inside the source folder."));
++		
++		response = run_warning (job,
++					primary,
++					secondary,
++					NULL,
++					GTK_STOCK_CANCEL, SKIP_ALL, SKIP,
++					NULL);
++		
++		if (response == 0 || response == GTK_RESPONSE_DELETE_EVENT) {
++			abort_job (job);
++		} else if (response == 1) { /* skip all */
++			job->skip_all_error = TRUE;
++		} else if (response == 2) { /* skip */
++			/* do nothing */
++		} else {
++			g_assert_not_reached ();
++		}
++
++		goto out;
++	}
++
+  retry:
+ 	
+ 	flags = G_FILE_COPY_NOFOLLOW_SYMLINKS | G_FILE_COPY_NO_FALLBACK_FOR_MOVE;
diff --git a/gnome-base/nautilus/nautilus-2.22.3-r1.ebuild b/gnome-base/nautilus/nautilus-2.22.3-r1.ebuild
new file mode 100644
index 000000000000..bf7a278cece4
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-2.22.3-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.22.3-r1.ebuild,v 1.1 2008/06/29 22:34:34 eva Exp $
+
+inherit virtualx eutils gnome2
+
+DESCRIPTION="A file manager for the GNOME desktop"
+HOMEPAGE="http://www.gnome.org/projects/nautilus/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="beagle gnome tracker"
+
+RDEPEND=">=x11-libs/startup-notification-0.8
+		 >=gnome-base/libbonobo-2.1
+		 >=gnome-base/eel-2.21.90
+		 >=dev-libs/glib-2.15.6
+		 >=gnome-base/gnome-desktop-2.10
+		 >=gnome-base/orbit-2.4
+		 >=x11-libs/pango-1.1.2
+		 >=x11-libs/gtk+-2.11.6
+		 >=gnome-base/librsvg-2.0.1
+		 >=dev-libs/libxml2-2.4.7
+		 >=media-libs/libexif-0.5.12
+		 >=gnome-base/gconf-2.0
+		 >=gnome-base/gvfs-0.1.2
+		 beagle? ( || (
+			dev-libs/libbeagle
+			=app-misc/beagle-0.2*
+			) )
+		 tracker? ( >=app-misc/tracker-0.6.4 )
+		 >=gnome-base/libgnome-2.14
+		 >=gnome-base/libgnomeui-2.6"
+DEPEND="${RDEPEND}
+		  sys-devel/gettext
+		>=dev-util/pkgconfig-0.9
+		>=dev-util/intltool-0.35"
+PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
+
+pkg_setup() {
+	G2CONF="--disable-update-mimedb $(use_enable beagle) $(use_enable tracker)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# bug #229719, #229723, #216391
+	epatch "${FILESDIR}/${P}-open-folder.patch"
+	epatch "${FILESDIR}/${P}-prevent-recursive-mvcp.patch"
+	epatch "${FILESDIR}/${P}-preserve-metadata.patch"
+}
+
+src_test() {
+	addwrite "/root/.gnome2_private"
+	unset SESSION_MANAGER
+	Xemake check || die "Test phase failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "nautilus can use gstreamer to preview audio files. Just make sure"
+	elog "to have the necessary plugins available to play the media type you"
+	elog "want to preview"
+}