Add patch to prevent nautilus from flipping out when not managing the desktop. Fixes bug 266398

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 48 insertions, 4 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index df88c9133431..f387fb4f8352 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.307 2009/05/11 17:29:15 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.308 2009/05/14 11:15:29 nirbheek Exp $
+
+*nautilus-2.26.2-r1 (14 May 2009)
+
+  14 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -nautilus-2.26.2.ebuild, +nautilus-2.26.2-r1.ebuild,
+  +files/nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch:
+  Add patch to prevent nautilus from flipping out when not managing the
+  desktop. Fixes bug 266398
 
   11 May 2009; Brent Baude <ranger@gentoo.org> nautilus-2.24.2-r3.ebuild:
   stable ppc64, bug 269186
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 4617aa18763a..b54ba4f505ef 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -2,10 +2,11 @@ AUX nautilus-2.24.2-filechooser-icon.patch 1630 RMD160 8f7fc892670a5b85f0a176bff
 AUX nautilus-2.24.2-playlist-preview.patch 1036 RMD160 16e9a0239f1f162cb9683cf08f0d9e1b2c46230f SHA1 31ddf4cb3a1eb940aebedbbed9b4822759d361f5 SHA256 cddf52194fc6ae542dbb58b047fd5b65f20eb874f0468ec448b35ec0a6bd498a
 AUX nautilus-2.24.2-scrollbars.patch 732 RMD160 6856d895ec70d6e24f3bd3f112141dceb25eb896 SHA1 62570bad726066dd0238aee0a203fa3895f3a556 SHA256 93f5dacec1a88fbbdb32fe75fde52301053f5c29aadb483ad1d59fb7c107b344
 AUX nautilus-2.24.2-thumbnail-scaling.patch 2597 RMD160 b82748147f709118b060224a0458f16f74d7ddd9 SHA1 eb22ebc617d615832c943f2b24811ae08cb88304 SHA256 7948ae9ef56bf8c6e9d296ba741472fe8ad6faae8adb8f98e96b4002c3302f42
+AUX nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch 1421 RMD160 e4d745be6f938f5390fba74db0645534f60d9207 SHA1 21906f957df5b2f93ab6b34223405dd5f594b12e SHA256 687040243006b5698ec062305cb26bf5cd80c9ce1b8bc67f3025af134d3a242a
 DIST nautilus-2.24.2.tar.bz2 5356516 RMD160 a0159b7a6814a731bdbbcee33f4c6aafaee4c8ef SHA1 9bc2cf110ae50d69633095aa8115cf89c095ef42 SHA256 a793ebe4245656f0ae23d5a87895555182f62943e02e9667303ad20c4e690c1d
 DIST nautilus-2.26.2.tar.bz2 5913284 RMD160 89e64013e3d2645677e2fda191b204b0ee43a011 SHA1 db49ea2ff358b7af857257f4f085b03b517d7b3f SHA256 c88a041667acb9085b7874acc6c6997317cc830d25d4d8c4b771e4cc4df15294
 EBUILD nautilus-2.24.2-r3.ebuild 2198 RMD160 d350730e43082d1ac33cc39d49aaa247feccbb1a SHA1 e96fac1e2bbf0106108a0b688ea6bca8079934e2 SHA256 6ebfee8a2f9f111fb27b4be0378a617bd73cd1d9e4f90f9e0bef4399bb1913a3
 EBUILD nautilus-2.24.2.ebuild 1776 RMD160 c01488268f792bf706b3505851a620fe24876fdd SHA1 6337fe82bc4c0a6c8f8062daeafa8855f6c13ba2 SHA256 c0b102342004268ea65486007abc67c9738c784e7b8e5426960e07f2e8ae61c8
