On Mon, Mar 30, 2009 at 5:51 PM, Landry Breuil <lan...@rhaalovely.net> wrote:
> This is wrong, remove the PKGNAME line, it will default to ${DISTNAME}.
> No need to bump it for patches coming from upstream svn.
> Other than that, reads fine, i'll do some testing laterz on sparc64/i386.
>
> Landry
>
Hi,
Thanks for the advice, I've attached a new patch.. also.. it appears
epdfview is GPLv2+ (..v2 or later).
I hope it works well on sparc64, definitely wish I had one of those
systems myself. :)
Take care..
-Brynet
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/epdfview/Makefile,v
retrieving revision 1.10
diff -N -u -p Makefile
--- Makefile 12 Mar 2009 18:13:54 -0000 1.10
+++ Makefile 31 Mar 2009 00:13:50 -0000
@@ -2,18 +2,17 @@
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 <stea...@sourcemage.org>
+MAINTAINER= Brynet <bry...@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
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/epdfview/distinfo,v
retrieving revision 1.3
diff -N -u -p distinfo
--- distinfo 5 Apr 2007 16:20:18 -0000 1.3
+++ distinfo 31 Mar 2009 00:13:50 -0000
@@ -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
Index: patches/patch-data_epdfview_desktop
===================================================================
RCS file: /cvs/ports/print/epdfview/patches/patch-data_epdfview_desktop,v
retrieving revision 1.1
diff -N -u -p patches/patch-data_epdfview_desktop
--- patches/patch-data_epdfview_desktop 2 May 2008 11:55:42 -0000 1.1
+++ patches/patch-data_epdfview_desktop 31 Mar 2009 00:13:50 -0000
@@ -5,7 +5,7 @@ $OpenBSD: patch-data_epdfview_desktop,v 1.1 2008/05/02
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
Index: patches/patch-src_gtk_MainView_cxx
===================================================================
RCS file: patches/patch-src_gtk_MainView_cxx
diff -N -u -p patches/patch-src_gtk_MainView_cxx
--- /dev/null 31 Mar 2009 00:13:51 -0000
+++ patches/patch-src_gtk_MainView_cxx 31 Mar 2009 00:13:50 -0000
@@ -0,0 +1,44 @@
+$OpenBSD$
+--- src/gtk/MainView.cxx.orig Sun Mar 29 23:58:56 2009
++++ src/gtk/MainView.cxx Mon Mar 30 00:04:42 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;
+ }
+
Index: patches/patch-src_gtk_PageView_cxx
===================================================================
RCS file: patches/patch-src_gtk_PageView_cxx
diff -N -u -p patches/patch-src_gtk_PageView_cxx
--- /dev/null 31 Mar 2009 00:13:51 -0000
+++ patches/patch-src_gtk_PageView_cxx 31 Mar 2009 00:13:50 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- src/gtk/PageView.cxx.orig Sun Mar 29 22:32:31 2009
++++ src/gtk/PageView.cxx Sun Mar 29 22:48:55 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));
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/print/epdfview/pkg/PLIST,v
retrieving revision 1.4
diff -N -u -p pkg/PLIST
--- pkg/PLIST 2 May 2008 11:55:42 -0000 1.4
+++ pkg/PLIST 31 Mar 2009 00:13:50 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.4 2008/05/02 11:55:42 fgsch Exp $
-bin/epdfview
+...@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
