[gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/

[Priit Laes]

commit:     911b1cb1927a60344d68e1dd9cb426378692e3b7
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Mon Aug 27 07:10:25 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Mon Aug 27 07:10:52 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=911b1cb1

gnome-base/nautilus: Add 3.5.90 to overlay

---
 .../nautilus-3.2.1-key-press-forwarding.patch      |   40 --------------------
 ...nautilus-9999.ebuild => nautilus-3.5.90.ebuild} |    8 +--
 gnome-base/nautilus/nautilus-9999.ebuild           |    8 +--
 3 files changed, 6 insertions(+), 50 deletions(-)

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
deleted file mode 100644
index 4ad417e..0000000
--- a/gnome-base/nautilus/files/nautilus-3.2.1-key-press-forwarding.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d4e2a297589e35a9545d996a4f0a61d22152e4c7 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@g.o>
-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-9999.ebuild b/gnome-base/nautilus/nautilus-3.5.90.ebuild
similarity index 94%
copy from gnome-base/nautilus/nautilus-9999.ebuild
copy to gnome-base/nautilus/nautilus-3.5.90.ebuild
index 0f01ee9..e39db04 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-3.5.90.ebuild
@@ -21,13 +21,14 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
 fi
+# profiling?
 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?]
+	>=x11-libs/gtk+-3.5.5:3[introspection?]
 	>=dev-libs/libxml2-2.7.8:2
 	>=gnome-base/gnome-desktop-3.0.0:3
 
@@ -73,7 +74,7 @@ pkg_setup() {
 		$(use_enable sendto nst-extension)
 		$(use_enable tracker)
 		$(use_enable xmp)"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS"
 }
 
 src_prepare() {
@@ -83,9 +84,6 @@ src_prepare() {
 	# bug #393663
 	epatch "${FILESDIR}/${PN}-3.2.1-delete.patch"
 
-	# https://bugzilla.gnome.org/show_bug.cgi?id=664573
-	epatch "${FILESDIR}/${PN}-3.2.1-key-press-forwarding.patch"
-
 	# Remove crazy CFLAGS
 	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
 		|| die "sed 1 failed"

diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-9999.ebuild
index 0f01ee9..e39db04 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-9999.ebuild
@@ -21,13 +21,14 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
 fi
+# profiling?
 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?]
+	>=x11-libs/gtk+-3.5.5:3[introspection?]
 	>=dev-libs/libxml2-2.7.8:2
 	>=gnome-base/gnome-desktop-3.0.0:3
 
@@ -73,7 +74,7 @@ pkg_setup() {
 		$(use_enable sendto nst-extension)
 		$(use_enable tracker)
 		$(use_enable xmp)"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS"
 }
 
 src_prepare() {
@@ -83,9 +84,6 @@ src_prepare() {
 	# bug #393663
 	epatch "${FILESDIR}/${PN}-3.2.1-delete.patch"
 
-	# https://bugzilla.gnome.org/show_bug.cgi?id=664573
-	epatch "${FILESDIR}/${PN}-3.2.1-key-press-forwarding.patch"
-
 	# Remove crazy CFLAGS
 	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
 		|| die "sed 1 failed"