Added patch to optionally remove volumes from the Nautilus desktop. See bug #51343

5 files changed, 232 insertions, 1 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 7659c2e0dd93..ae83ab6536c4 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.100 2004/08/08 00:59:28 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.101 2004/08/09 17:19:46 obz Exp $
+
+*nautilus-2.6.3-r1 (10 Aug 2004)
+
+  10 Aug 2004; Mike Gardiner <obz@gentoo.org>
+  +files/nautilus-2.6.3-novolumes.patch, +nautilus-2.6.3-r1.ebuild:
+  Added patch to optionally remove volumes from the Nautilus desktop. See bug
+  #51343
 
   07 Aug 2004; Travis Tilley <lv@gentoo.org> nautilus-2.6.3.ebuild:
   stable on amd64
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 06c7d54aef30..0078d854f7cd 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -2,7 +2,9 @@ MD5 b8d45fc2d85bc53c68b5c8fb944e9dea nautilus-2.6.1.ebuild 2378
 MD5 25748649082d7619cb484b4d14d835cc nautilus-2.4.2.ebuild 2096
 MD5 4ac7677bad74a39b82989b7a36294a38 nautilus-1.0.6-r9.ebuild 3409
 MD5 3feef5a83f090551bca655bd45ec4b4c nautilus-2.6.3.ebuild 2742
+MD5 59dec36048bcbe9ea305e27f72e3cd74 .nautilus-2.6.3-r1.ebuild.swp 12288
 MD5 a2fc18155a98434b836db34321f56dde nautilus-2.6.0.ebuild 2374
+MD5 df5f41317131e48a7f727e64abd8d7be nautilus-2.6.3-r1.ebuild 2785
 MD5 2cfa67f25a12333cc373b6a491253620 ChangeLog 13469
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 dbfcca25a47c67d13020371a1acbff7a files/nautilus-2-thumbnail_max_size.patch 1444
@@ -11,12 +13,14 @@ MD5 4792b2819e2384304f5a63008db5b9f6 files/nautilus-2-icon_view_gst_audio_previe
 MD5 65769439a2d335132210b34a49905531 files/nautilus-2.4-startup-bonobo.patch 677
 MD5 4970e67a919b0043dcd12623014a9aac files/nautilus-2.6-icon_view_gst_audio_preview.patch 8284
 MD5 3a7c7847c496aaa4230e7191aeb39c9a files/nautilus-2-snap_to_grid-r1.patch 37548
+MD5 eacb36058242d4b79c6b36a12133823b files/digest-nautilus-2.6.3-r1 68
 MD5 63d8d3d2f44b839065888ee8338f5f46 files/nautilus-2-disable-cdda.patch 314
 MD5 4c62404b0162ab39572cb522fed222c4 files/nautilus-1.0.6-hyperbola.diff 1632
 MD5 47ad4a802bbd17967708599cda1b7aaf files/nautilus-1.0.6-mozilla-1.0_rc1.diff 920
 MD5 3db7f854e279f4032b8d1e86d64157aa files/digest-nautilus-1.0.6-r9 68
 MD5 d7ad0d83dbafefa25a34a50e2ee34806 files/nautilus-1.0.6-mozilla-1.0_rc3.diff 1709
 MD5 82c26fdedf3faa3e09f91cf43035a4db files/nautilus-2.4-remove_deprecation_flags.patch 1162
