From f37b75c7553bea510f394a0fa2c1c551faa230fc Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Sun, 3 Jun 2012 20:01:15 +0000 Subject: Add early nautilus 3.6 pre-release svn path=/; revision=336 --- gnome-base/nautilus/Manifest | 5 + .../nautilus/files/nautilus-3.2.1-delete.patch | 44 ++++++++ .../nautilus-3.2.1-key-press-forwarding.patch | 40 +++++++ gnome-base/nautilus/nautilus-3.5.1.ebuild | 114 ++++++++++++++++++++ gnome-base/nautilus/nautilus-9999.ebuild | 115 +++++++++++++++++++++ 5 files changed, 318 insertions(+) create mode 100644 gnome-base/nautilus/Manifest create mode 100644 gnome-base/nautilus/files/nautilus-3.2.1-delete.patch create mode 100644 gnome-base/nautilus/files/nautilus-3.2.1-key-press-forwarding.patch create mode 100644 gnome-base/nautilus/nautilus-3.5.1.ebuild create mode 100644 gnome-base/nautilus/nautilus-9999.ebuild diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest new file mode 100644 index 0000000..af6e0c2 --- /dev/null +++ b/gnome-base/nautilus/Manifest @@ -0,0 +1,5 @@ +AUX nautilus-3.2.1-delete.patch 1869 RMD160 e730dfd7754dc619327347f3b5a578c9d6dd1317 SHA1 0f40dac0184320d86df3cccbe917084a4aea48e8 SHA256 51ebfb58d3b1217796dfa79386bdeade2255f879108963962c63124cbedb4fa0 +AUX nautilus-3.2.1-key-press-forwarding.patch 1716 RMD160 b158ab5e1ee158f7481b20c672da986f702305e5 SHA1 c703365c3468696b23eb8fa4161cf504fc7e29a7 SHA256 9222c08189e01a2bfb8a72d2d4c7dfd0d841e4d159f8045e2cf15cf7857aff05 +DIST nautilus-3.5.1.tar.xz 4580536 RMD160 b5cf369304147bcc29aa3e4daeafa02ad905878c SHA1 6ee9ba9aa637897a25fa5cad0b05fe682d36a684 SHA256 ebfbcd822845c3ac76ff54c5d2d7f2962c79807ec453a7beb6a114ddebefe9a7 +EBUILD nautilus-3.5.1.ebuild 3091 RMD160 e949c780cf4f0a5d9bf3c98166b860b114fb3978 SHA1 0901d3557afe15274e8627203c4b7880ba7e322a SHA256 56c978c2a3071df470184e18d7a018ef7cfc4ce06177972c3725bebe2636afca +EBUILD nautilus-9999.ebuild 3112 RMD160 01773394ec991605e85bfdced5d6fb4a0b426be1 SHA1 1ea39e892e6ab745865fe69483dd8914a2f988bc SHA256 f2ce578a2583fe3697bf0a177a8d8d0c0780aa7c0ca64cd4c158b5ad4db292f4 diff --git a/gnome-base/nautilus/files/nautilus-3.2.1-delete.patch b/gnome-base/nautilus/files/nautilus-3.2.1-delete.patch new file mode 100644 index 0000000..7720a6b --- /dev/null +++ b/gnome-base/nautilus/files/nautilus-3.2.1-delete.patch @@ -0,0 +1,44 @@ +From 0c86d481ac075d733ddffae7a67aa23b0b4d54c5 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 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/src/nautilus-view.c b/src/nautilus-view.c +index dca1413..f3928db 100644 +--- a/src/nautilus-view.c ++++ b/src/nautilus-view.c +@@ -7014,7 +7014,7 @@ static const GtkActionEntry directory_view_entries[] = { + /* tooltip */ NULL, + G_CALLBACK (action_rename_select_all_callback) }, + /* name, stock id */ { "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 */ { "Delete", NULL, +@@ -9687,8 +9687,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.8 + diff --git a/gnome-base/nautilus/files/nautilus-3.2.1-key-press-forwarding.patch b/gnome-base/nautilus/files/nautilus-3.2.1-key-press-forwarding.patch new file mode 100644 index 0000000..4ad417e --- /dev/null +++ b/gnome-base/nautilus/files/nautilus-3.2.1-key-press-forwarding.patch @@ -0,0 +1,40 @@ +From d4e2a297589e35a9545d996a4f0a61d22152e4c7 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Wed, 14 Dec 2011 20:43:08 -0500 +Subject: [PATCH] Do not handle keyboard shortcuts in NautilusWindow if an + editable widget is focused + +If an editable widget (e.g. GtkEntry in the location bar or search bar) is +focused, NautilusWindow should forward all key press events to it since the +window's accelerator bindings may conflict with the widget's. + +https://bugzilla.gnome.org/show_bug.cgi?id=664573 +--- + src/nautilus-window.c | 11 ++++++----- + 1 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/src/nautilus-window.c b/src/nautilus-window.c +index c3a3c2c..e8646d8 100644 +--- a/src/nautilus-window.c ++++ b/src/nautilus-window.c +@@ -1117,11 +1117,12 @@ nautilus_window_key_press_event (GtkWidget *widget, + active_slot = nautilus_window_get_active_slot (window); + view = active_slot->content_view; + +- if (view != NULL && nautilus_view_get_is_renaming (view)) { +- /* if we're renaming, just forward the event to the +- * focused widget and return. We don't want to process the window +- * accelerator bindings, as they might conflict with the +- * editable widget bindings. ++ if ((view != NULL && (nautilus_view_get_is_renaming (view))) || GTK_IS_EDITABLE (gtk_window_get_focus (window))) { ++ /* If we're renaming, or editing a GtkEntry (e.g. location or ++ * search bar), just forward the event to the focused widget ++ * and return. ++ * We don't want to process the window accelerator bindings, ++ * as they might conflict with the editable widget bindings. + */ + if (gtk_window_propagate_key_event (GTK_WINDOW (window), event)) { + return TRUE; +-- +1.7.8 + diff --git a/gnome-base/nautilus/nautilus-3.5.1.ebuild b/gnome-base/nautilus/nautilus-3.5.1.ebuild new file mode 100644 index 0000000..0f01ee9 --- /dev/null +++ b/gnome-base/nautilus/nautilus-3.5.1.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit eutils gnome2 virtualx +if [[ ${PV} = 9999 ]]; then + inherit gnome2-live +fi + +DESCRIPTION="A file manager for the GNOME desktop" +HOMEPAGE="http://live.gnome.org/Nautilus" + +LICENSE="GPL-2 LGPL-2 FDL-1.1" +SLOT="0" +if [[ ${PV} = 9999 ]]; then + KEYWORDS="" +else + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux" +fi +IUSE="doc exif gnome +introspection packagekit +previewer sendto tracker xmp" + +# 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.31.9:2 + >=x11-libs/pango-1.28.3 + >=x11-libs/gtk+-3.3.17:3[introspection?] + >=dev-libs/libxml2-2.7.8:2 + >=gnome-base/gnome-desktop-3.0.0:3 + + gnome-base/dconf + gnome-base/gsettings-desktop-schemas + >=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.12 ) + xmp? ( >=media-libs/exempi-2.1.0 )" +DEPEND="${COMMON_DEPEND} + >=dev-lang/perl-5 + >=dev-util/gdbus-codegen-2.31.0 + >=dev-util/intltool-0.40.1 + sys-devel/gettext + virtual/pkgconfig + x11-proto/xproto + doc? ( >=dev-util/gtk-doc-1.4 )" +RDEPEND="${COMMON_DEPEND} + packagekit? ( app-admin/packagekit-base ) + sendto? ( !