Added a patch to fix desktop icon positions. Fixes bug #154766.

(Portage version: 2.1.2_rc1-r6)

4 files changed, 109 insertions, 1 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index a80e50caa396..dfa91074aada 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.201 2006/11/07 20:04:36 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.202 2006/11/14 19:31:45 metalgod Exp $
+
+*nautilus-2.16.2-r1 (14 Nov 2006)
+
+  14 Nov 2006; Luis Medinas <metalgod@gentoo.org>
+  +files/nautilus-2.16.2-desktop-icon-position.patch,
+  +nautilus-2.16.2-r1.ebuild:
+  Added a patch to fix desktop icon positions. Fixes bug #154766.
 
 *nautilus-2.16.2 (07 Nov 2006)
 
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.16.2-r1 b/gnome-base/nautilus/files/digest-nautilus-2.16.2-r1
new file mode 100644
index 000000000000..c6f9b825ef46
--- /dev/null
+++ b/gnome-base/nautilus/files/digest-nautilus-2.16.2-r1
@@ -0,0 +1,3 @@
+MD5 d6354ad96efcd0f89ed4c13ad940d5f5 nautilus-2.16.2.tar.bz2 4266971
+RMD160 db9e392aa9357f85e44bb03052ecf38f6c87f46d nautilus-2.16.2.tar.bz2 4266971
+SHA256 6306fe9ee0371da309a870627a94fba88c3848a5fa83b863d28688ed57d9ba11 nautilus-2.16.2.tar.bz2 4266971
diff --git a/gnome-base/nautilus/files/nautilus-2.16.2-desktop-icon-position.patch b/gnome-base/nautilus/files/nautilus-2.16.2-desktop-icon-position.patch
new file mode 100644
index 000000000000..935864c5d13a
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.16.2-desktop-icon-position.patch
@@ -0,0 +1,25 @@
+--- src/file-manager/fm-icon-view.c.orig	2006-11-14 16:35:04.304162544 +0000
++++ src/file-manager/fm-icon-view.c	2006-11-14 16:51:02.820445920 +0000
+@@ -531,12 +531,20 @@
+ file_has_lazy_position (FMDirectoryView *view,
+ 			NautilusFile *file)
+ {
++	gboolean lazy_position;
++
+ 	/* For volumes (i.e. cdrom icon) we use lazy positioning so that when
+ 	 * an old cdrom gets re-mounted in a place that now has another
+ 	 * icon we don't overlap that one.
+ 	 */
+-
+-	return NAUTILUS_IS_DESKTOP_ICON_FILE (file);
++	lazy_position = nautilus_file_has_volume (file);
++	if (lazy_position && fm_directory_view_get_loading (view)) {
++		/* if volumes are loaded during directory load, don't mark them
++		 * as lazy. This is wrong for files that were mounted during user
++		 * log-off, but it is right for files that were mounted during login. */
++		lazy_position = FALSE;
++	}
++	return lazy_position;
+ }
+ 
+ static void
diff --git a/gnome-base/nautilus/nautilus-2.16.2-r1.ebuild b/gnome-base/nautilus/nautilus-2.16.2-r1.ebuild
new file mode 100644
index 000000000000..d93f2e96440c
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-2.16.2-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.16.2-r1.ebuild,v 1.1 2006/11/14 19:31:45 metalgod Exp $
+
+inherit virtualx gnome2 eutils
+
+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"
+IUSE="beagle gnome"
+# cups flac gstreamer mad ogg vorbis
+
+RDEPEND=">=media-libs/libart_lgpl-2.3.10
+	>=gnome-base/libbonobo-2.1
+	>=gnome-base/eel-2.15.92
+	>=media-sound/esound-0.2.27
+	>=dev-libs/glib-2.6
+	>=gnome-base/gnome-desktop-2.9.91
+	>=gnome-base/libgnome-2.1.1
+	>=gnome-base/libgnomeui-2.6
+	>=gnome-base/gnome-vfs-2.15
+	>=gnome-base/orbit-2.4
+	>=x11-libs/pango-1.1.2
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/librsvg-2.0.1
+	>=dev-libs/libxml2-2.4.7
+	>=x11-libs/startup-notification-0.8
+	>=media-libs/libexif-0.5.12
+	>=gnome-base/gconf-2
+	beagle? ( >=app-misc/beagle-0.0.12 )
+	x11-libs/libICE
+	x11-libs/libSM
+	virtual/eject"
+#	!gstreamer? ( vorbis? ( media-sound/vorbis-tools ) )
+#	gstreamer? (
+#		>=media-libs/gstreamer-0.8
+#		>=media-libs/gst-plugins-0.8
+#		>=media-plugins/gst-plugins-gnomevfs-0.8
+#		mad? ( >=media-plugins/gst-plugins-mad-0.8 )
+#		ogg? ( >=media-plugins/gst-plugins-ogg-0.8 )
+#		vorbis? ( >=media-plugins/gst-plugins-vorbis-0.8 )
+#		flac? (	>=media-plugins/gst-plugins-flac-0.8 ) )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9"
+
+PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-update-mimedb $(use_enable beagle)"
+}
+
+src_test() {
+	if hasq userpriv $FEATURES ; then
+		Xmake check || die "Test phase failed"
+	fi
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# fix relative include path breaking libIDL (#129366)
+	epatch ${FILESDIR}/${PN}-2.16.0-idl_include.patch
+	# fix desktop icon position bug Gnome (#373895) Gentoo (#154766)
+	epatch ${FILESDIR}/${P}-desktop-icon-position.patch
+}