Fix mouse-scrolling not working unless compiled with -O0. Changeset 329 from upstream.

(Portage version: 2.2_rc28/cvs/Linux x86_64)

3 files changed, 114 insertions, 1 deletions

diff --git a/app-text/epdfview/ChangeLog b/app-text/epdfview/ChangeLog
index 77c6f23a3345..a83444143a10 100644
--- a/app-text/epdfview/ChangeLog
+++ b/app-text/epdfview/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/epdfview
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/ChangeLog,v 1.35 2009/04/10 23:20:31 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/ChangeLog,v 1.36 2009/04/26 13:22:25 loki_val Exp $
+
+*epdfview-0.1.7-r2 (26 Apr 2009)
+
+  26 Apr 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/epdfview-0.1.7-mouse-scrolling.patch, +epdfview-0.1.7-r2.ebuild:
+  Fix mouse-scrolling not working unless compiled with -O0. Changeset 329
+  from upstream.
 
   10 Apr 2009; Peter Alfredsen <loki_val@gentoo.org>
   epdfview-0.1.6-r1.ebuild, epdfview-0.1.7-r1.ebuild:
diff --git a/app-text/epdfview/epdfview-0.1.7-r2.ebuild b/app-text/epdfview/epdfview-0.1.7-r2.ebuild
new file mode 100644
index 000000000000..15de84f0ee04
--- /dev/null
+++ b/app-text/epdfview/epdfview-0.1.7-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/epdfview/epdfview-0.1.7-r2.ebuild,v 1.1 2009/04/26 13:22:25 loki_val Exp $
+
+EAPI="2"
+
+inherit gnome2 flag-o-matic eutils
+
+DESCRIPTION="Lightweight PDF viewer using Poppler and GTK+ libraries."
+HOMEPAGE="http://trac.emma-soft.com/epdfview/"
+SRC_URI="http://trac.emma-soft.com/epdfview/chrome/site/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="cups nls test"
+
+RDEPEND=">=virtual/poppler-glib-0.5.0[cairo]
+	>=x11-libs/gtk+-2.6
+	cups? ( >=net-print/cups-1.1 )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	nls? ( sys-devel/gettext )
+	test? ( dev-util/cppunit )
+	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
+
+pkg_setup() {
+	G2CONF=$(use_with cups)
+	DOCS="AUTHORS NEWS README THANKS"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	sed -i -e 's:Icon=icon_epdfview-48:Icon=epdfview:' data/epdfview.desktop || die "desktop sed failed"
+	epatch "${FILESDIR}"/${PN}-0.1.7-mouse-scrolling.patch
+}
+
+src_install() {
+	gnome2_src_install
+	for size in 24 32 48
+	do
+		icnsdir="/usr/share/icons/hicolor/${size}x${size}/apps/"
+		insinto "${icnsdir}" || die "insinto failed"
+		newins data/icon_epdfview-${size}.png epdfview.png || die "newins failed"
+	done
+}
diff --git a/app-text/epdfview/files/epdfview-0.1.7-mouse-scrolling.patch b/app-text/epdfview/files/epdfview-0.1.7-mouse-scrolling.patch
new file mode 100644
index 000000000000..2622a802ae30
--- /dev/null
+++ b/app-text/epdfview/files/epdfview-0.1.7-mouse-scrolling.patch
@@ -0,0 +1,60 @@
+Index: /trunk/src/gtk/MainView.cxx

+===================================================================

+--- /trunk/src/gtk/MainView.cxx (revision 325)

++++ /trunk/src/gtk/MainView.cxx (revision 329)

+@@ -78,5 +78,5 @@

+ static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);

+ static void main_window_set_page_mode (GtkRadioAction *, GtkRadioAction *, gpointer);

+-static void main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);

++static gboolean main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);

+ 

+ #if defined (HAVE_CUPS)

+@@ -1480,5 +1480,5 @@

+ }

+ 

+-void 

++gboolean 

+ main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data)

+ {

+@@ -1487,10 +1487,17 @@

+     MainPter *pter = (MainPter *)data;

+     // Only zoom when the CTRL-Button is down...

+-    if ( !(event->state & GDK_CONTROL_MASK) ) return;

+-    if ( event->direction == GDK_SCROLL_UP ) {

+-        pter->zoomInActivated ();

+-    } else if ( event->direction == GDK_SCROLL_DOWN ) {

+-        pter->zoomOutActivated ();

+-    }

+-}

+-

++    if ( GDK_CONTROL_MASK == (event->state & GDK_CONTROL_MASK) )

++    {

++        if ( event->direction == GDK_SCROLL_UP )

++        {

++            pter->zoomInActivated ();

++        }

++        else if ( event->direction == GDK_SCROLL_DOWN )

++        {

++            pter->zoomOutActivated ();

++        }

++        return TRUE;

++    }

++    return FALSE;

++}

++

+Index: /trunk/src/gtk/PageView.cxx

+===================================================================

+--- /trunk/src/gtk/PageView.cxx (revision 325)

++++ /trunk/src/gtk/PageView.cxx (revision 329)

+@@ -528,11 +528,4 @@

+     g_assert ( NULL != data && "The data parameter is NULL.");

+ 

+-    // don't scroll when the CRTL-Button is down, because then the page should

+-    // actually be zoomed and not scrolled. Zooming is handelt by the MainView

+-    // class.

+-    if ( event->state & GDK_CONTROL_MASK )

+-    {

+-        return FALSE;

+-    }

+     PagePter *pter = (PagePter *)data;

+     GtkAdjustment *adjustment =