office/epdfview: Updated for version 0.1.7

5 files changed, 42 insertions, 106 deletions

diff --git a/office/epdfview/README b/office/epdfview/README
index ceb12c2abf..ff1dc885ed 100644
--- a/office/epdfview/README
+++ b/office/epdfview/README
@@ -1,4 +1,2 @@
 The aim of ePDFView is to make a simple PDF document viewer, in the lines of 
 Evince but without using the Gnome libraries.
-
-NOTE:  Poppler is required to build this application.
diff --git a/office/epdfview/epdfview-0.1.6-print-segfault.patch b/office/epdfview/epdfview-0.1.6-print-segfault.patch
deleted file mode 100644
index 498febbd5f..0000000000
--- a/office/epdfview/epdfview-0.1.6-print-segfault.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- src/PrintPter.cxx (revision 262)
-+++ src/PrintPter.cxx (revision 281)
-@@ -231,17 +231,24 @@
-                 view.clearPageSizeList ();
-                 int pageSizeToSelect = 0;
--                ppd_choice_t *pageSizeChoice = pageSizeOption->choices;
--                for ( int currentSize = 0 ;
--                      currentSize < pageSizeOption->num_choices ;
--                      ++currentSize, ++pageSizeChoice )
--                {
--                    const gchar *sizeName = pageSizeChoice->text;
--                    const gchar *sizeValue = pageSizeChoice->choice;
--
--                    view.addPageSize (_(sizeName), sizeValue);
--                    if ( pageSizeChoice->marked )
-+                if ( 0 != pageSizeOption )
-+                {
-+                    ppd_choice_t *pageSizeChoice = pageSizeOption->choices;
-+                    for ( int currentSize = 0 ;
-+                         currentSize < pageSizeOption->num_choices ;
-+                         ++currentSize, ++pageSizeChoice )
-                     {
--                        pageSizeToSelect = currentSize;
-+                        const gchar *sizeName = pageSizeChoice->text;
-+                        const gchar *sizeValue = pageSizeChoice->choice;
-+
-+                        view.addPageSize (_(sizeName), sizeValue);
-+                        if ( pageSizeChoice->marked )
-+                        {
-+                            pageSizeToSelect = currentSize;
-+                        }
-                     }
-+                }
-+                else
-+                {
-+                    view.addPageSize (_("A4"), "A4");
-                 }
-                 view.selectPageSize (pageSizeToSelect);
-@@ -252,17 +259,24 @@
-                 view.clearResolutionList ();
-                 int resolutionToSelect = 0;
--                ppd_choice_t *resolutionChoice = resolutionOption->choices;
--                for ( int currentRes = 0 ;
--                      currentRes < resolutionOption->num_choices ;
--                      ++currentRes, ++resolutionChoice )
--                {
--                    const gchar *resName = resolutionChoice->text;
--                    const gchar *resValue = resolutionChoice->choice;
--
--                    view.addResolution (_(resName), resValue);
--                    if ( resolutionChoice->marked )
-+                if ( 0 != resolutionOption )
-+                {
-+                    ppd_choice_t *resolutionChoice = resolutionOption->choices;
-+                    for ( int currentRes = 0 ;
-+                            currentRes < resolutionOption->num_choices ;
-+                            ++currentRes, ++resolutionChoice )
-                     {
--                        resolutionToSelect = currentRes;
-+                        const gchar *resName = resolutionChoice->text;
-+                        const gchar *resValue = resolutionChoice->choice;
-+
-+                        view.addResolution (_(resName), resValue);
-+                        if ( resolutionChoice->marked )
-+                        {
-+                            resolutionToSelect = currentRes;
-+                        }
-                     }
-+                }
-+                else
-+                {
-+                    view.addResolution (_("300 DPI"), "300x300dpi");
-                 }
-                 view.selectResolution (resolutionToSelect);
-@@ -272,7 +286,7 @@
-                     ppdFindOption (printerPPD, "ColorModel");
-                 view.clearColorModelList ();
-+                int colorModelToSelect = 0;
-                 if ( NULL != colorModelOption )
-                 {
--                    int colorModelToSelect = 0;
-                     ppd_choice_t *colorModelChoice = colorModelOption->choices;
-                     for ( int currentColor = 0 ;
-@@ -289,5 +303,4 @@
-                         }
-                     }
--                    view.selectColorModel (colorModelToSelect);
-                 }
-                 else
-@@ -295,4 +308,5 @@
-                     view.addColorModel (_("Grayscale"), "Gray");
-                 }
-+                view.selectColorModel (colorModelToSelect);
-                 ppdClose (printerPPD);
-             }
diff --git a/office/epdfview/epdfview.SlackBuild b/office/epdfview/epdfview.SlackBuild
index 9f316d4cca..7ff0f29e32 100644
--- a/office/epdfview/epdfview.SlackBuild
+++ b/office/epdfview/epdfview.SlackBuild
@@ -25,14 +25,14 @@
 # Modified by the SlackBuilds.org project
 
 PRGNAM=epdfview
-VERSION=0.1.6
+VERSION=0.1.7
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-2}
 TAG=${TAG=_SBo}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-epdfview
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
@@ -58,8 +58,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Add patch for printing segfault
-patch -Np0 -i $CWD/epdfview-0.1.6-print-segfault.patch
+# Add patch to fix mouse-scrolling in 0.1.7
+patch -Np0 -i $CWD/mouse-scroll-fix.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -80,7 +80,7 @@ cp -a AUTHORS COPYING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Fix path to icons in .desktop file
-sed -i 's#Icon=postscript-viewer.png#Icon=epdfview#' $PKG/usr/share/applications/$PRGNAM.desktop
+sed -i 's#Icon=icon_epdfview-48#Icon=epdfview#' $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/office/epdfview/epdfview.info b/office/epdfview/epdfview.info
index 3ed66031e4..cd758e3ed0 100644
--- a/office/epdfview/epdfview.info
+++ b/office/epdfview/epdfview.info
@@ -1,8 +1,8 @@
 PRGNAM="epdfview"
-VERSION="0.1.6"
+VERSION="0.1.7"
 HOMEPAGE="http://trac.emma-soft.com/epdfview/"
-DOWNLOAD="http://trac.emma-soft.com/epdfview/chrome/site/releases/epdfview-0.1.6.tar.bz2"
-MD5SUM="cce9edb41b4a8308e0ef0eea24b5a1ab"
+DOWNLOAD="http://trac.emma-soft.com/epdfview/chrome/site/releases/epdfview-0.1.7.tar.bz2"
+MD5SUM="1919bb19c16ef0a97d48b0a8303d3c7b"
 MAINTAINER="Andrew Brouwers"
 EMAIL="abrouwers@gmail.com"
 APPROVED="dsomero"
diff --git a/office/epdfview/mouse-scroll-fix.patch b/office/epdfview/mouse-scroll-fix.patch
new file mode 100644
index 0000000000..a440da278e
--- /dev/null
+++ b/office/epdfview/mouse-scroll-fix.patch
@@ -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;
+ }
+