| 1 |
commit: d94877b0775d4a8986ae3bddc2e61f748707813a |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 2 06:01:38 2012 +0000 |
| 4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Apr 2 06:01:38 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d94877b0 |
| 7 |
|
| 8 |
gnome-base/nautilus: add 3.4.0 |
| 9 |
|
| 10 |
--- |
| 11 |
.../nautilus/files/nautilus-3.2.1-delete.patch | 44 ++++++++++++++++++++ |
| 12 |
.../nautilus-3.2.1-key-press-forwarding.patch | 40 ++++++++++++++++++ |
| 13 |
...{nautilus-9999.ebuild => nautilus-3.4.0.ebuild} | 21 +++++++--- |
| 14 |
gnome-base/nautilus/nautilus-9999.ebuild | 21 +++++++--- |
| 15 |
4 files changed, 114 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/gnome-base/nautilus/files/nautilus-3.2.1-delete.patch b/gnome-base/nautilus/files/nautilus-3.2.1-delete.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..7720a6b |
| 20 |
--- /dev/null |
| 21 |
+++ b/gnome-base/nautilus/files/nautilus-3.2.1-delete.patch |
| 22 |
@@ -0,0 +1,44 @@ |
| 23 |
+From 0c86d481ac075d733ddffae7a67aa23b0b4d54c5 Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Alexandre Rostovtsev <tetromino@g.o> |
| 25 |
+Date: Thu, 8 Dec 2011 18:39:28 -0500 |
| 26 |
+Subject: [PATCH] Delete key should delete files |
| 27 |
+ |
| 28 |
+Make the Delete key delete files like in nautilus-2.x and every other |
| 29 |
+file manager on the planet. Note: the nautilus-3 Ctrl+Delete shortcut |
| 30 |
+will also continue to work. |
| 31 |
+ |
| 32 |
+https://bugzilla.gnome.org/show_bug.cgi?id=647048 |
| 33 |
+https://bugs.gentoo.org/show_bug.cgi?id=393663 |
| 34 |
+--- |
| 35 |
+ src/nautilus-view.c | 6 +++++- |
| 36 |
+ 1 files changed, 5 insertions(+), 1 deletions(-) |
| 37 |
+ |
| 38 |
+diff --git a/src/nautilus-view.c b/src/nautilus-view.c |
| 39 |
+index dca1413..f3928db 100644 |
| 40 |
+--- a/src/nautilus-view.c |
| 41 |
++++ b/src/nautilus-view.c |
| 42 |
+@@ -7014,7 +7014,7 @@ static const GtkActionEntry directory_view_entries[] = { |
| 43 |
+ /* tooltip */ NULL, |
| 44 |
+ G_CALLBACK (action_rename_select_all_callback) }, |
| 45 |
+ /* name, stock id */ { "Trash", NULL, |
| 46 |
+- /* label, accelerator */ N_("Mo_ve to Trash"), "<control>Delete", |
| 47 |
++ /* label, accelerator */ N_("Mo_ve to Trash"), "Delete", |
| 48 |
+ /* tooltip */ N_("Move each selected item to the Trash"), |
| 49 |
+ G_CALLBACK (action_trash_callback) }, |
| 50 |
+ /* name, stock id */ { "Delete", NULL, |
| 51 |
+@@ -9687,8 +9687,12 @@ nautilus_view_class_init (NautilusViewClass *klass) |
| 52 |
+ binding_set = gtk_binding_set_by_class (klass); |
| 53 |
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_CONTROL_MASK, |
| 54 |
+ "trash", 0); |
| 55 |
++ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, 0, |
| 56 |
++ "trash", 0); |
| 57 |
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_CONTROL_MASK, |
| 58 |
+ "trash", 0); |
| 59 |
++ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, 0, |
| 60 |
++ "trash", 0); |
| 61 |
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_SHIFT_MASK, |
| 62 |
+ "delete", 0); |
| 63 |
+ } |
| 64 |
+-- |
| 65 |
+1.7.8 |
| 66 |
+ |
| 67 |
|
| 68 |
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 |
| 69 |
new file mode 100644 |
| 70 |
index 0000000..4ad417e |
| 71 |
--- /dev/null |
| 72 |
+++ b/gnome-base/nautilus/files/nautilus-3.2.1-key-press-forwarding.patch |
| 73 |
@@ -0,0 +1,40 @@ |
| 74 |
+From d4e2a297589e35a9545d996a4f0a61d22152e4c7 Mon Sep 17 00:00:00 2001 |
| 75 |
+From: Alexandre Rostovtsev <tetromino@g.o> |
| 76 |
+Date: Wed, 14 Dec 2011 20:43:08 -0500 |
| 77 |
+Subject: [PATCH] Do not handle keyboard shortcuts in NautilusWindow if an |
| 78 |
+ editable widget is focused |
| 79 |
+ |
| 80 |
+If an editable widget (e.g. GtkEntry in the location bar or search bar) is |
| 81 |
+focused, NautilusWindow should forward all key press events to it since the |
| 82 |
+window's accelerator bindings may conflict with the widget's. |
| 83 |
+ |
| 84 |
+https://bugzilla.gnome.org/show_bug.cgi?id=664573 |
| 85 |
+--- |
| 86 |
+ src/nautilus-window.c | 11 ++++++----- |
| 87 |
+ 1 files changed, 6 insertions(+), 5 deletions(-) |
| 88 |
+ |
| 89 |
+diff --git a/src/nautilus-window.c b/src/nautilus-window.c |
| 90 |
+index c3a3c2c..e8646d8 100644 |
| 91 |
+--- a/src/nautilus-window.c |
| 92 |
++++ b/src/nautilus-window.c |
| 93 |
+@@ -1117,11 +1117,12 @@ nautilus_window_key_press_event (GtkWidget *widget, |
| 94 |
+ active_slot = nautilus_window_get_active_slot (window); |
| 95 |
+ view = active_slot->content_view; |
| 96 |
+ |
| 97 |
+- if (view != NULL && nautilus_view_get_is_renaming (view)) { |
| 98 |
+- /* if we're renaming, just forward the event to the |
| 99 |
+- * focused widget and return. We don't want to process the window |
| 100 |
+- * accelerator bindings, as they might conflict with the |
| 101 |
+- * editable widget bindings. |
| 102 |
++ if ((view != NULL && (nautilus_view_get_is_renaming (view))) || GTK_IS_EDITABLE (gtk_window_get_focus (window))) { |
| 103 |
++ /* If we're renaming, or editing a GtkEntry (e.g. location or |
| 104 |
++ * search bar), just forward the event to the focused widget |
| 105 |
++ * and return. |
| 106 |
++ * We don't want to process the window accelerator bindings, |
| 107 |
++ * as they might conflict with the editable widget bindings. |
| 108 |
+ */ |
| 109 |
+ if (gtk_window_propagate_key_event (GTK_WINDOW (window), event)) { |
| 110 |
+ return TRUE; |
| 111 |
+-- |
| 112 |
+1.7.8 |
| 113 |
+ |
| 114 |
|
| 115 |
diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-3.4.0.ebuild |
| 116 |
similarity index 83% |
| 117 |
copy from gnome-base/nautilus/nautilus-9999.ebuild |
| 118 |
copy to gnome-base/nautilus/nautilus-3.4.0.ebuild |
| 119 |
index e16b5c3..5cbc206 100644 |
| 120 |
--- a/gnome-base/nautilus/nautilus-9999.ebuild |
| 121 |
+++ b/gnome-base/nautilus/nautilus-3.4.0.ebuild |
| 122 |
@@ -1,4 +1,4 @@ |
| 123 |
-# Copyright 1999-2011 Gentoo Foundation |
| 124 |
+# Copyright 1999-2012 Gentoo Foundation |
| 125 |
# Distributed under the terms of the GNU General Public License v2 |
| 126 |
# $Header: $ |
| 127 |
|
| 128 |
@@ -6,7 +6,7 @@ EAPI="4" |
| 129 |
GCONF_DEBUG="no" |
| 130 |
GNOME2_LA_PUNT="yes" |
| 131 |
|
| 132 |
-inherit gnome2 virtualx |
| 133 |
+inherit eutils gnome2 virtualx |
| 134 |
if [[ ${PV} = 9999 ]]; then |
| 135 |
inherit gnome2-live |
| 136 |
fi |
| 137 |
@@ -25,9 +25,9 @@ IUSE="doc exif gnome +introspection packagekit +previewer sendto tracker xmp" |
| 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.30.0:2 |
| 142 |
+COMMON_DEPEND=">=dev-libs/glib-2.31.9:2 |
| 143 |
>=x11-libs/pango-1.28.3 |
| 144 |
- >=x11-libs/gtk+-3.1.6:3[introspection?] |
| 145 |
+ >=x11-libs/gtk+-3.3.17:3[introspection?] |
| 146 |
>=dev-libs/libxml2-2.7.8:2 |
| 147 |
>=gnome-base/gnome-desktop-3.0.0:3 |
| 148 |
|
| 149 |
@@ -44,7 +44,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.30.0:2 |
| 150 |
xmp? ( >=media-libs/exempi-2.1.0 )" |
| 151 |
DEPEND="${COMMON_DEPEND} |
| 152 |
>=dev-lang/perl-5 |
| 153 |
- >=dev-util/gdbus-codegen-2.30.0 |
| 154 |
+ >=dev-util/gdbus-codegen-2.31.0 |
| 155 |
>=dev-util/pkgconfig-0.9 |
| 156 |
>=dev-util/intltool-0.40.1 |
| 157 |
sys-devel/gettext |
| 158 |
@@ -79,6 +79,13 @@ pkg_setup() { |
| 159 |
src_prepare() { |
| 160 |
gnome2_src_prepare |
| 161 |
|
| 162 |
+ # Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work); |
| 163 |
+ # bug #393663 |
| 164 |
+ epatch "${FILESDIR}/${PN}-3.2.1-delete.patch" |
| 165 |
+ |
| 166 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=664573 |
| 167 |
+ epatch "${FILESDIR}/${PN}-3.2.1-key-press-forwarding.patch" |
| 168 |
+ |
| 169 |
# Remove crazy CFLAGS |
| 170 |
sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \ |
| 171 |
|| die "sed 1 failed" |
| 172 |
@@ -89,7 +96,9 @@ src_test() { |
| 173 |
unset SESSION_MANAGER |
| 174 |
unset ORBIT_SOCKETDIR |
| 175 |
unset DBUS_SESSION_BUS_ADDRESS |
| 176 |
- Xemake check || die "Test phase failed" |
| 177 |
+ export GSETTINGS_BACKEND="memory" |
| 178 |
+ Xemake check |
| 179 |
+ unset GSETTINGS_BACKEND |
| 180 |
} |
| 181 |
|
| 182 |
pkg_postinst() { |
| 183 |
|
| 184 |
diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-9999.ebuild |
| 185 |
index e16b5c3..5cbc206 100644 |
| 186 |
--- a/gnome-base/nautilus/nautilus-9999.ebuild |
| 187 |
+++ b/gnome-base/nautilus/nautilus-9999.ebuild |
| 188 |
@@ -1,4 +1,4 @@ |
| 189 |
-# Copyright 1999-2011 Gentoo Foundation |
| 190 |
+# Copyright 1999-2012 Gentoo Foundation |
| 191 |
# Distributed under the terms of the GNU General Public License v2 |
| 192 |
# $Header: $ |
| 193 |
|
| 194 |
@@ -6,7 +6,7 @@ EAPI="4" |
| 195 |
GCONF_DEBUG="no" |
| 196 |
GNOME2_LA_PUNT="yes" |
| 197 |
|
| 198 |
-inherit gnome2 virtualx |
| 199 |
+inherit eutils gnome2 virtualx |
| 200 |
if [[ ${PV} = 9999 ]]; then |
| 201 |
inherit gnome2-live |
| 202 |
fi |
| 203 |
@@ -25,9 +25,9 @@ IUSE="doc exif gnome +introspection packagekit +previewer sendto tracker xmp" |
| 204 |
|
| 205 |
# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 |
| 206 |
# and 2.30.0 |
| 207 |
-COMMON_DEPEND=">=dev-libs/glib-2.30.0:2 |
| 208 |
+COMMON_DEPEND=">=dev-libs/glib-2.31.9:2 |
| 209 |
>=x11-libs/pango-1.28.3 |
| 210 |
- >=x11-libs/gtk+-3.1.6:3[introspection?] |
| 211 |
+ >=x11-libs/gtk+-3.3.17:3[introspection?] |
| 212 |
>=dev-libs/libxml2-2.7.8:2 |
| 213 |
>=gnome-base/gnome-desktop-3.0.0:3 |
| 214 |
|
| 215 |
@@ -44,7 +44,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.30.0:2 |
| 216 |
xmp? ( >=media-libs/exempi-2.1.0 )" |
| 217 |
DEPEND="${COMMON_DEPEND} |
| 218 |
>=dev-lang/perl-5 |
| 219 |
- >=dev-util/gdbus-codegen-2.30.0 |
| 220 |
+ >=dev-util/gdbus-codegen-2.31.0 |
| 221 |
>=dev-util/pkgconfig-0.9 |
| 222 |
>=dev-util/intltool-0.40.1 |
| 223 |
sys-devel/gettext |
| 224 |
@@ -79,6 +79,13 @@ pkg_setup() { |
| 225 |
src_prepare() { |
| 226 |
gnome2_src_prepare |
| 227 |
|
| 228 |
+ # Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work); |
| 229 |
+ # bug #393663 |
| 230 |
+ epatch "${FILESDIR}/${PN}-3.2.1-delete.patch" |
| 231 |
+ |
| 232 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=664573 |
| 233 |
+ epatch "${FILESDIR}/${PN}-3.2.1-key-press-forwarding.patch" |
| 234 |
+ |
| 235 |
# Remove crazy CFLAGS |
| 236 |
sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \ |
| 237 |
|| die "sed 1 failed" |
| 238 |
@@ -89,7 +96,9 @@ src_test() { |
| 239 |
unset SESSION_MANAGER |
| 240 |
unset ORBIT_SOCKETDIR |
| 241 |
unset DBUS_SESSION_BUS_ADDRESS |
| 242 |
- Xemake check || die "Test phase failed" |
| 243 |
+ export GSETTINGS_BACKEND="memory" |
| 244 |
+ Xemake check |
| 245 |
+ unset GSETTINGS_BACKEND |
| 246 |
} |
| 247 |
|
| 248 |
pkg_postinst() { |
Archives