[gnome-base/nautilus] synchr. with Portage (add 3.14.2-r1)
This commit is contained in:
Sławomir Nizio
@@ -1,3 +1,2 @@
|
||||
DIST nautilus-3.12.0.tar.xz 3350956 SHA256 c19af20ab1fadf04bebee7ec8d3375c5efbe27bb6e0b7d3a60369523baf5e4df SHA512 e42eef48564c8b1fd0cb1cadee285be0c8b1e0840527498f4e4e2d25719d31d3dc1c780cd09e521f187ed98502e0b223aaac589ca22bdc6a4e3bd4c3495feb7d WHIRLPOOL a6a41a4134874efc5b36f992f00b6d0aca14659ad6747dd0ce760ee20458982094b3cf525d83c6df8376a93b3d4ef8667d2f03abb2f9f91097312804a024724a
|
||||
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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
+18
-8
@@ -1,6 +1,6 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.14.2-r1.ebuild,v 1.3 2015/03/15 13:23:47 pacho Exp $
|
||||
|
||||
EAPI="5"
|
||||
GCONF_DEBUG="no"
|
||||
@@ -9,14 +9,14 @@ GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
|
||||
inherit eutils gnome2 readme.gentoo virtualx
|
||||
|
||||
DESCRIPTION="A file manager for the GNOME desktop"
|
||||
HOMEPAGE="http://live.gnome.org/Nautilus"
|
||||
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"
|
||||
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"
|
||||
@@ -26,9 +26,9 @@ RESTRICT="test"
|
||||
# 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
|
||||
>=dev-libs/glib-2.35.3:2[dbus]
|
||||
>=x11-libs/pango-1.28.3
|
||||
>=x11-libs/gtk+-3.11.6:3[introspection?]
|
||||
>=x11-libs/gtk+-3.13.2:3[introspection?]
|
||||
>=dev-libs/libxml2-2.7.8:2
|
||||
>=gnome-base/gnome-desktop-3:3=
|
||||
|
||||
@@ -80,16 +80,26 @@ src_prepare() {
|
||||
close the previewer, press space again."
|
||||
fi
|
||||
|
||||
# Sabayon, fix icons setup during Live system autostart (first boot only)
|
||||
epatch "${FILESDIR}/${PN}-3.0.2-fix-autostart-live-boot.patch"
|
||||
|
||||
# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
|
||||
# bug #393663
|
||||
epatch "${FILESDIR}/${PN}-3.5.91-delete.patch"
|
||||
|
||||
# Sabayon, fix icons setup during Live system autostart (first boot only)
|
||||
epatch "${FILESDIR}/${PN}-3.0.2-fix-autostart-live-boot.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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user