+MD5 65b7efad740c9746ecb13c770e1ad52d files/nautilus-2.6.3-novolumes.patch 4607
 MD5 c861bf86a79aeaaa7c642b216769a087 files/digest-nautilus-2.4.2 68
 MD5 9a42848d2be57a20167878a2996c5ec5 files/digest-nautilus-2.6.0 68
 MD5 404b6778dc9a6be0f00f197099fe2870 files/digest-nautilus-2.6.1 68
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.6.3-r1 b/gnome-base/nautilus/files/digest-nautilus-2.6.3-r1
new file mode 100644
index 000000000000..fa2cbf3c2fb0
--- /dev/null
+++ b/gnome-base/nautilus/files/digest-nautilus-2.6.3-r1
@@ -0,0 +1 @@
+MD5 ef91c7eefd219800a3aab93e6510a5c9 nautilus-2.6.3.tar.bz2 5665374
diff --git a/gnome-base/nautilus/files/nautilus-2.6.3-novolumes.patch b/gnome-base/nautilus/files/nautilus-2.6.3-novolumes.patch
new file mode 100644
index 000000000000..dab18d295562
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.6.3-novolumes.patch
@@ -0,0 +1,122 @@
+--- libnautilus-private/apps_nautilus_preferences.schemas.in	20 Feb 2004 10:33:46 -0000
++++ libnautilus-private/apps_nautilus_preferences.schemas.in	6 May 2004 06:37:07 -0000
+@@ -808,6 +808,21 @@
+     </schema>
+ 
+     <schema>
++      <key>/schemas/apps/nautilus/desktop/volumes_visible</key>
++      <applyto>/apps/nautilus/desktop/volumes_visible</applyto>
++      <owner>nautilus</owner>
++      <type>bool</type>
++      <default>true</default>
++      <locale name="C">
++      	<short>Show mounted volumes on the desktop</short>
++	<long>
++	  If this is set to true, icons linking to mounted
++	  volumes will be put on the desktop.
++	</long>
++      </locale>
++    </schema>
++
++    <schema>
+       <key>/schemas/apps/nautilus/desktop/home_icon_name</key>
+       <applyto>/apps/nautilus/desktop/home_icon_name</applyto>
+       <owner>nautilus</owner>
+
+--- libnautilus-private/nautilus-desktop-link-monitor.c	12 Dec 2003 19:07:17 -0000	1.9
++++ libnautilus-private/nautilus-desktop-link-monitor.c	6 May 2004 06:37:08 -0000
+@@ -116,13 +116,18 @@ create_volume_link (NautilusDesktopLinkM
+ 		    GnomeVFSVolume *volume)
+ {
+ 	NautilusDesktopLink *link;
+-	
++
++	link = NULL;
++
+ 	if (!gnome_vfs_volume_is_user_visible (volume)) {
+ 		return;
+ 	}
+ 
+-	link = nautilus_desktop_link_new_from_volume (volume);
+-	monitor->details->volume_links = g_list_prepend (monitor->details->volume_links, link);
++	if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_DESKTOP_VOLUMES_VISIBLE)) {
++		link = nautilus_desktop_link_new_from_volume (volume);
++		monitor->details->volume_links = g_list_prepend (monitor->details->volume_links, link);
++	}
++	
+ }
+ 
+ 
+@@ -221,6 +226,30 @@ desktop_trash_visible_changed (gpointer 
+ }
+ 
+ static void
++desktop_volumes_visible_changed (gpointer callback_data)
++{
++	GnomeVFSVolumeMonitor *volume_monitor;
++	NautilusDesktopLinkMonitor *monitor;
++	GList *l, *volumes;
++	
++	volume_monitor = gnome_vfs_get_volume_monitor ();
++	monitor = NAUTILUS_DESKTOP_LINK_MONITOR (callback_data);
++
++	if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_DESKTOP_VOLUMES_VISIBLE) && monitor->details->volume_links == NULL) {
++		volumes = gnome_vfs_volume_monitor_get_mounted_volumes (volume_monitor);
++		for (l = volumes; l != NULL; l = l->next) {
++			create_volume_link (monitor, l->data);
++			gnome_vfs_volume_unref (l->data);
++		}
++		g_list_free (volumes);
++	} else {
++		g_list_foreach (monitor->details->volume_links, (GFunc)g_object_unref, NULL);
++		g_list_free (monitor->details->volume_links);
++		monitor->details->volume_links = NULL;
++	}
++}
++
++static void
+ nautilus_desktop_link_monitor_init (gpointer object, gpointer klass)
+ {
+ 	NautilusDesktopLinkMonitor *monitor;
+@@ -248,6 +277,7 @@ nautilus_desktop_link_monitor_init (gpoi
+ 	}
+ 
+ 	volume_monitor = gnome_vfs_get_volume_monitor ();
++	
+ 	volumes = gnome_vfs_volume_monitor_get_mounted_volumes (volume_monitor);
+ 	for (l = volumes; l != NULL; l = l->next) {
+ 		volume = l->data;
+@@ -265,8 +295,10 @@ nautilus_desktop_link_monitor_init (gpoi
+ 	eel_preferences_add_callback (NAUTILUS_PREFERENCES_DESKTOP_TRASH_VISIBLE,
+ 				      desktop_trash_visible_changed,
+ 				      monitor);
++	eel_preferences_add_callback (NAUTILUS_PREFERENCES_DESKTOP_VOLUMES_VISIBLE,
++				      desktop_volumes_visible_changed,
++				      monitor);
+ 
+-	
+ 	monitor->details->mount_id = g_signal_connect_object (volume_monitor, "volume_mounted",
+ 							      G_CALLBACK (volume_mounted_callback), monitor, 0);
+ 	monitor->details->unmount_id = g_signal_connect_object (volume_monitor, "volume_unmounted",
+@@ -311,6 +343,9 @@ desktop_link_monitor_finalize (GObject *
+ 					 monitor);
+ 	eel_preferences_remove_callback (NAUTILUS_PREFERENCES_DESKTOP_TRASH_VISIBLE,
+ 					 desktop_trash_visible_changed,
++					 monitor);
++	eel_preferences_remove_callback (NAUTILUS_PREFERENCES_DESKTOP_VOLUMES_VISIBLE,
++					 desktop_volumes_visible_changed,
+ 					 monitor);
+ 
+ 	if (monitor->details->mount_id != 0) {
+
+--- libnautilus-private/nautilus-global-preferences.h	20 Feb 2004 10:33:49 -0000	1.122
++++ libnautilus-private/nautilus-global-preferences.h	6 May 2004 06:37:08 -0000
+@@ -177,6 +177,7 @@ typedef enum
+ #define NAUTILUS_PREFERENCES_DESKTOP_COMPUTER_NAME         "desktop/computer_icon_name"
+ #define NAUTILUS_PREFERENCES_DESKTOP_TRASH_VISIBLE         "desktop/trash_icon_visible"
+ #define NAUTILUS_PREFERENCES_DESKTOP_TRASH_NAME            "desktop/trash_icon_name"
++#define NAUTILUS_PREFERENCES_DESKTOP_VOLUMES_VISIBLE	   "desktop/volumes_visible"
+ 
+ void nautilus_global_preferences_init                      (void);
+ void nautilus_global_preferences_init_with_folder_browsing (void);
+
diff --git a/gnome-base/nautilus/nautilus-2.6.3-r1.ebuild b/gnome-base/nautilus/nautilus-2.6.3-r1.ebuild
new file mode 100644
index 000000000000..69a9cd883578
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-2.6.3-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.6.3-r1.ebuild,v 1.1 2004/08/09 17:19:47 obz Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="A filemanager for the Gnome2 desktop"
+HOMEPAGE="http://www.gnome.org/projects/nautilus/"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
+IUSE="oggvorbis cups gstreamer mad"
+# 
+# eel was not updated the last run, return eel to the following the next bump:
+# =gnome-base/eel-${PV}*
+RDEPEND=">=dev-libs/glib-2.3
+	>=x11-libs/pango-1.2
+	>=x11-libs/gtk+-2.3
+	>=dev-libs/libxml2-2.4.7
+	=gnome-base/eel-2.6.2*
+	>=gnome-base/gnome-vfs-2.5.1
+	>=media-sound/esound-0.2.27
+	>=gnome-base/gconf-2
+	>=gnome-base/libgnome-2.6
+	>=gnome-base/libgnomeui-2.6
+	>=gnome-base/gnome-desktop-2.2
+	>=media-libs/libart_lgpl-2.3.10
+	>=gnome-base/libbonobo-2.2
+	>=gnome-base/libbonoboui-2.2
+	>=gnome-base/librsvg-2.0.1
+	>=gnome-base/ORBit2-2.4
+	>=x11-libs/startup-notification-0.5
+	dev-libs/popt
+	app-admin/fam
+	sys-apps/eject
+	cups? ( net-print/libgnomecups
+		net-print/gnome-cups-manager )
+	!gstreamer? ( oggvorbis? ( media-sound/vorbis-tools ) )
+	gstreamer? (
+		>=media-libs/gstreamer-0.8
+		>=media-libs/gst-plugins-0.8
+		mad? ( >=media-plugins/gst-plugins-mad-0.8 )
+		oggvorbis? (
+			>=media-plugins/gst-plugins-ogg-0.8
+			>=media-plugins/gst-plugins-vorbis-0.8
+		)
+	)"
+# Add this once its tested by various other arches, bug #56703 
+#		flac? (	>=media-plugins/gst-plugins-flac-0.8 )
+# FIXME : what to do with exif/jpeg config stuff ?
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.29
+	>=app-text/scrollkeeper-0.3.11
+	>=dev-util/pkgconfig-0.12.0"
+
+PDEPEND=">=x11-themes/gnome-icon-theme-1.1.91
+	x11-themes/gnome-themes"
+
+DOCS="AUTHORS COPYIN* ChangeLo* HACKING INSTALL MAINTAINERS NEWS README THANKS TODO"
+
+G2CONF="${G2CONF} $(use_enable gstreamer)"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# use gstreamer for audio preview (patch by <foser@gentoo.org>)
+	use gstreamer && epatch ${FILESDIR}/${PN}-2.6-icon_view_gst_audio_preview.patch
+	# add libgnomeprint support
+	use cups && epatch ${FILESDIR}/${PN}-2-x-printers.patch
+
+	# regenerating only needed with patching
+	if use cups || use gstreamer; then
+		WANT_AUTOCONF_2_5=1 autoheader || die
+		WANT_AUTOCONF_2_5=1 autoconf || die
+		WANT_AUTOMAKE=1.4 automake || die
+	fi
+
+	# applying patch to optionally remove volumes from the desktop,
+	# see bug #51343 <obz@gentoo.org>
+	epatch ${FILESDIR}/${P}-novolumes.patch
+
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+
+	einfo "Nautilus moved to a new spatial browsing model."
+	einfo "If you are unhappy with this behaviour you can revert to the"
+	einfo "old browerslike behaviour by issueing the following command :"
+	einfo "gconftool-2  -s /apps/nautilus/preferences/always_use_browser -t bool TRUE"
+
+}