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 6FD97138010 for ; Sun, 30 Sep 2012 03:24:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7DC1621C007; Sun, 30 Sep 2012 03:24:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9F36D21C007 for ; Sun, 30 Sep 2012 03:24:35 +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 E36B333C4CA for ; Sun, 30 Sep 2012 03:24:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6AA3CE5441 for ; Sun, 30 Sep 2012 03:24:32 +0000 (UTC) From: "Alexandre Rostovtsev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Rostovtsev" Message-ID: <1348975371.9c30e8a9f005f639ee79aa1e830e0192e2a29e57.tetromino@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.5.91-delete.patch gnome-base/nautilus/nautilus-3.5.92.ebuild gnome-base/nautilus/nautilus-3.6.0.ebuild gnome-base/nautilus/nautilus-9999.ebuild X-VCS-Directories: gnome-base/nautilus/ gnome-base/nautilus/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: 9c30e8a9f005f639ee79aa1e830e0192e2a29e57 X-VCS-Branch: master Date: Sun, 30 Sep 2012 03:24:32 +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: 0d7827cf-50ce-45fa-86c6-0f79871f7534 X-Archives-Hash: e358157a171efd97d0a9d0bc6c65261a commit: 9c30e8a9f005f639ee79aa1e830e0192e2a29e57 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Sun Sep 30 03:22:51 2012 +0000 Commit: Alexandre Rostovtsev gentoo 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 +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(-) + 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