Apply multiple fixes from upstream, also fixing bug #535806 by Markus Goppelt.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 273 insertions, 6 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index f33584ebecce..d657dc35dbd2 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/nautilus
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.424 2014/12/22 21:36:54 eva Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.425 2015/01/27 11:21:18 pacho Exp $
+
+*nautilus-3.14.2-r1 (27 Jan 2015)
+
+  27 Jan 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/nautilus-3.14.2-active-slot.patch,
+  +files/nautilus-3.14.2-parse-force-desktop.patch,
+  +files/nautilus-3.14.2-unreadable-names.patch, +nautilus-3.14.2-r1.ebuild:
+  Apply multiple fixes from upstream, also fixing bug #535806 by Markus Goppelt.
 
 *nautilus-3.14.2 (22 Dec 2014)
 
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 1d050a249cdf..93167568ba7e 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,17 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX nautilus-3.14.2-active-slot.patch 1596 SHA256 984e726b661ad7a023d7ad8e3490040e3890fb4ef7f552ad40e5a2046fb0380f SHA512 bb629c8366cd3a0d2ee4432e46ee6062ddd316595e048f144cd86aba753cc65dbea20a6a47213677bff471d1089a27946982c0f2e580c652609daf902b6b1ced WHIRLPOOL 15fe38bf34d3343db8c48f0cafe5ba1a535a7736a5a8e54f675d83b8aad04f171cd25ce4dc36ca5b314e0f9755eefe8beee9be0e31a320aac92bfbc5fef6acef
+AUX nautilus-3.14.2-parse-force-desktop.patch 1592 SHA256 3478b6ec1b5dec9cc86c94d6eb5a79881103d008b1bc40e4edb39f5179d89a74 SHA512 584dba213ea3f06a8d277ecf6d2b3dd16231faf102d2d915b68817f57ac044661e90e72c5bcafb485e7f16609ef5db16a18942885f53fb6c24582af7809c7787 WHIRLPOOL 562ec2a4d7b3728cb67adfe0e1264f92db21b5a9fe2c04003bf03fa64b93f23361d2f4e0a983e7d42238959a02d5a36de39763730c16a8e07e46a227eca6dfe7
+AUX nautilus-3.14.2-unreadable-names.patch 993 SHA256 e6480b9fe9b8104c1cea3c962afdfa83ba5e5d80e2135a17deebbaa9814a9653 SHA512 10d90c912a4ffe98dc720f000d72be019f619539422bbbd2303cdc83c3f3f1bff0c97ea33108886f8ef99fb7f349aa70a87542aad13642d0831c0abfef349fd9 WHIRLPOOL 2f632024afa2512e5249653451099036fefc6a68f2190bd3355c2b14bbfffee83d2faff6e746ba3f850dae319822832c5f47765c7158efce8b4edbae508a4ca8
 AUX nautilus-3.5.91-delete.patch 1893 SHA256 3471db5c9f2caf4ae4877fe1c1e8a53bbf972aaacdf8cfbe091d8debd24f937a SHA512 807fb309cf217225396bfee5e60856245671a75058c95bd96dffe796e4c27c311aac603afba90c7660595611fe227de0951201e92e5e4da905b01c5ea3ca2460 WHIRLPOOL b6b8a1e69c4a4ec9ddfa437f611bea5711a41b8bc37c0f2701cc210063ec7eee93f92ccb9ca0b70ba5f7abc9fe128e44ad34582d077f4ebddce62e0222e9a025
 DIST nautilus-3.12.2.tar.xz 4975580 SHA256 969c2bedc324eab7b9399bdb3a7db61f819a2995c733349ded081b059a1cafb1 SHA512 59a80fef3cedff5393061aeead552eec80bbd920ae71b918bb21ca6fc59ba1c4e85c641885a12dde5208345b8659f9d4a6e1ddf865f4cb94afd5a3a339839c01 WHIRLPOOL cc9369b606ee4c6727aba89240a17ef007e26c1c5c6cc54a92cb83d098a51ac1424431462125ba56564cad9e26023c489ada96ff5e6037eaf49537b9e76e49fe
 DIST nautilus-3.14.2.tar.xz 3344428 SHA256 b2c9e13ba896a15101abf5d5fe30e291243e6030e0c84e8eb5df1e7bd90c10a5 SHA512 9d07878fc2474c7444fb7c573ce1886514b82ecb386365e608de81473184791daf17875b7ea471a7bef2c84df0d6d06b207223c7b5ec64d195e46865440ceff6 WHIRLPOOL c29af2fe684abeeffe58d6ba872b97b846db5d97cace8b73196fb77a024262f82df1908bac975b67938db9a12091dee681f1d827a551eb2610d11a6db2164495
 EBUILD nautilus-3.12.2.ebuild 3477 SHA256 c80a355b6bc5059699197a92076640be6c5d2cd9943cd26a94eab0bfdf9da797 SHA512 415783085f92a11e52c15dfd5c83d40402aded97a50a50dc96755787ee38a580beb69c63761ce46b505e702a3250b960838b63ea7e1698b1dc1161ebc950acef WHIRLPOOL 1d2b3524a9d1c74b2d1d2e69f624684d6a236ed7861f335b67c6f5d32acd4b642d1dc8557eb56dd2f323d8678fec5491a4626038c1a2b52bf2d3c269fc2e9fdb
