kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add a patch from upstream to unbreak mouse wheel scrolling. While

Browse source 
here, include sysutils/desktop-file-utils/desktopdb.mk.

Bump PKGREVISION to 1.
This commit is contained in:
snj 2009-08-14 23:20:29 +00:00
parent da074cdbfc
commit aa7dc8661e
4 changed files with 69 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
print/epdfview/Makefile
View file

@ -1,7 +1,8 @@
# $NetBSD: Makefile,v 1.7 2009/07/22 09:01:42 wiz Exp $
# $NetBSD: Makefile,v 1.8 2009/08/14 23:20:29 snj Exp $
#
DISTNAME= epdfview-0.1.7
PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= http://trac.emma-soft.com/epdfview/chrome/site/releases/
EXTRACT_SUFX= .tar.bz2
@ -20,5 +21,6 @@ USE_TOOLS+= pkg-config msgfmt
.include "options.mk"
.include "../../print/poppler-glib/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

4
print/epdfview/distinfo
View file

@ -1,5 +1,7 @@
$NetBSD: distinfo,v 1.3 2009/06/04 16:34:36 joerg Exp $
$NetBSD: distinfo,v 1.4 2009/08/14 23:20:29 snj Exp $
SHA1 (epdfview-0.1.7.tar.bz2) = ff46942c285b8e2c28766a38cdfce1a018b4a015
RMD160 (epdfview-0.1.7.tar.bz2) = 485399d1982a3f8128322ee7e13d46225573bae3
Size (epdfview-0.1.7.tar.bz2) = 443609 bytes
SHA1 (patch-aa) = 6c5b2766836cf3610c92feb5fdcc5de0dd75534d
SHA1 (patch-ab) = 67ab5dd3c5c2d4af5e2aeddc77e4714c9e96b008

45
print/epdfview/patches/patch-aa Normal file
View file

@ -0,0 +1,45 @@
$NetBSD: patch-aa,v 1.1 2009/08/14 23:20:29 snj Exp $
--- src/gtk/MainView.cxx.orig 2009-02-28 13:00:55.000000000 -0800
+++ src/gtk/MainView.cxx 2009-08-14 16:10:10.000000000 -0700
@@ -77,7 +77,7 @@ static void main_window_zoom_in_cb (GtkW
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,25 @@ main_window_set_page_mode (GtkRadioActio
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->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;
}

18
print/epdfview/patches/patch-ab Normal file
View file

@ -0,0 +1,18 @@
$NetBSD: patch-ab,v 1.1 2009/08/14 23:20:29 snj Exp $
--- src/gtk/PageView.cxx.orig 2009-02-28 13:00:35.000000000 -0800
+++ src/gtk/PageView.cxx 2009-08-14 16:10:46.000000000 -0700
@@ -527,13 +527,6 @@ page_view_scrolled_cb (GtkWidget *widget
{
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 =
gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget));