| 1 |
commit: 9c30e8a9f005f639ee79aa1e830e0192e2a29e57 |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 30 03:22:51 2012 +0000 |
| 4 |
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 30 03:22:51 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9c30e8a9 |
| 7 |
|
| 8 |
gnome-base/nautilus: 3.5.92 → 3.6.0 |
| 9 |
|
| 10 |
Update license. Restrict tests since they fail under Xvfb (but succeed |
| 11 |
when building manually). |
| 12 |
|
| 13 |
--- |
| 14 |
.../nautilus/files/nautilus-3.5.91-delete.patch | 19 +++++++++++-------- |
| 15 |
...autilus-3.5.92.ebuild => nautilus-3.6.0.ebuild} | 12 +++++++----- |
| 16 |
gnome-base/nautilus/nautilus-9999.ebuild | 12 +++++++----- |
| 17 |
3 files changed, 25 insertions(+), 18 deletions(-) |
| 18 |
|
| 19 |
diff --git a/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch b/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch |
| 20 |
index 6971c39..072b34e 100644 |
| 21 |
--- a/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch |
| 22 |
+++ b/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch |
| 23 |
@@ -1,20 +1,23 @@ |
| 24 |
+From 92af7beb790ad9181e5a6a89ac52f177354536f2 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Alexandre Rostovtsev <tetromino@g.o> |
| 26 |
+Date: Thu, 8 Dec 2011 18:39:28 -0500 |
| 27 |
+Subject: [PATCH] Delete key should delete files |
| 28 |
+ |
| 29 |
Make the Delete key delete files like in nautilus-2.x and every other |
| 30 |
file manager on the planet. Note: the nautilus-3 Ctrl+Delete shortcut |
| 31 |
will also continue to work. |
| 32 |
|
| 33 |
https://bugzilla.gnome.org/show_bug.cgi?id=647048 |
| 34 |
https://bugs.gentoo.org/show_bug.cgi?id=393663 |
| 35 |
- |
| 36 |
-Original Author: Alexandre Rostovtsev <tetromino@g.o> |
| 37 |
--- |
| 38 |
- src/nautilus-view.c | 6 +++++- |
| 39 |
- 1 files changed, 5 insertions(+), 1 deletions(-) |
| 40 |
+ src/nautilus-view.c | 6 +++++- |
| 41 |
+ 1 file changed, 5 insertions(+), 1 deletion(-) |
| 42 |
|
| 43 |
diff --git a/src/nautilus-view.c b/src/nautilus-view.c |
| 44 |
-index dca1413..f3928db 100644 |
| 45 |
+index f51d916..0a50994 100644 |
| 46 |
--- a/src/nautilus-view.c |
| 47 |
+++ b/src/nautilus-view.c |
| 48 |
-@@ -7238,7 +7238,7 @@ |
| 49 |
+@@ -7237,7 +7237,7 @@ static const GtkActionEntry directory_view_entries[] = { |
| 50 |
/* tooltip */ NULL, |
| 51 |
G_CALLBACK (action_rename_select_all_callback) }, |
| 52 |
/* name, stock id */ { NAUTILUS_ACTION_TRASH, NULL, |
| 53 |
@@ -23,7 +26,7 @@ index dca1413..f3928db 100644 |
| 54 |
/* tooltip */ N_("Move each selected item to the Trash"), |
| 55 |
G_CALLBACK (action_trash_callback) }, |
| 56 |
/* name, stock id */ { NAUTILUS_ACTION_DELETE, NULL, |
| 57 |
-@@ -9687,8 +9687,12 @@ nautilus_view_class_init (NautilusViewClass *klass) |
| 58 |
+@@ -9895,8 +9895,12 @@ nautilus_view_class_init (NautilusViewClass *klass) |
| 59 |
binding_set = gtk_binding_set_by_class (klass); |
| 60 |
gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_CONTROL_MASK, |
| 61 |
"trash", 0); |
| 62 |
@@ -37,5 +40,5 @@ index dca1413..f3928db 100644 |
| 63 |
"delete", 0); |
| 64 |
} |
| 65 |
-- |
| 66 |
-1.7.8 |
| 67 |
+1.7.12 |
| 68 |
|
| 69 |
|
| 70 |
diff --git a/gnome-base/nautilus/nautilus-3.5.92.ebuild b/gnome-base/nautilus/nautilus-3.6.0.ebuild |
| 71 |
similarity index 92% |
| 72 |
rename from gnome-base/nautilus/nautilus-3.5.92.ebuild |
| 73 |
rename to gnome-base/nautilus/nautilus-3.6.0.ebuild |
| 74 |
index 774cf38..fa76bcf 100644 |
| 75 |
--- a/gnome-base/nautilus/nautilus-3.5.92.ebuild |
| 76 |
+++ b/gnome-base/nautilus/nautilus-3.6.0.ebuild |
| 77 |
@@ -14,7 +14,7 @@ fi |
| 78 |
DESCRIPTION="A file manager for the GNOME desktop" |
| 79 |
HOMEPAGE="http://live.gnome.org/Nautilus" |
| 80 |
|
| 81 |
-LICENSE="GPL-2 LGPL-2 FDL-1.1" |
| 82 |
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1" |
| 83 |
SLOT="0" |
| 84 |
if [[ ${PV} = 9999 ]]; then |
| 85 |
KEYWORDS="" |
| 86 |
@@ -24,6 +24,10 @@ fi |
| 87 |
# profiling? |
| 88 |
IUSE="doc exif gnome +introspection packagekit +previewer sendto tracker xmp" |
| 89 |
|
| 90 |
+# FIXME: tests fails under Xvfb, but pass when building manually |
| 91 |
+# "FAIL: check failed in nautilus-file.c, line 8307" |
| 92 |
+RESTRICT="test" |
| 93 |
+ |
| 94 |
# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 |
| 95 |
# and 2.30.0 |
| 96 |
COMMON_DEPEND=">=dev-libs/glib-2.33.13:2 |
| 97 |
@@ -45,7 +49,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.13:2 |
| 98 |
xmp? ( >=media-libs/exempi-2.1.0 )" |
| 99 |
DEPEND="${COMMON_DEPEND} |
| 100 |
>=dev-lang/perl-5 |
| 101 |
- >=dev-util/gdbus-codegen-2.31.0 |
| 102 |
+ >=dev-util/gdbus-codegen-2.33 |
| 103 |
>=dev-util/intltool-0.40.1 |
| 104 |
sys-devel/gettext |
| 105 |
virtual/pkgconfig |
| 106 |
@@ -91,9 +95,7 @@ src_prepare() { |
| 107 |
} |
| 108 |
|
| 109 |
src_test() { |
| 110 |
- addpredict "/root/.gnome2_private" |
| 111 |
- unset SESSION_MANAGER |
| 112 |
- unset ORBIT_SOCKETDIR |
| 113 |
+ gnome2_environment_reset |
| 114 |
unset DBUS_SESSION_BUS_ADDRESS |
| 115 |
export GSETTINGS_BACKEND="memory" |
| 116 |
Xemake check |
| 117 |
|
| 118 |
diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-9999.ebuild |
| 119 |
index 774cf38..fa76bcf 100644 |
| 120 |
--- a/gnome-base/nautilus/nautilus-9999.ebuild |
| 121 |
+++ b/gnome-base/nautilus/nautilus-9999.ebuild |
| 122 |
@@ -14,7 +14,7 @@ fi |
| 123 |
DESCRIPTION="A file manager for the GNOME desktop" |
| 124 |
HOMEPAGE="http://live.gnome.org/Nautilus" |
| 125 |
|
| 126 |
-LICENSE="GPL-2 LGPL-2 FDL-1.1" |
| 127 |
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1" |
| 128 |
SLOT="0" |
| 129 |
if [[ ${PV} = 9999 ]]; then |
| 130 |
KEYWORDS="" |
| 131 |
@@ -24,6 +24,10 @@ fi |
| 132 |
# profiling? |
| 133 |
IUSE="doc exif gnome +introspection packagekit +previewer sendto tracker xmp" |
| 134 |
|
| 135 |
+# FIXME: tests fails under Xvfb, but pass when building manually |
| 136 |
+# "FAIL: check failed in nautilus-file.c, line 8307" |
| 137 |
+RESTRICT="test" |
| 138 |
+ |
| 139 |
# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 |
| 140 |
# and 2.30.0 |
| 141 |
COMMON_DEPEND=">=dev-libs/glib-2.33.13:2 |
| 142 |
@@ -45,7 +49,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.13:2 |
| 143 |
xmp? ( >=media-libs/exempi-2.1.0 )" |
| 144 |
DEPEND="${COMMON_DEPEND} |
| 145 |
>=dev-lang/perl-5 |
| 146 |
- >=dev-util/gdbus-codegen-2.31.0 |
| 147 |
+ >=dev-util/gdbus-codegen-2.33 |
| 148 |
>=dev-util/intltool-0.40.1 |
| 149 |
sys-devel/gettext |
| 150 |
virtual/pkgconfig |
| 151 |
@@ -91,9 +95,7 @@ src_prepare() { |
| 152 |
} |
| 153 |
|
| 154 |
src_test() { |
| 155 |
- addpredict "/root/.gnome2_private" |
| 156 |
- unset SESSION_MANAGER |
| 157 |
- unset ORBIT_SOCKETDIR |
| 158 |
+ gnome2_environment_reset |
| 159 |
unset DBUS_SESSION_BUS_ADDRESS |
| 160 |
export GSETTINGS_BACKEND="memory" |
| 161 |
Xemake check |
Archives