From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 182BE138010 for ; Wed, 5 Sep 2012 15:51:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A271021C052; Wed, 5 Sep 2012 15:49:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5F9AE21C047 for ; Wed, 5 Sep 2012 15:49:03 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9788533D7E5 for ; Wed, 5 Sep 2012 15:49:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4A439E544B for ; Wed, 5 Sep 2012 15:49:00 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <1346860102.b49c9b499d9aeac781b3a7bd78ec855c3f683d63.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/, gnome-base/nautilus/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/nautilus/files/nautilus-3.2.1-delete.patch gnome-base/nautilus/files/nautilus-3.5.91-delete.patch gnome-base/nautilus/nautilus-3.5.90.ebuild gnome-base/nautilus/nautilus-3.5.91.ebuild gnome-base/nautilus/nautilus-9999.ebuild X-VCS-Directories: gnome-base/nautilus/ gnome-base/nautilus/files/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: b49c9b499d9aeac781b3a7bd78ec855c3f683d63 X-VCS-Branch: master Date: Wed, 5 Sep 2012 15:49:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5741929f-b6d7-4713-a840-5c0c6fa824e6 X-Archives-Hash: f2508e85e0473fdfdca6d647b7588041 commit: b49c9b499d9aeac781b3a7bd78ec855c3f683d63 Author: Nirbheek Chauhan gentoo org> AuthorDate: Wed Sep 5 01:45:21 2012 +0000 Commit: Nirbheek Chauhan gentoo 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 -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 --- 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"), "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 \