-EBUILD nautilus-2.26.2.ebuild 2311 RMD160 641305083a8f05473ddcaecb8fec6609081aa35e SHA1 72a2a8c07bd3f2d9a6e86257358d7d0f6ae13d07 SHA256 f35d552054a8ff02c6cb43353c8120847f9e76ffe2a8b73d8496a1152c6ec3be
-MISC ChangeLog 44111 RMD160 b1631f0a8c640098319e1b0616697575fa0332c4 SHA1 72704654b43eccd9e0f262884e70fd925a1bcc7a SHA256 f9a9d8b49559c85cb63eb3a4aca55e9060e6358cb32c38e68aed20170dc5149a
+EBUILD nautilus-2.26.2-r1.ebuild 2393 RMD160 3d1140ef15067973e50483481be41a16958759af SHA1 e5106e813562d974bcee3083c112f95b8a9d68d5 SHA256 07fc4107c00d53f6609ce08675a62372defdc40f6ff92b45485b9494684c3859
+MISC ChangeLog 44430 RMD160 12ee384930182f72b6311b1e17bc79323b846f28 SHA1 10501a84b12061c4ec7b83600fd361d3e71b7528 SHA256 d3390917060f91eeb2832b274c211c1723c2ccff411fc95e940103da94bf144b
 MISC metadata.xml 473 RMD160 d06a14b541ddb9774c9d81895146a14557c196fd SHA1 99497b8bede2582b76a802d7c3f75adbad6fc9a0 SHA256 8e0fbacc02474a585de7d90b28041754ae260c032ef32952ed5da3e0cc377dfc
diff --git a/gnome-base/nautilus/files/nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch b/gnome-base/nautilus/files/nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch
new file mode 100644
index 000000000000..d6ca6eb97227
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch
@@ -0,0 +1,33 @@
+Gentoo bug 266398
+GNOME #580793 and #571417
+
+Index: nautilus-2.26.2/src/nautilus-main.c
+===================================================================
+--- nautilus-2.26.2.orig/src/nautilus-main.c	2009-04-29 17:02:32.709364982 +0200
++++ nautilus-2.26.2/src/nautilus-main.c	2009-04-29 17:39:36.529860872 +0200
+@@ -391,9 +391,6 @@ main (int argc, char *argv[])
+ 	browser_window = FALSE;
+ 
+ 	g_set_prgname ("nautilus");
+-	if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) {
+-		egg_set_desktop_file (DATADIR "/applications/nautilus.desktop");
+-	}
+ 
+ 	context = g_option_context_new (_("\n\nBrowse the file system with the file manager"));
+ 	g_option_context_add_main_entries (context, options, NULL);
+@@ -464,6 +461,15 @@ main (int argc, char *argv[])
+ 			(NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR, TRUE);
+ 	}
+ 
++	/* Which .desktop file contains the relevant session management
++	   information? */
++	if ((no_desktop || !eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_DESKTOP))
++	    && g_file_test (DATADIR "/applications/nautilus-home.desktop", G_FILE_TEST_EXISTS)) {
++		egg_set_desktop_file (DATADIR "/applications/nautilus-home.desktop");
++	} else if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) {
++		egg_set_desktop_file (DATADIR "/applications/nautilus.desktop");
++	}
++
+ 	application = NULL;
+ 
+ 	/* Do either the self-check or the real work. */
diff --git a/gnome-base/nautilus/nautilus-2.26.2.ebuild b/gnome-base/nautilus/nautilus-2.26.2-r1.ebuild
index b72c02ef3c55..dfafc81ba11a 100644
--- a/gnome-base/nautilus/nautilus-2.26.2.ebuild
+++ b/gnome-base/nautilus/nautilus-2.26.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.26.2.ebuild,v 1.1 2009/05/10 20:49:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.26.2-r1.ebuild,v 1.1 2009/05/14 11:15:29 nirbheek Exp $
 
 EAPI="2"
 
@@ -71,6 +71,8 @@ src_prepare() {
 
 	# Fix intltoolize broken file, see upstream #577133
 	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+
+	epatch "${FILESDIR}/${P}-change-reg-desktop-file-with-no-desktop.patch"
 }
 
 src_test() {