From 64f1dae7b696c6d254c742a824e55a45788a9db9 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sat, 14 Nov 2015 14:21:02 +0100 Subject: gnome-base/nautilus: Drop old Package-Manager: portage-2.2.24 --- gnome-base/nautilus/Manifest | 1 - .../files/nautilus-3.14.2-active-slot.patch | 51 -------- .../nautilus-3.14.2-parse-force-desktop.patch | 38 ------ .../files/nautilus-3.14.2-unreadable-names.patch | 28 ----- .../nautilus/files/nautilus-3.5.91-delete.patch | 44 ------- gnome-base/nautilus/nautilus-3.14.2-r1.ebuild | 138 --------------------- 6 files changed, 300 deletions(-) delete mode 100644 gnome-base/nautilus/files/nautilus-3.14.2-active-slot.patch delete mode 100644 gnome-base/nautilus/files/nautilus-3.14.2-parse-force-desktop.patch delete mode 100644 gnome-base/nautilus/files/nautilus-3.14.2-unreadable-names.patch delete mode 100644 gnome-base/nautilus/files/nautilus-3.5.91-delete.patch delete mode 100644 gnome-base/nautilus/nautilus-3.14.2-r1.ebuild (limited to 'gnome-base/nautilus') diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest index 7425b45e379b..91a0fddf8ad7 100644 --- a/gnome-base/nautilus/Manifest +++ b/gnome-base/nautilus/Manifest @@ -1,3 +1,2 @@ -DIST nautilus-3.14.2.tar.xz 3344428 SHA256 b2c9e13ba896a15101abf5d5fe30e291243e6030e0c84e8eb5df1e7bd90c10a5 SHA512 9d07878fc2474c7444fb7c573ce1886514b82ecb386365e608de81473184791daf17875b7ea471a7bef2c84df0d6d06b207223c7b5ec64d195e46865440ceff6 WHIRLPOOL c29af2fe684abeeffe58d6ba872b97b846db5d97cace8b73196fb77a024262f82df1908bac975b67938db9a12091dee681f1d827a551eb2610d11a6db2164495 DIST nautilus-3.16.2.tar.xz 3325172 SHA256 3e7ecdda3a47b6ad03098270940aa506782866fa3602d91e711d99f96741478f SHA512 06b4c338fe2295122b35053d754d8bb797cfeedf736db3a52dd290d7742d79fbbf50c23a3d59e62ef937f3ebf6b67f26f12a652b75d42a8b44462a3e1eef1be1 WHIRLPOOL bd6d3aee888474e247f19cf95fecead27a86296afcab04de7052b8403df95d9b776b0c93bad04b748ba638d4edfc3fc11e8fbce50142a0aad517a0ed35038f9c DIST nautilus-3.18.2.tar.xz 3316652 SHA256 68dcf668e2ca93126a899d2e236ef37af2aea93e3fc25eee23ccd7ba911d424a SHA512 ac40683027f3318bbea23feee7a654502106932b049faa4bcbc1340a7fbafaa7e8857237b1ec5a0bcbee25e8d75eb1e9c8136cd5b748f9009e72589e73908e86 WHIRLPOOL 317258a102cf89497cfe87965614f77bff189ad3539c61f777b0d19bd0f8febe316a1389f47256f65de50b23b8c79382ac5b45cfb94919c8bf2a7e1fbe26a304 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 deleted file mode 100644 index b1941996021d..000000000000 --- a/gnome-base/nautilus/files/nautilus-3.14.2-active-slot.patch +++ /dev/null @@ -1,51 +0,0 @@ -From c9f259ca8f5541ac879320b5d168ae7b4bc46d86 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Nelson=20Ben=C3=ADtez=20Le=C3=B3n?= - -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 deleted file mode 100644 index a106f4cdeeff..000000000000 --- a/gnome-base/nautilus/files/nautilus-3.14.2-parse-force-desktop.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 845e8dbe02a3609b3d7df41dd0df38f8bbad3682 Mon Sep 17 00:00:00 2001 -From: Carlos Soriano -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 deleted file mode 100644 index 54d5d5a5dfc4..000000000000 --- a/gnome-base/nautilus/files/nautilus-3.14.2-unreadable-names.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 29ed1dee800341e8fcde739d0561ecc9d14e7f10 Mon Sep 17 00:00:00 2001 -From: Carlos Soriano -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/files/nautilus-3.5.91-delete.patch b/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch deleted file mode 100644 index 072b34ea9131..000000000000 --- a/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 92af7beb790ad9181e5a6a89ac52f177354536f2 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Thu, 8 Dec 2011 18:39:28 -0500 -Subject: [PATCH] Delete key should delete files - -Make the Delete key delete files like in nautilus-2.x and every other -file manager on the planet. Note: the nautilus-3 Ctrl+Delete shortcut -will also continue to work. - -https://bugzilla.gnome.org/show_bug.cgi?id=647048 -https://bugs.gentoo.org/show_bug.cgi?id=393663 ---- - src/nautilus-view.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/nautilus-view.c b/src/nautilus-view.c -index f51d916..0a50994 100644 ---- a/src/nautilus-view.c -+++ b/src/nautilus-view.c -@@ -7237,7 +7237,7 @@ static const GtkActionEntry directory_view_entries[] = { - /* tooltip */ NULL, - G_CALLBACK (action_rename_select_all_callback) }, - /* name, stock id */ { NAUTILUS_ACTION_TRASH, NULL, -- /* label, accelerator */ N_("Mo_ve to Trash"), "Delete", -+ /* label, accelerator */ N_("Mo_ve to Trash"), "Delete", - /* tooltip */ N_("Move each selected item to the Trash"), - G_CALLBACK (action_trash_callback) }, - /* name, stock id */ { NAUTILUS_ACTION_DELETE, NULL, -@@ -9895,8 +9895,12 @@ nautilus_view_class_init (NautilusViewClass *klass) - binding_set = gtk_binding_set_by_class (klass); - gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_CONTROL_MASK, - "trash", 0); -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, 0, -+ "trash", 0); - gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_CONTROL_MASK, - "trash", 0); -+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, 0, -+ "trash", 0); - gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_SHIFT_MASK, - "delete", 0); - } --- -1.7.12 - diff --git a/gnome-base/nautilus/nautilus-3.14.2-r1.ebuild b/gnome-base/nautilus/nautilus-3.14.2-r1.ebuild deleted file mode 100644 index 0583fa9214e3..000000000000 --- a/gnome-base/nautilus/nautilus-3.14.2-r1.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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? ( !