+EBUILD nautilus-3.14.2-r1.ebuild 3847 SHA256 7222e7bf392ec9f05f2fb0d4d45435f68f536c2e66e4e1a2aed190853e19bc16 SHA512 f47dd70d47a5acdd6e45852edacd2034c1d48f66c057537f6e4fe51b070d343db60b05f9cd8e4ec81351764db2ec7fd3f08a07d3a2d13ca2b96a551e6b9b86a4 WHIRLPOOL bd6030a8f3411129c17a9b5fc586049a2821ff6e7513f8432c317aba1df8efadedc02ebced94d7b978a2d8283ca9fbced1c15c9e45ad8cb69f037da49e3e24c9
 EBUILD nautilus-3.14.2.ebuild 3479 SHA256 e56f2b69ac6f9bbc0f4709783c451b8ea409e72acfa6dbfae0d5f25f61851839 SHA512 d6938196ef580344e2e2b3440f8a9c0f4719cfac542f0dbab5abd105d1ca925f61bd7068e613823b0cc2fc8f14210da60004bdd35233a8839b7bdc9f56696bd1 WHIRLPOOL 87da8dae7e87609def41389f2131927e23841eb9897eabc28b9fc8905ac3d7967c738e0b25f292b65191852d5dd6a07ddad71adf52505ae7ef01afe0a966a5dd
-MISC ChangeLog 63995 SHA256 fb9f847b6c9248db59b4888f6a71eac8e0a2896ca14fb56a32dfb94ba58504ef SHA512 ca6bd5f01a5052a9dddb256eac8c6451045fbaf97c71ed0863666e194f20e33a240d1c1a6d0cc7118db360761598ca4f7d7b85bb13ec599630bf81786149ea2c WHIRLPOOL dfe2aceb013d22d431c956ca41a7f83fd492a3d614e108239641f3a34186fd0edcb85749ba2801c27659de25632516c75cd04e4768b812d67869202ea7e19289
+MISC ChangeLog 64333 SHA256 725273ec58ddc4dd3cd4da7edcfd960257940e2a2aab0e1fcac5e89b7b0fdb1b SHA512 e051abc9a4b9ff2dcabd0f410313b70f4e281b2fa7153cf1f8b44f4eed1e5bc5abc439620f882f5c0363ed7b4bcd0c439c2133f46e4483175fe01eb99062b85e WHIRLPOOL 1e691976ea93e2d288deb73a4f5abba16a08fe04c9fb551396e6726856b8097330539bfe222c8086a32df0a33105277d753a852d74e162f016a64b10aa218c4b
 MISC metadata.xml 566 SHA256 c278ed8fe54c80b07d7b2495826346538a7daaeea11dd9bdeff87ec0a30e74a1 SHA512 daefe3974dae1d708f909a2207f2d09128ab045f8aee11c823093da779e3f283c59459a0f4962631b1508dc545b6ab448c1ead519839011ddeb619f4017f802a WHIRLPOOL b662f3823904bc970b1a8bcd4ca863a7726eb89c76ef4c1d6954ba4b720f4d7490b4cfcf1d30b683a8ecf562d74977598db7b976ec4eea943e86aa07c4dde28b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSYjvcACgkQ1fmVwcYIWAZcFQCfRLgo7ym6XNBvrv/kfTVBYcGr
