Add prev/back navigation with Left and Right keys (from 'master'), drop old

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 54 insertions, 4 deletions

diff --git a/gnome-extra/gnome-documents/ChangeLog b/gnome-extra/gnome-documents/ChangeLog
index 453cfe6b446f..b1d205c061d5 100644
--- a/gnome-extra/gnome-documents/ChangeLog
+++ b/gnome-extra/gnome-documents/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-documents
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-documents/ChangeLog,v 1.16 2013/06/10 07:56:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-documents/ChangeLog,v 1.17 2013/06/11 10:49:17 pacho Exp $
+
+*gnome-documents-3.8.3-r1 (11 Jun 2013)
+
+  11 Jun 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gnome-documents-3.8.3-navigation-keys.patch,
+  +gnome-documents-3.8.3-r1.ebuild, -gnome-documents-3.8.2.1.ebuild:
+  Add prev/back navigation with Left and Right keys (from 'master'), drop old
 
 *gnome-documents-3.8.3 (10 Jun 2013)
 
diff --git a/gnome-extra/gnome-documents/files/gnome-documents-3.8.3-navigation-keys.patch b/gnome-extra/gnome-documents/files/gnome-documents-3.8.3-navigation-keys.patch
new file mode 100644
index 000000000000..83fad01c0311
--- /dev/null
+++ b/gnome-extra/gnome-documents/files/gnome-documents-3.8.3-navigation-keys.patch
@@ -0,0 +1,36 @@
+From 0ec5cf5b302497b6f51d6e741e9f640cdc4b48c7 Mon Sep 17 00:00:00 2001
+From: Alessandro Campagni <alessandro.campagni@gmail.com>
+Date: Mon, 29 Apr 2013 17:57:53 +0000
+Subject: preview: add prev/back navigation with Left and Right keys
+
+https://bugzilla.gnome.org/show_bug.cgi?id=696836
+---
+diff --git a/src/preview.js b/src/preview.js
+index 920f007..c4fd463 100644
+--- a/src/preview.js
++++ b/src/preview.js
+@@ -394,15 +394,18 @@ const PreviewView = new Lang.Class({
+     _onKeyPressEvent: function(widget, event) {
+         let keyval = event.get_keyval()[1];
+         let state = event.get_state()[1];
++        let def_mod_mask = Gtk.accelerator_get_default_mod_mask();
+ 
+-        if ((keyval == Gdk.KEY_Page_Up) &&
+-            ((state & Gdk.ModifierType.CONTROL_MASK) != 0)) {
++        if (((keyval == Gdk.KEY_Page_Up) &&
++            ((state & Gdk.ModifierType.CONTROL_MASK) != 0)) ||
++            ((keyval == Gdk.KEY_Left) && ((state & def_mod_mask) == 0))) {
+             this.view.previous_page();
+             return true;
+         }
+ 
+-        if ((keyval == Gdk.KEY_Page_Down) &&
+-            ((state & Gdk.ModifierType.CONTROL_MASK) != 0)) {
++        if (((keyval == Gdk.KEY_Page_Down) &&
++            ((state & Gdk.ModifierType.CONTROL_MASK) != 0)) ||
++            ((keyval == Gdk.KEY_Right) && ((state & def_mod_mask) == 0))) {
+             this.view.next_page();
+             return true;
+         }
+--
+cgit v0.9.2
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.8.2.1.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.8.3-r1.ebuild
index d776314c83b4..e810d4bc696b 100644
--- a/gnome-extra/gnome-documents/gnome-documents-3.8.2.1.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-3.8.3-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-documents/gnome-documents-3.8.2.1.ebuild,v 1.1 2013/05/14 21:06:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-documents/gnome-documents-3.8.3-r1.ebuild,v 1.1 2013/06/11 10:49:17 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit eutils gnome2
 
-DESCRIPTION="GNOME document manager"
+DESCRIPTION="A document manager application for GNOME"
 HOMEPAGE="https://live.gnome.org/Design/Apps/Documents"
 
 LICENSE="GPL-2+"
@@ -40,7 +40,14 @@ RDEPEND="${COMMON_DEPEND}
 	x11-themes/gnome-icon-theme-symbolic
 "
 DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 "
+
+src_prepare() {
+	# Add prev/back navigation with Left and Right keys (from 'master')
+	epatch "${FILESDIR}/${PN}-3.8.3-navigation-keys.patch"
+	gnome2_src_prepare
+}