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

Package-Manager: portage-2.1.2_rc1-r6

5 files changed, 127 insertions, 8 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/Manifest b/gnome-base/nautilus/Manifest
index 2fea8159d2ff..b4332bfd169e 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -45,6 +45,10 @@ AUX nautilus-2.16.0-idl_include.patch 575 RMD160 8ee41c84f597683e2d34eea5acdb43f
 MD5 c496549444ef2727f6c0555b590ef4fe files/nautilus-2.16.0-idl_include.patch 575
 RMD160 8ee41c84f597683e2d34eea5acdb43f5592d3262 files/nautilus-2.16.0-idl_include.patch 575
 SHA256 07cd75e4cf1c34c5fcd3f4d2257ae1d9c578cb2c2f014e69280e511de28862f0 files/nautilus-2.16.0-idl_include.patch 575
+AUX nautilus-2.16.2-desktop-icon-position.patch 902 RMD160 16b9a019f89535f659ee14f4c9498aaed9f34f6f SHA1 48799304e8e2abafd4c2cc709557c7787218618c SHA256 6068a3fce125cf509753c5be16c3b22ebfd19f5afaba1121b03c51ffdc717de6
+MD5 d502695e15c21e2389b4a6d34c6de286 files/nautilus-2.16.2-desktop-icon-position.patch 902
+RMD160 16b9a019f89535f659ee14f4c9498aaed9f34f6f files/nautilus-2.16.2-desktop-icon-position.patch 902
+SHA256 6068a3fce125cf509753c5be16c3b22ebfd19f5afaba1121b03c51ffdc717de6 files/nautilus-2.16.2-desktop-icon-position.patch 902
 AUX nautilus-2.9.90-icon_view_gst.patch 8136 RMD160 adc024c514ce2dd2af2962caa8941fce250ab2b1 SHA1 ca768f9ba16908d487abbdbc941082a58a528ed9 SHA256 b6e7eef6e3ff11a9e3490e371ec06a9cd24b9251b7cad7262204071ff67a8a31
 MD5 76cc1af40c4dc75ce99179ae9b25a2cd files/nautilus-2.9.90-icon_view_gst.patch 8136
 RMD160 adc024c514ce2dd2af2962caa8941fce250ab2b1 files/nautilus-2.9.90-icon_view_gst.patch 8136
@@ -80,14 +84,18 @@ EBUILD nautilus-2.16.1.ebuild 2017 RMD160 8ba20c4ac9a9916c01a14b6cc91e62d6ef072a
 MD5 0ee9164e780891a9b01b443d16e4d6e0 nautilus-2.16.1.ebuild 2017
 RMD160 8ba20c4ac9a9916c01a14b6cc91e62d6ef072a37 nautilus-2.16.1.ebuild 2017
 SHA256 6d3ca1781ad178c8d3603c20092828876c1166e35a6b6217a30bb6b4bdd4c946 nautilus-2.16.1.ebuild 2017
+EBUILD nautilus-2.16.2-r1.ebuild 2141 RMD160 492af117e5ab23a1edf929ff206fbc06a93a3a98 SHA1 0c36e7b440d69b43cde164ea301036ab0c0f55fd SHA256 72c945fe736aef49f46bffa151fa1248d7195aa8d3022750c728defc52b1d6bf
+MD5 3434de2e33bb77f74a6711b794c66034 nautilus-2.16.2-r1.ebuild 2141
+RMD160 492af117e5ab23a1edf929ff206fbc06a93a3a98 nautilus-2.16.2-r1.ebuild 2141
+SHA256 72c945fe736aef49f46bffa151fa1248d7195aa8d3022750c728defc52b1d6bf nautilus-2.16.2-r1.ebuild 2141
 EBUILD nautilus-2.16.2.ebuild 2019 RMD160 33ec47f5bd60cfde38890acad4564d6928c7f10f SHA1 d1c079f674ac87e5a3b086ab0a0d49d81f375dfa SHA256 761af93869a2a9b0b62fabeca36bb862a02ca20969edb4c11fd0e5446826260b
 MD5 532cf360c889c245ccac555d255c3e49 nautilus-2.16.2.ebuild 2019
 RMD160 33ec47f5bd60cfde38890acad4564d6928c7f10f nautilus-2.16.2.ebuild 2019
 SHA256 761af93869a2a9b0b62fabeca36bb862a02ca20969edb4c11fd0e5446826260b nautilus-2.16.2.ebuild 2019
-MISC ChangeLog 26832 RMD160 b60d225c13f01caf5e5f01989feeb4f6f1faa33e SHA1 6c905a9eab8132e7d30140aac88dd05041d3ae16 SHA256 402b0c631ee1b0cdb6d73ca34cbc6ef5a34c8235be2a67f650900082d42e1d7d
-MD5 760de7922a3e87ee2ea947af412ad908 ChangeLog 26832
-RMD160 b60d225c13f01caf5e5f01989feeb4f6f1faa33e ChangeLog 26832
-SHA256 402b0c631ee1b0cdb6d73ca34cbc6ef5a34c8235be2a67f650900082d42e1d7d ChangeLog 26832
+MISC ChangeLog 27068 RMD160 a439a304fabeb43aa4f7bf0f18f4e643c66cc391 SHA1 05bada3bee5ee91a0dfda6ef3452ae3c43b72876 SHA256 ca795e14eeb4faf485773478607148474ca51e459076dc3e71d1da68db3956b8
+MD5 33629182f2fdd9d4418d74b9b0f0359e ChangeLog 27068
+RMD160 a439a304fabeb43aa4f7bf0f18f4e643c66cc391 ChangeLog 27068
+SHA256 ca795e14eeb4faf485773478607148474ca51e459076dc3e71d1da68db3956b8 ChangeLog 27068
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -113,10 +121,13 @@ SHA256 dab5793faff426a9f24597616494d8c4362e6f94f2f621656f465d11bf06e210 files/di
 MD5 3803821dbfe023094f40d89f7aa2dcc6 files/digest-nautilus-2.16.2 253
 RMD160 4789bc87b36d1ca16489bde892d37e97eae0095b files/digest-nautilus-2.16.2 253
 SHA256 452b53217e9351b7b431a30aef5d74ad60ba687e11fb948a9fa0d07cdd005f39 files/digest-nautilus-2.16.2 253
+MD5 3803821dbfe023094f40d89f7aa2dcc6 files/digest-nautilus-2.16.2-r1 253
+RMD160 4789bc87b36d1ca16489bde892d37e97eae0095b files/digest-nautilus-2.16.2-r1 253
+SHA256 452b53217e9351b7b431a30aef5d74ad60ba687e11fb948a9fa0d07cdd005f39 files/digest-nautilus-2.16.2-r1 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFUObewUpWvClEHQoRAhiQAJ4/Wg8WrqPG/4bfMNFBUKVvnxqADACghIOD
-vrehmJbbWxxIKk3rkYlFhSs=
-=yi9e
+iD8DBQFFWie8wUpWvClEHQoRAoUhAKCECLxA5Ct3+Sq0uaOaYTNnvszSwQCgipED
+uAAAiRUuwlYtdGKCRVaJGGU=
+=QVk3
 -----END PGP SIGNATURE-----
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
+}