-7HsAn3hbcRhi1a5kwNNq1/ma0cm2jeAH
-=m38o
+iEYEAREIAAYFAlTHdLAACgkQCaWpQKGI+9QvqACggUIERqa42uIJ9SuK5qJ2+jfd
+q18An0udabA9V9TBbtZnqtxCmboREnbo
+=LciS
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/nautilus-3.14.2-active-slot.patch b/gnome-base/nautilus/files/nautilus-3.14.2-active-slot.patch
new file mode 100644
index 000000000000..b1941996021d
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-3.14.2-active-slot.patch
@@ -0,0 +1,51 @@
+From c9f259ca8f5541ac879320b5d168ae7b4bc46d86 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nelson=20Ben=C3=ADtez=20Le=C3=B3n?=
+ <nbenitezl+gnome@gmail.com>
+Date: Sat, 27 Dec 2014 00:27:36 +0500
+Subject: nautilus-window: make sure active slot is closed last
+
+When destroying window and closing all slots, the closing
+of the active slot will trigger activation of next free slot,
+we don't want to be activating slots as part of
+'closing all slots' logic.
+
+Fixes bug 741952
+
+diff --git a/src/nautilus-window.c b/src/nautilus-window.c
+index 124fc57..38dea35 100644
+--- a/src/nautilus-window.c
++++ b/src/nautilus-window.c
+@@ -1531,6 +1531,18 @@ nautilus_window_get_property (GObject *object,
+ 	}
+ }
+ 
++static gint
++sort_slots_active_last (NautilusWindowSlot *a, NautilusWindowSlot *b, NautilusWindow *window)
++{
++	if (window->details->active_slot == a) {
++		return 1;
++	}
++	if (window->details->active_slot == b) {
++		return -1;
++	}
++	return 0;
++}
++
+ static void
+ destroy_slots_foreach (gpointer data,
+ 		       gpointer user_data)
+@@ -1557,6 +1569,11 @@ nautilus_window_destroy (GtkWidget *object)
+ 
+ 	/* close all slots safely */
+ 	slots_copy = g_list_copy (window->details->slots);
++	if (window->details->active_slot != NULL) {
++		/* Make sure active slot is last one to be closed, to avoid default activation
++		 * of others slots when closing the active one, see bug #741952  */
++		slots_copy = g_list_sort_with_data (slots_copy, (GCompareFunc) sort_slots_active_last, window);
++	}
+ 	g_list_foreach (slots_copy, (GFunc) destroy_slots_foreach, window);
+ 	g_list_free (slots_copy);
+ 
+-- 
+cgit v0.10.1
+
diff --git a/gnome-base/nautilus/files/nautilus-3.14.2-parse-force-desktop.patch b/gnome-base/nautilus/files/nautilus-3.14.2-parse-force-desktop.patch
new file mode 100644
index 000000000000..a106f4cdeeff
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-3.14.2-parse-force-desktop.patch
@@ -0,0 +1,38 @@
+From 845e8dbe02a3609b3d7df41dd0df38f8bbad3682 Mon Sep 17 00:00:00 2001
+From: Carlos Soriano <carlos.sorian89@gmail.com>
+Date: Fri, 5 Dec 2014 17:57:19 +0100
+Subject: nautilus-application: Parse force-desktop before exiting
+
+In commit ae4d4960 we introduced a regression that a new window was
+openned if both --no-default-window and --force-desktop options were
+used.
+
+To avoid that, activate those options before actually skipping the
+activate of the application if --no-default-window option is provided.
+
+The application nornally would exit if --no-default-window is provided
+and the show-desktop-window is not activated, but, we rely on a the
+detail that activating the open-desktop action when --force-desktop is
+provided as a option, creates a new window, which makes the application
+keep alive.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=741166
+
+diff --git a/src/nautilus-application.c b/src/nautilus-application.c
+index f26c8c7..c336a39 100644
+--- a/src/nautilus-application.c
++++ b/src/nautilus-application.c
+@@ -930,7 +930,9 @@ nautilus_application_handle_local_options (GApplication *application,
+ 		self->priv->desktop_override = TRUE;
+ 		g_action_group_activate_action (G_ACTION_GROUP (application),
+ 						"close-desktop", NULL);
+-	}  else if (g_variant_dict_contains (options, "no-default-window")) {
++	}
++
++	if (g_variant_dict_contains (options, "no-default-window")) {
+ 		/* We want to avoid trigering the activate signal; so no window is created.
+ 		 * GApplication doesn't call activate if we return a value >= 0.
+ 		 * Use EXIT_SUCCESS since is >= 0. */
+-- 
+cgit v0.10.1
+
diff --git a/gnome-base/nautilus/files/nautilus-3.14.2-unreadable-names.patch b/gnome-base/nautilus/files/nautilus-3.14.2-unreadable-names.patch
new file mode 100644
index 000000000000..54d5d5a5dfc4
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-3.14.2-unreadable-names.patch
@@ -0,0 +1,28 @@
+From 29ed1dee800341e8fcde739d0561ecc9d14e7f10 Mon Sep 17 00:00:00 2001
+From: Carlos Soriano <carlos.soriano89@gmail.com>
+Date: Fri, 22 Aug 2014 19:18:30 +0200
+Subject: nautilus-list-view: Avoid unreadable names
+
+Currently if the view is resized, the column name is resized as well
+given that use ellipsization allowing the column to become unreadable.
+To avoid that, use width-chars property to set a desired width, but at
+the same time allowing the user to resize without limits the name column
+if desired.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=732004
+
+diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
+index 8711af6..b361734 100644
+--- a/src/nautilus-list-view.c
++++ b/src/nautilus-list-view.c
+@@ -2066,6 +2066,7 @@ create_and_set_up_tree_view (NautilusListView *view)
+ 			g_object_set (cell,
+ 				      "ellipsize", PANGO_ELLIPSIZE_END,
+ 				      "single-paragraph-mode", TRUE,
++				      "width-chars", 30,
+ 				      "xpad", 5,
+ 				      NULL);
+ 
+-- 
+cgit v0.10.1
+
diff --git a/gnome-base/nautilus/nautilus-3.14.2-r1.ebuild b/gnome-base/nautilus/nautilus-3.14.2-r1.ebuild
new file mode 100644
index 000000000000..09e5c3063069
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.14.2-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.14.2-r1.ebuild,v 1.1 2015/01/27 11:21:18 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
+
+inherit eutils gnome2 readme.gentoo virtualx
+
+DESCRIPTION="A file manager for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
+SLOT="0"
+
+# profiling?
+IUSE="debug exif gnome +introspection packagekit +previewer sendto tracker xmp"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+
+# FIXME: tests fails under Xvfb, but pass when building manually
+# "FAIL: check failed in nautilus-file.c, line 8307"
+RESTRICT="test"
+
+# FIXME: selinux support is automagic
+# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
+# and 2.30.0
+COMMON_DEPEND="
+	>=dev-libs/glib-2.35.3:2[dbus]
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.13.2:3[introspection?]
+	>=dev-libs/libxml2-2.7.8:2
+	>=gnome-base/gnome-desktop-3:3=
+
+	gnome-base/dconf
+	>=gnome-base/gsettings-desktop-schemas-3.8.0
+	>=x11-libs/libnotify-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+
+	exif? ( >=media-libs/libexif-0.6.20 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
+	tracker? ( >=app-misc/tracker-0.16:= )
+	xmp? ( >=media-libs/exempi-2.1.0 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/gdbus-codegen-2.33
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	packagekit? ( app-admin/packagekit-base )
+	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
+"
+
+# For eautoreconf
+#	gnome-base/gnome-common
+#	dev-util/gtk-doc-am"
+
+PDEPEND="
+	gnome? (
+		>=x11-themes/gnome-icon-theme-1.1.91
+		x11-themes/gnome-icon-theme-symbolic )
+	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
+	previewer? ( >=gnome-extra/sushi-0.1.9 )
+	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+	>=gnome-base/gvfs-1.14[gtk]
+"
+# Need gvfs[gtk] for recent:/// support
+
+src_prepare() {
+	if use previewer; then
+		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
+			To activate the previewer, select a file and press space; to
+			close the previewer, press space again."
+	fi
+
+	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
+	# bug #393663
+	epatch "${FILESDIR}/${PN}-3.5.91-delete.patch"
+
+	# nautilus-application: Parse force-desktop before exiting (from '3.14')
+	epatch "${FILESDIR}/${P}-parse-force-desktop.patch"
+
+	# nautilus-window: make sure active slot is closed last (from '3.14')
+	epatch "${FILESDIR}/${P}-active-slot.patch"
+
+	# nautilus-list-view: Avoid unreadable names (from '3.14')
+	epatch "${FILESDIR}/${P}-unreadable-names.patch"
+
+	# Remove -D*DEPRECATED flags. Don't leave this for eclass! (bug #448822)
+	sed -e 's/DISABLE_DEPRECATED_CFLAGS=.*/DISABLE_DEPRECATED_CFLAGS=/' \
+		-i configure || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS HACKING MAINTAINERS NEWS README* THANKS"
+	gnome2_src_configure \
+		--disable-profiling \
+		--disable-update-mimedb \
+		$(use_enable debug) \
+		$(use_enable exif libexif) \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable sendto nst-extension) \
+		$(use_enable tracker) \
+		$(use_enable xmp)
+}
+
+src_test() {
+	gnome2_environment_reset
+	unset DBUS_SESSION_BUS_ADDRESS
+	export GSETTINGS_BACKEND="memory"
+	Xemake check
+	unset GSETTINGS_BACKEND
+}
+
+src_install() {
+	use previewer && readme.gentoo_create_doc
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if use previewer; then
+		readme.gentoo_print_elog
+	else
+		elog "To preview media files, emerge nautilus with USE=previewer"
+	fi
+}