Update to epdfview 0.1.7, based on a diff by brynet at gmail, who also

takes maintainership.
Bring in two patches from upstream svn to fix
http://trac.emma-soft.com/epdfview/ticket/118.
This commit is contained in:
landry 2009-04-04 09:25:25 +00:00
parent cea15ea335
commit 78066ffb46
6 changed files with 89 additions and 19 deletions

View File

@ -1,19 +1,18 @@
# $OpenBSD: Makefile,v 1.10 2009/03/12 18:13:54 sthen Exp $
# $OpenBSD: Makefile,v 1.11 2009/04/04 09:25:25 landry Exp $
COMMENT= lightweight PDF document viewer
DISTNAME= epdfview-0.1.6
PKGNAME= ${DISTNAME}p6
DISTNAME= epdfview-0.1.7
CATEGORIES= print
HOMEPAGE= http://trac.emma-soft.com/epdfview/
MAINTAINER= Vlad Glagolev <stealth@sourcemage.org>
MAINTAINER= Brynet <brynet@gmail.com>
MASTER_SITES= ${HOMEPAGE}chrome/site/releases/
EXTRACT_SUFX= .tar.bz2
# GPL
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -41,10 +40,10 @@ FLAVOR?=
.if ${FLAVOR:L:Mcups}
WANTLIB+= crypto ssl
LIB_DEPENDS+= cups.>=3:cups->=1.2:print/cups
LIB_DEPENDS+= cups.>=3:cups->=1.2:print/cups
CONFIGURE_ARGS+= --with-cups
.else
CONFIGURE_ARGS+= --without-cups
CONFIGURE_ARGS+= --without-cups
.endif
ICONDIR = $(PREFIX)/share/icons/hicolor

View File

@ -1,5 +1,5 @@
MD5 (epdfview-0.1.6.tar.bz2) = zOnttBtKgwjg7w7qJLWhqw==
RMD160 (epdfview-0.1.6.tar.bz2) = aUhM1owdNE38ONMhq9Hgf9IlIeM=
SHA1 (epdfview-0.1.6.tar.bz2) = G7Oh2FsdWxPCSjjBRJEN3DKeDw4=
SHA256 (epdfview-0.1.6.tar.bz2) = YdBBr8lT4FcN2uk0F56S7fgA9p8EPXgFgHOAZQTkE38=
SIZE (epdfview-0.1.6.tar.bz2) = 406037
MD5 (epdfview-0.1.7.tar.bz2) = GRm7GcFu8Kl9SLCoMD08ew==
RMD160 (epdfview-0.1.7.tar.bz2) = SFOZ0ZgqP4EoMi7n4T1GIlVzuuM=
SHA1 (epdfview-0.1.7.tar.bz2) = /0aULChbjiwodmo4zfzhoBi0oBU=
SHA256 (epdfview-0.1.7.tar.bz2) = Cvuw80jUupFs9Y2ki0dJt8ymqQOBNrJ9xlIWGRNwSug=
SIZE (epdfview-0.1.7.tar.bz2) = 443609

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-data_epdfview_desktop,v 1.1 2008/05/02 11:55:42 fgsch Exp $
--- data/epdfview.desktop.orig Thu May 1 14:20:04 2008
+++ data/epdfview.desktop Thu May 1 14:23:04 2008
@@ -8,7 +8,7 @@ Exec=epdfview %f
$OpenBSD: patch-data_epdfview_desktop,v 1.2 2009/04/04 09:25:25 landry Exp $
--- data/epdfview.desktop.orig Sat Feb 28 18:39:00 2009
+++ data/epdfview.desktop Sat Apr 4 11:06:03 2009
@@ -7,7 +7,7 @@ Exec=epdfview %f
GenericName=PDF Viewer
GenericName[ca]=Visor PDF
GenericName[es]=Visor PDF
-Icon=postscript-viewer.png
-Icon=icon_epdfview-48
+Icon=epdfview.png
Name=ePDFViewer
Name[ca]=ePDFViewer

View File

@ -0,0 +1,44 @@
$OpenBSD: patch-src_gtk_MainView_cxx,v 1.1 2009/04/04 09:25:25 landry Exp $
--- src/gtk/MainView.cxx.orig Sat Feb 28 22:00:55 2009
+++ src/gtk/MainView.cxx Sat Apr 4 11:08:38 2009
@@ -77,7 +77,7 @@ static void main_window_zoom_in_cb (GtkWidget *, gpoin
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 (GtkRadioAction *action, Gtk
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;
}

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_gtk_PageView_cxx,v 1.1 2009/04/04 09:25:25 landry Exp $
--- src/gtk/PageView.cxx.orig Sat Feb 28 22:00:35 2009
+++ src/gtk/PageView.cxx Sat Apr 4 11:06:03 2009
@@ -527,13 +527,6 @@ page_view_scrolled_cb (GtkWidget *widget, GdkEventScro
{
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));

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.4 2008/05/02 11:55:42 fgsch Exp $
bin/epdfview
@comment $OpenBSD: PLIST,v 1.5 2009/04/04 09:25:25 landry Exp $
@bin bin/epdfview
share/applications/epdfview.desktop
share/epdfview/
share/epdfview/pixmaps/
@ -26,13 +26,23 @@ share/icons/hicolor/48x48/
share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/epdfview.png
share/locale/ca/LC_MESSAGES/epdfview.mo
share/locale/cs/LC_MESSAGES/epdfview.mo
share/locale/de/LC_MESSAGES/epdfview.mo
share/locale/el/LC_MESSAGES/epdfview.mo
share/locale/es/LC_MESSAGES/epdfview.mo
share/locale/eu/LC_MESSAGES/epdfview.mo
share/locale/fr/LC_MESSAGES/epdfview.mo
share/locale/it/LC_MESSAGES/epdfview.mo
share/locale/ja/LC_MESSAGES/epdfview.mo
share/locale/pl/LC_MESSAGES/epdfview.mo
share/locale/pt_BR/LC_MESSAGES/epdfview.mo
share/locale/pt_PT/
share/locale/pt_PT/LC_MESSAGES/
share/locale/pt_PT/LC_MESSAGES/epdfview.mo
share/locale/ru/LC_MESSAGES/epdfview.mo
share/locale/sv/LC_MESSAGES/epdfview.mo
share/locale/vi/LC_MESSAGES/epdfview.mo
share/locale/zh_CN/LC_MESSAGES/epdfview.mo
share/locale/zh_TW/LC_MESSAGES/epdfview.mo
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@unexec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true