public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
@ 2011-05-30 18:39 Nirbheek Chauhan
  0 siblings, 0 replies; 8+ messages in thread
From: Nirbheek Chauhan @ 2011-05-30 18:39 UTC (permalink / raw
  To: gentoo-commits

commit:     4ef658e0178b95b19e6d63e4ec0d759dae84b5e9
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Fri May 27 06:31:53 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon May 30 18:10:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4ef658e0

gnome-base/nautilus: 3.0.1.1 → 3.0.2

* Add patch to fix bug #365779 (segfault in gtk_icon_info_load_symbolic
  when nautilus fails to find an icon).

Signed-off-by: Nirbheek Chauhan <nirbheek <AT> gentoo.org>

---
 ...2-segfault-in-gtk_icon_info_load_symbolic.patch |   88 ++++++++++++++++++++
 ...utilus-3.0.1.1.ebuild => nautilus-3.0.2.ebuild} |    3 +
 2 files changed, 91 insertions(+), 0 deletions(-)

diff --git a/gnome-base/nautilus/files/nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch b/gnome-base/nautilus/files/nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch
new file mode 100644
index 0000000..82781f7
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch
@@ -0,0 +1,88 @@
+From a37ecf869f4772b1ea3b578b687b5b83dd4bd067 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Fri, 27 May 2011 01:10:24 -0400
+Subject: [PATCH] Prevent segfault in gtk_icon_info_load_symbolic when icon is not found (gnome bug 651209)
+
+Users of Gentoo and Fedora have reported segfaults in nautilus-3.0.x
+in gtk_icon_info_load_symbolic (see Gentoo bug 365779, Fedora bug
+690357). One of them was helpful enough to post a backtrace with
+debugging information: https://bugzilla.redhat.com/attachment.cgi?id=489928
+
+The backtrace shows that the crash occurs because we are passing a
+NULL icon_info to gtk_icon_info_load_symbolic in lookup_and_color_symbolic_find
+in nautilus-search-bar.c; indeed, icon_info will be NULL if
+gtk_icon_theme_lookup_icon fails to find an icon.
+
+An identical problem exists in get_eject_icon in nautilus-places-sidebar.c,
+where gtk_icon_info_load_symbolic_for_context and
+gtk_icon_theme_lookup_by_gicon are used.
+
+The solution is to check for the NULL icon_info, and return a
+NULL GdkPixbuf. Note that returning a NULL from
+lookup_and_color_symbolic_find and get_eject_icon is
+safe: in both cases, the return value is only used in functions
+that can safely deal with a NULL.
+---
+ src/nautilus-places-sidebar.c |   11 ++++++-----
+ src/nautilus-search-bar.c     |    9 +++++----
+ 2 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
+index aa08f14..de53cd1 100644
+--- a/src/nautilus-places-sidebar.c
++++ b/src/nautilus-places-sidebar.c
+@@ -214,7 +214,7 @@ static GdkPixbuf *
+ get_eject_icon (NautilusPlacesSidebar *sidebar,
+ 		gboolean highlighted)
+ {
+-	GdkPixbuf *eject;
++	GdkPixbuf *eject = NULL;
+ 	GtkIconInfo *icon_info;
+ 	GIcon *icon;
+ 	int icon_size;
+@@ -227,10 +227,11 @@ get_eject_icon (NautilusPlacesSidebar *sidebar,
+ 	icon_info = gtk_icon_theme_lookup_by_gicon (icon_theme, icon, icon_size, 0);
+ 
+ 	style = gtk_widget_get_style_context (GTK_WIDGET (sidebar));
+-	eject = gtk_icon_info_load_symbolic_for_context (icon_info,
+-							 style,
+-							 NULL,
+-							 NULL);
++	if (icon_info != NULL)
++		eject = gtk_icon_info_load_symbolic_for_context (icon_info,
++								 style,
++								 NULL,
++								 NULL);
+ 
+ 	if (highlighted) {
+ 		GdkPixbuf *high;
+diff --git a/src/nautilus-search-bar.c b/src/nautilus-search-bar.c
+index 6148807..17412d9 100644
+--- a/src/nautilus-search-bar.c
++++ b/src/nautilus-search-bar.c
+@@ -160,7 +160,7 @@ lookup_and_color_symbolic_find (NautilusSearchBar *bar)
+ {
+ 	GtkIconInfo *icon_info;
+ 	GdkRGBA color;
+-	GdkPixbuf *icon;
++	GdkPixbuf *icon = NULL;
+ 	GtkStyleContext *context;
+ 
+ 	context = gtk_widget_get_style_context (GTK_WIDGET (bar));
+@@ -172,9 +172,10 @@ lookup_and_color_symbolic_find (NautilusSearchBar *bar)
+ 						"edit-find-symbolic",
+ 						nautilus_get_icon_size_for_stock_size (GTK_ICON_SIZE_MENU),
+ 						GTK_ICON_LOOKUP_GENERIC_FALLBACK);
+-	icon = gtk_icon_info_load_symbolic (icon_info, &color,
+-					    NULL, NULL, NULL,
+-					    NULL, NULL);
++	if (icon_info != NULL)
++		icon = gtk_icon_info_load_symbolic (icon_info, &color,
++						    NULL, NULL, NULL,
++						    NULL, NULL);
+ 
+ 	gtk_style_context_restore (context);
+ 
+-- 
+1.7.5.rc3
+

diff --git a/gnome-base/nautilus/nautilus-3.0.1.1.ebuild b/gnome-base/nautilus/nautilus-3.0.2.ebuild
similarity index 93%
rename from gnome-base/nautilus/nautilus-3.0.1.1.ebuild
rename to gnome-base/nautilus/nautilus-3.0.2.ebuild
index f8fb449..da2ec5a 100644
--- a/gnome-base/nautilus/nautilus-3.0.1.1.ebuild
+++ b/gnome-base/nautilus/nautilus-3.0.2.ebuild
@@ -65,6 +65,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Gentoo bug #365779 + https://bugzilla.gnome.org/show_bug.cgi?id=651209
+	epatch "${FILESDIR}/${PN}-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch"
+
 	gnome2_src_prepare
 
 	# Remove crazy CFLAGS



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
@ 2012-04-02  6:43 Alexandre Restovtsev
  0 siblings, 0 replies; 8+ messages in thread
From: Alexandre Restovtsev @ 2012-04-02  6:43 UTC (permalink / raw
  To: gentoo-commits

commit:     d94877b0775d4a8986ae3bddc2e61f748707813a
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  2 06:01:38 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Apr  2 06:01:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d94877b0

gnome-base/nautilus: add 3.4.0

---
 .../nautilus/files/nautilus-3.2.1-delete.patch     |   44 ++++++++++++++++++++
 .../nautilus-3.2.1-key-press-forwarding.patch      |   40 ++++++++++++++++++
 ...{nautilus-9999.ebuild => nautilus-3.4.0.ebuild} |   21 +++++++---
 gnome-base/nautilus/nautilus-9999.ebuild           |   21 +++++++---
 4 files changed, 114 insertions(+), 12 deletions(-)

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 <tetromino@gentoo.org>
+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"), "<control>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 <tetromino@gentoo.org>
+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.4.0.ebuild
similarity index 83%
copy from gnome-base/nautilus/nautilus-9999.ebuild
copy to gnome-base/nautilus/nautilus-3.4.0.ebuild
index e16b5c3..5cbc206 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,7 +6,7 @@ EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 virtualx
+inherit eutils gnome2 virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -25,9 +25,9 @@ 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.30.0:2
+COMMON_DEPEND=">=dev-libs/glib-2.31.9:2
 	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.1.6:3[introspection?]
+	>=x11-libs/gtk+-3.3.17:3[introspection?]
 	>=dev-libs/libxml2-2.7.8:2
 	>=gnome-base/gnome-desktop-3.0.0:3
 
@@ -44,7 +44,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
 	xmp? ( >=media-libs/exempi-2.1.0 )"
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.30.0
+	>=dev-util/gdbus-codegen-2.31.0
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.40.1
 	sys-devel/gettext
@@ -79,6 +79,13 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
+	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
+	# 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"
@@ -89,7 +96,9 @@ src_test() {
 	unset SESSION_MANAGER
 	unset ORBIT_SOCKETDIR
 	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "Test phase failed"
+	export GSETTINGS_BACKEND="memory"
+	Xemake check
+	unset GSETTINGS_BACKEND
 }
 
 pkg_postinst() {

diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-9999.ebuild
index e16b5c3..5cbc206 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,7 +6,7 @@ EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 virtualx
+inherit eutils gnome2 virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -25,9 +25,9 @@ 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.30.0:2
+COMMON_DEPEND=">=dev-libs/glib-2.31.9:2
 	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.1.6:3[introspection?]
+	>=x11-libs/gtk+-3.3.17:3[introspection?]
 	>=dev-libs/libxml2-2.7.8:2
 	>=gnome-base/gnome-desktop-3.0.0:3
 
@@ -44,7 +44,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
 	xmp? ( >=media-libs/exempi-2.1.0 )"
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.30.0
+	>=dev-util/gdbus-codegen-2.31.0
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.40.1
 	sys-devel/gettext
@@ -79,6 +79,13 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
+	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
+	# 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"
@@ -89,7 +96,9 @@ src_test() {
 	unset SESSION_MANAGER
 	unset ORBIT_SOCKETDIR
 	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "Test phase failed"
+	export GSETTINGS_BACKEND="memory"
+	Xemake check
+	unset GSETTINGS_BACKEND
 }
 
 pkg_postinst() {



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
@ 2012-08-27  7:11 Priit Laes
  0 siblings, 0 replies; 8+ messages in thread
From: Priit Laes @ 2012-08-27  7:11 UTC (permalink / raw
  To: gentoo-commits

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@gentoo.org>
-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"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
@ 2012-09-05 15:49 Nirbheek Chauhan
  0 siblings, 0 replies; 8+ messages in thread
From: Nirbheek Chauhan @ 2012-09-05 15:49 UTC (permalink / raw
  To: gentoo-commits

commit:     b49c9b499d9aeac781b3a7bd78ec855c3f683d63
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  5 01:45:21 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Sep  5 15:48:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b49c9b49

gnome-base/nautilus: 3.5.90 → 3.5.91

---
 ...1-delete.patch => nautilus-3.5.91-delete.patch} |   13 +++++--------
 ...utilus-3.5.90.ebuild => nautilus-3.5.91.ebuild} |    9 +++++----
 gnome-base/nautilus/nautilus-9999.ebuild           |    9 +++++----
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/gnome-base/nautilus/files/nautilus-3.2.1-delete.patch b/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch
similarity index 79%
rename from gnome-base/nautilus/files/nautilus-3.2.1-delete.patch
rename to gnome-base/nautilus/files/nautilus-3.5.91-delete.patch
index 7720a6b..6971c39 100644
--- a/gnome-base/nautilus/files/nautilus-3.2.1-delete.patch
+++ b/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch
@@ -1,14 +1,11 @@
-From 0c86d481ac075d733ddffae7a67aa23b0b4d54c5 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-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
+
+Original Author: Alexandre Rostovtsev <tetromino@gentoo.org>
 ---
  src/nautilus-view.c |    6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)
@@ -17,15 +14,15 @@ 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[] = {
+@@ -7238,7 +7238,7 @@
    /* tooltip */                  NULL,
  				 G_CALLBACK (action_rename_select_all_callback) },
-   /* name, stock id */         { "Trash", NULL,
+   /* name, stock id */         { NAUTILUS_ACTION_TRASH, NULL,
 -  /* label, accelerator */       N_("Mo_ve to Trash"), "<control>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,
+   /* name, stock id */         { NAUTILUS_ACTION_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,

diff --git a/gnome-base/nautilus/nautilus-3.5.90.ebuild b/gnome-base/nautilus/nautilus-3.5.91.ebuild
similarity index 93%
rename from gnome-base/nautilus/nautilus-3.5.90.ebuild
rename to gnome-base/nautilus/nautilus-3.5.91.ebuild
index e39db04..0815b13 100644
--- a/gnome-base/nautilus/nautilus-3.5.90.ebuild
+++ b/gnome-base/nautilus/nautilus-3.5.91.ebuild
@@ -26,9 +26,9 @@ 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
+COMMON_DEPEND=">=dev-libs/glib-2.33.11:2
 	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.5.5:3[introspection?]
+	>=x11-libs/gtk+-3.5.12:3[introspection?]
 	>=dev-libs/libxml2-2.7.8:2
 	>=gnome-base/gnome-desktop-3.0.0:3
 
@@ -41,7 +41,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.9:2
 
 	exif? ( >=media-libs/libexif-0.6.20 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	tracker? ( >=app-misc/tracker-0.12 )
+	tracker? ( >=app-misc/tracker-0.14 )
 	xmp? ( >=media-libs/exempi-2.1.0 )"
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
@@ -67,6 +67,7 @@ PDEPEND="gnome? (
 
 pkg_setup() {
 	G2CONF="${G2CONF}
+		--disable-profiling
 		--disable-update-mimedb
 		$(use_enable exif libexif)
 		$(use_enable introspection)
@@ -82,7 +83,7 @@ src_prepare() {
 
 	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
 	# bug #393663
-	epatch "${FILESDIR}/${PN}-3.2.1-delete.patch"
+	epatch "${FILESDIR}/${PN}-3.5.91-delete.patch"
 
 	# Remove crazy CFLAGS
 	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \

diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-9999.ebuild
index e39db04..0815b13 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-9999.ebuild
@@ -26,9 +26,9 @@ 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
+COMMON_DEPEND=">=dev-libs/glib-2.33.11:2
 	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.5.5:3[introspection?]
+	>=x11-libs/gtk+-3.5.12:3[introspection?]
 	>=dev-libs/libxml2-2.7.8:2
 	>=gnome-base/gnome-desktop-3.0.0:3
 
@@ -41,7 +41,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.31.9:2
 
 	exif? ( >=media-libs/libexif-0.6.20 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	tracker? ( >=app-misc/tracker-0.12 )
+	tracker? ( >=app-misc/tracker-0.14 )
 	xmp? ( >=media-libs/exempi-2.1.0 )"
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
@@ -67,6 +67,7 @@ PDEPEND="gnome? (
 
 pkg_setup() {
 	G2CONF="${G2CONF}
+		--disable-profiling
 		--disable-update-mimedb
 		$(use_enable exif libexif)
 		$(use_enable introspection)
@@ -82,7 +83,7 @@ src_prepare() {
 
 	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
 	# bug #393663
-	epatch "${FILESDIR}/${PN}-3.2.1-delete.patch"
+	epatch "${FILESDIR}/${PN}-3.5.91-delete.patch"
 
 	# Remove crazy CFLAGS
 	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
@ 2012-09-30  3:24 Alexandre Rostovtsev
  0 siblings, 0 replies; 8+ messages in thread
From: Alexandre Rostovtsev @ 2012-09-30  3:24 UTC (permalink / raw
  To: gentoo-commits

commit:     9c30e8a9f005f639ee79aa1e830e0192e2a29e57
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 30 03:22:51 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sun Sep 30 03:22:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9c30e8a9

gnome-base/nautilus: 3.5.92 → 3.6.0

Update license. Restrict tests since they fail under Xvfb (but succeed
when building manually).

---
 .../nautilus/files/nautilus-3.5.91-delete.patch    |   19 +++++++++++--------
 ...autilus-3.5.92.ebuild => nautilus-3.6.0.ebuild} |   12 +++++++-----
 gnome-base/nautilus/nautilus-9999.ebuild           |   12 +++++++-----
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch b/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch
index 6971c39..072b34e 100644
--- a/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch
+++ b/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch
@@ -1,20 +1,23 @@
+From 92af7beb790ad9181e5a6a89ac52f177354536f2 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+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
-
-Original Author: Alexandre Rostovtsev <tetromino@gentoo.org>
 ---
- src/nautilus-view.c |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
+ 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 dca1413..f3928db 100644
+index f51d916..0a50994 100644
 --- a/src/nautilus-view.c
 +++ b/src/nautilus-view.c
-@@ -7238,7 +7238,7 @@
+@@ -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,
@@ -23,7 +26,7 @@ index dca1413..f3928db 100644
    /* tooltip */                  N_("Move each selected item to the Trash"),
  				 G_CALLBACK (action_trash_callback) },
    /* name, stock id */         { NAUTILUS_ACTION_DELETE, NULL,
-@@ -9687,8 +9687,12 @@ nautilus_view_class_init (NautilusViewClass *klass)
+@@ -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);
@@ -37,5 +40,5 @@ index dca1413..f3928db 100644
  				      "delete", 0);
  }
 -- 
-1.7.8
+1.7.12
 

diff --git a/gnome-base/nautilus/nautilus-3.5.92.ebuild b/gnome-base/nautilus/nautilus-3.6.0.ebuild
similarity index 92%
rename from gnome-base/nautilus/nautilus-3.5.92.ebuild
rename to gnome-base/nautilus/nautilus-3.6.0.ebuild
index 774cf38..fa76bcf 100644
--- a/gnome-base/nautilus/nautilus-3.5.92.ebuild
+++ b/gnome-base/nautilus/nautilus-3.6.0.ebuild
@@ -14,7 +14,7 @@ fi
 DESCRIPTION="A file manager for the GNOME desktop"
 HOMEPAGE="http://live.gnome.org/Nautilus"
 
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
@@ -24,6 +24,10 @@ fi
 # profiling?
 IUSE="doc exif gnome +introspection packagekit +previewer sendto tracker xmp"
 
+# FIXME: tests fails under Xvfb, but pass when building manually
+# "FAIL: check failed in nautilus-file.c, line 8307"
+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.33.13:2
@@ -45,7 +49,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.13:2
 	xmp? ( >=media-libs/exempi-2.1.0 )"
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.31.0
+	>=dev-util/gdbus-codegen-2.33
 	>=dev-util/intltool-0.40.1
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -91,9 +95,7 @@ src_prepare() {
 }
 
 src_test() {
-	addpredict "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	unset ORBIT_SOCKETDIR
+	gnome2_environment_reset
 	unset DBUS_SESSION_BUS_ADDRESS
 	export GSETTINGS_BACKEND="memory"
 	Xemake check

diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-9999.ebuild
index 774cf38..fa76bcf 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-9999.ebuild
@@ -14,7 +14,7 @@ fi
 DESCRIPTION="A file manager for the GNOME desktop"
 HOMEPAGE="http://live.gnome.org/Nautilus"
 
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
@@ -24,6 +24,10 @@ fi
 # profiling?
 IUSE="doc exif gnome +introspection packagekit +previewer sendto tracker xmp"
 
+# FIXME: tests fails under Xvfb, but pass when building manually
+# "FAIL: check failed in nautilus-file.c, line 8307"
+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.33.13:2
@@ -45,7 +49,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.13:2
 	xmp? ( >=media-libs/exempi-2.1.0 )"
 DEPEND="${COMMON_DEPEND}
 	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.31.0
+	>=dev-util/gdbus-codegen-2.33
 	>=dev-util/intltool-0.40.1
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -91,9 +95,7 @@ src_prepare() {
 }
 
 src_test() {
-	addpredict "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	unset ORBIT_SOCKETDIR
+	gnome2_environment_reset
 	unset DBUS_SESSION_BUS_ADDRESS
 	export GSETTINGS_BACKEND="memory"
 	Xemake check


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
@ 2015-04-26 14:01 Ole Reifschneider
  0 siblings, 0 replies; 8+ messages in thread
From: Ole Reifschneider @ 2015-04-26 14:01 UTC (permalink / raw
  To: gentoo-commits

commit:     f996b4645d051c362a20815f223f625be97c86ff
Author:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 14:01:43 2015 +0000
Commit:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 14:01:43 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=f996b464

Bump nautilus to 3.16.1

Package-Manager: portage-2.2.14
Manifest-Sign-Key: 7E8B4D42

 .../nautilus/files/nautilus-3.5.91-delete.patch    | 44 ----------------------
 ...nautilus-9999.ebuild => nautilus-3.16.1.ebuild} | 32 ++++------------
 gnome-base/nautilus/nautilus-9999.ebuild           | 13 ++-----
 3 files changed, 11 insertions(+), 78 deletions(-)

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 072b34e..0000000
--- 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 <tetromino@gentoo.org>
-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"), "<control>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-9999.ebuild b/gnome-base/nautilus/nautilus-3.16.1.ebuild
similarity index 79%
copy from gnome-base/nautilus/nautilus-9999.ebuild
copy to gnome-base/nautilus/nautilus-3.16.1.ebuild
index 55bd512..26ceb6d 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-3.16.1.ebuild
@@ -1,15 +1,12 @@
-# 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"
 GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
 
 inherit eutils gnome2 readme.gentoo virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="A file manager for the GNOME desktop"
 HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
@@ -18,13 +15,8 @@ LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
 
 # profiling?
-IUSE="debug exif gnome +introspection packagekit +previewer sendto tracker xmp"
-if [[ ${PV} = 9999 ]]; then
-	IUSE="${IUSE} doc"
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
-fi
+IUSE="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"
@@ -34,15 +26,14 @@ 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.43.4:2[dbus]
 	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.13.2:3[introspection?]
+	>=x11-libs/gtk+-3.15.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
@@ -81,11 +72,6 @@ PDEPEND="
 "
 # Need gvfs[gtk] for recent:/// support
 
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		doc? ( >=dev-util/gtk-doc-1.4 )"
-fi
-
 src_prepare() {
 	if use previewer; then
 		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
@@ -93,13 +79,10 @@ src_prepare() {
 			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"
-
 	# 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
 }
 
@@ -108,7 +91,6 @@ src_configure() {
 	gnome2_src_configure \
 		--disable-profiling \
 		--disable-update-mimedb \
-		$(use_enable debug) \
 		$(use_enable exif libexif) \
 		$(use_enable introspection) \
 		$(use_enable packagekit) \

diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-9999.ebuild
index 55bd512..0031aa2 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -34,15 +34,14 @@ 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.43.4:2[dbus]
 	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.13.2:3[introspection?]
+	>=x11-libs/gtk+-3.15.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
@@ -93,13 +92,10 @@ src_prepare() {
 			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"
-
 	# 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
 }
 
@@ -108,7 +104,6 @@ src_configure() {
 	gnome2_src_configure \
 		--disable-profiling \
 		--disable-update-mimedb \
-		$(use_enable debug) \
 		$(use_enable exif libexif) \
 		$(use_enable introspection) \
 		$(use_enable packagekit) \


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
@ 2018-09-16 15:25 Sobhan Mohammadpour
  0 siblings, 0 replies; 8+ messages in thread
From: Sobhan Mohammadpour @ 2018-09-16 15:25 UTC (permalink / raw
  To: gentoo-commits

commit:     0e652f17d2f812c33487a1ed0cdf44a338705645
Author:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 15:25:13 2018 +0000
Commit:     Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 15:25:13 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=0e652f17

gnome-base/nautilus: version bump to 3.26.4 and minor fixes

add the doc flag back, rename the patch

Package-Manager: Portage-2.3.44, Repoman-2.3.10
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 ...support-optional.patch => 3.26.4-tracker-support-optional.patch} | 0
 .../nautilus/{nautilus-3.26.3.1.ebuild => nautilus-3.26.4.ebuild}   | 6 ++++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnome-base/nautilus/files/3.26.3.1-tracker-support-optional.patch b/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch
similarity index 100%
rename from gnome-base/nautilus/files/3.26.3.1-tracker-support-optional.patch
rename to gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch

diff --git a/gnome-base/nautilus/nautilus-3.26.3.1.ebuild b/gnome-base/nautilus/nautilus-3.26.4.ebuild
similarity index 94%
rename from gnome-base/nautilus/nautilus-3.26.3.1.ebuild
rename to gnome-base/nautilus/nautilus-3.26.4.ebuild
index f7b2ad76..de179978 100644
--- a/gnome-base/nautilus/nautilus-3.26.3.1.ebuild
+++ b/gnome-base/nautilus/nautilus-3.26.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
 
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
 SLOT="0"
-IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
+IUSE="doc exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
 
 KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
@@ -44,6 +44,8 @@ DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.19.7
 	virtual/pkgconfig
 	x11-base/xorg-proto
+
+	doc? ( dev-util/gtk-doc )
 "
 RDEPEND="${COMMON_DEPEND}
 	gnome-base/dconf
@@ -75,9 +77,9 @@ src_configure() {
 	# FIXME no doc useflag??
 	gnome-meson_src_configure \
 		-Denable-desktop=true \
-		-Denable-gtk-doc=false \
 		-Denable-profiling=false \
 		-Dtracker=$(usex tracker auto disabled) \
+		$(meson_use doc enable-gtk-doc) \
 		$(meson_use exif enable-exif) \
 		$(meson_use packagekit enable-packagekit) \
 		$(meson_use sendto nst-extension) \


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/
@ 2018-12-11 13:54 Gilles Dartiguelongue
  0 siblings, 0 replies; 8+ messages in thread
From: Gilles Dartiguelongue @ 2018-12-11 13:54 UTC (permalink / raw
  To: gentoo-commits

commit:     9aca0eedfea36cb6a2a5203591f4d20291a06675
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 11 13:54:24 2018 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Dec 11 13:54:34 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9aca0eed

gnome-base/nautilus: turn tracker support into a boolean

Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org>

 .../files/3.26.4-tracker-support-optional.patch    | 30 +++++++++-------------
 gnome-base/nautilus/nautilus-3.26.4-r1.ebuild      |  2 +-
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch b/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch
index 61eacc2a..f3b58689 100644
--- a/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch
+++ b/gnome-base/nautilus/files/3.26.4-tracker-support-optional.patch
@@ -1,18 +1,18 @@
-From 664c66bd231c5d0ac20f6f4f14be461bfb206a1e Mon Sep 17 00:00:00 2001
+From a87d6c0c7bdf52f5c1b73972e850c0ce0e1d3043 Mon Sep 17 00:00:00 2001
 From: Gilles Dartiguelongue <eva@gentoo.org>
 Date: Sun, 27 May 2018 13:54:38 +0200
 Subject: [PATCH] Make tracker support optional
 
 ---
  config.h.meson                      |  1 +
- meson.build                         | 15 ++++++++++++---
- meson_options.txt                   |  5 +++++
+ meson.build                         | 10 +++++++---
+ meson_options.txt                   |  4 ++++
  src/meson.build                     | 19 ++++++++++++-------
  src/nautilus-file-undo-operations.c |  4 ++++
  src/nautilus-file.c                 |  2 ++
  src/nautilus-files-view.c           |  4 ++++
  src/nautilus-search-engine.c        | 14 ++++++++++++++
- 8 files changed, 54 insertions(+), 10 deletions(-)
+ 8 files changed, 48 insertions(+), 10 deletions(-)
 
 diff --git a/config.h.meson b/config.h.meson
 index 4f5cb5848..58d71e96f 100644
@@ -27,10 +27,10 @@ index 4f5cb5848..58d71e96f 100644
  #mesondefine ENABLE_PACKAGEKIT
  #mesondefine LOCALEDIR
 diff --git a/meson.build b/meson.build
-index 6256193cc..776111f81 100644
+index 6256193cc..7258e00e1 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -81,9 +81,18 @@ if get_option ('enable-selinux')
+@@ -81,9 +81,13 @@ if get_option ('enable-selinux')
      conf.set10 ('HAVE_SELINUX', true)
  endif
  
@@ -38,32 +38,26 @@ index 6256193cc..776111f81 100644
 -if not tracker_sparql.found()
 -    tracker_sparql = dependency ('tracker-sparql-1.0')
 +tracker_api = get_option ('tracker')
-+if tracker_api == 'disabled'
-+    # pass
-+elif tracker_api == 'auto'
++if tracker_api
 +    tracker_sparql = dependency ('tracker-sparql-2.0', required: false)
 +    if not tracker_sparql.found()
 +        tracker_sparql = dependency ('tracker-sparql-1.0')
 +    endif
-+    conf.set10 ('HAVE_TRACKER', true)
-+else
-+    tracker_sparql = dependency ('tracker-sparql-@0@'.format(tracker_api))
 +    conf.set10 ('HAVE_TRACKER', true)
  endif
  
  if get_option ('enable-xmp')
 diff --git a/meson_options.txt b/meson_options.txt
-index c934dd8b1..d2ba885a2 100644
+index c934dd8b1..0c23c7921 100644
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -8,6 +8,11 @@ option ('enable-exif',
+@@ -8,6 +8,10 @@ option ('enable-exif',
          type: 'boolean',
          value: false,
          description: 'enable EXIF support')
 +option ('tracker',
-+        type: 'combo',
-+        choices: ['auto', '1.0', '2.0', 'disabled'],
-+        value: 'auto',
++        type: 'boolean',
++        value: true,
 +        description: 'enable bulk renames and search using Tracker')
  option ('enable-xmp',
          type: 'boolean',
@@ -267,5 +261,5 @@ index 209bd4f80..436cd7471 100644
      priv->model = nautilus_search_engine_model_new ();
      connect_provider_signals (engine, NAUTILUS_SEARCH_PROVIDER (priv->model));
 -- 
-2.17.0
+2.19.2
 

diff --git a/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild b/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild
index 716a0347..80e0ab5a 100644
--- a/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild
+++ b/gnome-base/nautilus/nautilus-3.26.4-r1.ebuild
@@ -77,7 +77,7 @@ src_configure() {
 	local emesonargs=(
 		"-Denable-desktop=true"
 		"-Denable-profiling=false"
-		"-Dtracker=$(usex tracker auto disabled)"
+		$(meson_use tracker)
 		$(meson_use gtk-doc enable-gtk-doc)
 		$(meson_use exif enable-exif)
 		$(meson_use packagekit enable-packagekit)


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-12-11 13:54 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-30 18:39 [gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/ Nirbheek Chauhan
  -- strict thread matches above, loose matches on Subject: below --
2012-04-02  6:43 Alexandre Restovtsev
2012-08-27  7:11 Priit Laes
2012-09-05 15:49 Nirbheek Chauhan
2012-09-30  3:24 Alexandre Rostovtsev
2015-04-26 14:01 Ole Reifschneider
2018-09-16 15:25 Sobhan Mohammadpour
2018-12-11 13:54 Gilles Dartiguelongue

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox