[arch-commits] CVS update of extra/office/epdfview (2 files)

[andyrtr at archlinux.org]

    Date: Saturday, January 5, 2008 @ 12:38:08
  Author: andyrtr
    Path: /home/cvs-extra/extra/office/epdfview

   Added: epdfview-0.1.6-print-segfault.patch (1.1)
Modified: PKGBUILD (1.8 -> 1.9)

upgpkg: epdfview 0.1.6-5
fixed #8230


-------------------------------------+
 PKGBUILD                            |   11 ++-
 epdfview-0.1.6-print-segfault.patch |   95 ++++++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+), 4 deletions(-)


Index: extra/office/epdfview/PKGBUILD
diff -u extra/office/epdfview/PKGBUILD:1.8 extra/office/epdfview/PKGBUILD:1.9
--- extra/office/epdfview/PKGBUILD:1.8	Fri Sep  7 18:06:18 2007
+++ extra/office/epdfview/PKGBUILD	Sat Jan  5 12:38:08 2008
@@ -1,20 +1,23 @@
-# $Id: PKGBUILD,v 1.8 2007/09/07 22:06:18 jgc Exp $
+# $Id: PKGBUILD,v 1.9 2008/01/05 17:38:08 andyrtr Exp $
 # Contributor: Tom K <tomk at runbox.com>
 
 pkgname=epdfview
 pkgver=0.1.6
-pkgrel=4
+pkgrel=5
 pkgdesc="A free lightweight PDF document viewer."
 license=(GPL)
 arch=(i686 x86_64)
 depends=('poppler-glib>=0.6')
 makedepends=('pkgconfig')
-source=(http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-$pkgver.tar.bz2)
+source=(http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-$pkgver.tar.bz2
+	epdfview-0.1.6-print-segfault.patch)
 url="http://www.emma-soft.com/projects/epdfview/"
-md5sums=('cce9edb41b4a8308e0ef0eea24b5a1ab')
+md5sums=('cce9edb41b4a8308e0ef0eea24b5a1ab'
+         'c083ee8e0e226b308e1c38cb94ee42e7')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
+  patch -Np0 -i ../epdfview-0.1.6-print-segfault.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make || return 1
   make DESTDIR=$startdir/pkg install
Index: extra/office/epdfview/epdfview-0.1.6-print-segfault.patch
diff -u /dev/null extra/office/epdfview/epdfview-0.1.6-print-segfault.patch:1.1
--- /dev/null	Sat Jan  5 12:38:08 2008
+++ extra/office/epdfview/epdfview-0.1.6-print-segfault.patch	Sat Jan  5 12:38:08 2008
@@ -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);
+             }