[arch-commits] Commit in epdfview/repos (3 files)

[Thayer Williams]

    Date: Saturday, April 11, 2009 @ 01:23:36
  Author: thayer
Revision: 34679

Merged revisions 34678 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/epdfview/trunk

........
  r34678 | thayer | 2009-04-10 22:22:32 -0700 (Fri, 10 Apr 2009) | 2 lines
  
  upgpkg: epdfview 0.1.7-3
      fixed mouse scrolling, courtesy of gentoo
........

Added:
  epdfview/repos/extra-i686/fix-scrolling.patch
    (from rev 34678, epdfview/trunk/fix-scrolling.patch)
Modified:
  epdfview/repos/extra-i686/	(properties)
  epdfview/repos/extra-i686/PKGBUILD

---------------------+
 PKGBUILD            |   10 +++++++---
 fix-scrolling.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)


Property changes on: epdfview/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /epdfview/trunk:1-33907
   + /epdfview/trunk:1-34678

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-11 05:22:32 UTC (rev 34678)
+++ extra-i686/PKGBUILD	2009-04-11 05:23:36 UTC (rev 34679)
@@ -4,7 +4,7 @@
 
 pkgname=epdfview
 pkgver=0.1.7
-pkgrel=2
+pkgrel=3
 pkgdesc="A free lightweight PDF document viewer."
 url="http://www.emma-soft.com/projects/epdfview/"
 arch=('i686' 'x86_64')
@@ -13,13 +13,17 @@
 makedepends=('pkgconfig')
 install=epdfview.install
 source=(http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${pkgver}.tar.bz2
-        epdfview.desktop.patch)
+        epdfview.desktop.patch
+        fix-scrolling.patch)
 md5sums=('1919bb19c16ef0a97d48b0a8303d3c7b'
-         'fbf22bbabdbb7544db615ac5775d57e2')
+         'fbf22bbabdbb7544db615ac5775d57e2'
+         '7a1574e0a8d0bcde316050629fb7bedd')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np0 -i ../epdfview.desktop.patch || return 1
+  patch -Np0 -i ../fix-scrolling.patch || return 1
+
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1

Copied: epdfview/repos/extra-i686/fix-scrolling.patch (from rev 34678, epdfview/trunk/fix-scrolling.patch)
===================================================================
--- extra-i686/fix-scrolling.patch	                        (rev 0)
+++ extra-i686/fix-scrolling.patch	2009-04-11 05:23:36 UTC (rev 34679)
@@ -0,0 +1,33 @@
+--- ./src/gtk/MainView.cxx.old	2009-02-28 22:00:55.000000000 +0100
++++ ./src/gtk/MainView.cxx	2009-03-20 03:12:10.000000000 +0100
+@@ -77,7 +77,7 @@
+ static void main_window_zoom_out_cb (GtkWidget *, gpointer);
+ 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)
+ static void main_window_print_cb (GtkWidget *, gpointer);
+@@ -1479,18 +1479,19 @@
+     pter->setPageMode (mode);
+ }
+ 
+-void 
++gboolean
+ main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data)
+ {
+     g_assert ( NULL != data && "The data parameter is NULL.");
+ 
+     MainPter *pter = (MainPter *)data;
+     // Only zoom when the CTRL-Button is down...
+-    if ( !(event->state & GDK_CONTROL_MASK) ) return;
++    if ( !(event->state & GDK_CONTROL_MASK) ) return FALSE;
+     if ( event->direction == GDK_SCROLL_UP ) {
+         pter->zoomInActivated ();
+     } else if ( event->direction == GDK_SCROLL_DOWN ) {
+         pter->zoomOutActivated ();
+     }
++    return TRUE;
+ }
+