From 1b16cd5b7609f111008e5c85c21871b95b24e664 Mon Sep 17 00:00:00 2001 From: Andrew Brouwers Date: Tue, 11 May 2010 19:46:12 +0200 Subject: office/epdfview: Updated for version 0.1.6 --- office/epdfview/README | 3 +- .../epdfview/epdfview-0.1.6-print-segfault.patch | 95 ++++++++++++++++++++++ office/epdfview/epdfview.SlackBuild | 8 +- office/epdfview/epdfview.info | 2 +- office/epdfview/slack-desc | 14 +++- 5 files changed, 117 insertions(+), 5 deletions(-) create mode 100644 office/epdfview/epdfview-0.1.6-print-segfault.patch (limited to 'office/epdfview') diff --git a/office/epdfview/README b/office/epdfview/README index cfefa2dac1..ceb12c2abf 100644 --- a/office/epdfview/README +++ b/office/epdfview/README @@ -1,3 +1,4 @@ -The aim of ePDFView is to make a simple PDF document viewer, in the lines of Evince but without using the Gnome libraries. +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 new file mode 100644 index 0000000000..498febbd5f --- /dev/null +++ b/office/epdfview/epdfview-0.1.6-print-segfault.patch @@ -0,0 +1,95 @@ +--- 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 8f72e992cf..137027677a 100644 --- a/office/epdfview/epdfview.SlackBuild +++ b/office/epdfview/epdfview.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for epdfview -# Copyright 2006 Andrew Brouwers +# Copyright 2008 Andrew Brouwers # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,7 @@ set -e PRGNAM=epdfview VERSION=0.1.6 ARCH=${ARCH:-i486} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG=_SBo} CWD=$(pwd) TMP=${TMP:-/tmp/SBo} @@ -56,6 +56,10 @@ chmod -R u+w,go+r-w,a-s . CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ + +# Add patch for printing segfault +patch -Np0 -i $CWD/epdfview-0.1.6-print-segfault.patch || exit 1 + ./configure \ --prefix=/usr \ || exit 1 diff --git a/office/epdfview/epdfview.info b/office/epdfview/epdfview.info index 3d36f9bef6..fba4a72118 100644 --- a/office/epdfview/epdfview.info +++ b/office/epdfview/epdfview.info @@ -5,4 +5,4 @@ DOWNLOAD="http://trac.emma-soft.com/epdfview/chrome/site/releases/epdfview-0.1.6 MD5SUM="cce9edb41b4a8308e0ef0eea24b5a1ab" MAINTAINER="Andrew Brouwers" EMAIL="abrouwers@gmail.com" -APPROVED="BP{k},rworkman" +APPROVED="BP{k}" diff --git a/office/epdfview/slack-desc b/office/epdfview/slack-desc index a152a1fe25..33d57a03ca 100644 --- a/office/epdfview/slack-desc +++ b/office/epdfview/slack-desc @@ -1,7 +1,19 @@ -epdfview: ePDFView: a lightweight, GTK+ based PDF viewer for X. +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +epdfview: ePDFView (lightweight, GTK+ based PDF viewer for X) epdfview: epdfview: The aim of ePDFView is to make a simple PDF document viewer - epdfview: very similar to evince, without requiring all of the gnome epdfview: libraries. epdfview: epdfview: +epdfview: +epdfview: +epdfview: +epdfview: -- cgit v1.2.3