[arch-commits] Commit in xpdf/trunk (PKGBUILD)

2020-07-07 Thread Evangelos Foutras via arch-commits
Date: Tuesday, July 7, 2020 @ 19:14:10
  Author: foutrelis
Revision: 660141

upgpkg: xpdf 4.02-2: reproducibility rebuild

Modified:
  xpdf/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-07 19:13:16 UTC (rev 660140)
+++ PKGBUILD2020-07-07 19:14:10 UTC (rev 660141)
@@ -7,7 +7,7 @@
 
 pkgname=xpdf
 pkgver=4.02
-pkgrel=1
+pkgrel=2
 pkgdesc='Viewer for Portable Document Format (PDF) files'
 url='https://www.xpdfreader.com/'
 arch=('x86_64')


[arch-commits] Commit in xpdf/trunk (PKGBUILD)

2019-10-16 Thread Santiago Torres-Arias via arch-commits
Date: Wednesday, October 16, 2019 @ 16:23:45
  Author: sangy
Revision: 516362

upgpkg: xpdf 4.02-1

Fixes CVE-2019-16927

Modified:
  xpdf/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-16 16:23:34 UTC (rev 516361)
+++ PKGBUILD2019-10-16 16:23:45 UTC (rev 516362)
@@ -6,8 +6,8 @@
 # Contributor: Mark Pustjens 
 
 pkgname=xpdf
-pkgver=4.01.01
-pkgrel=2
+pkgver=4.02
+pkgrel=1
 pkgdesc='Viewer for Portable Document Format (PDF) files'
 url='https://www.xpdfreader.com/'
 arch=('x86_64')
@@ -22,7 +22,7 @@
 xpdf-4.00-permissions.patch
 xpdf-4.00-xpdfrc.patch
 xpdf.desktop)
-sha512sums=('e0b42195ba4858ecf2ec3c3c06a42eae742eb8567dca695a45a01185b606b399b5e45d220b24ed39782d1f9b1ee16f674129db3346d25b709bbb3f90ef078c22'
+sha512sums=('72c9413fc7241dde5288137ca8a68c837d2a68e95e909dbe2afe8f374b5a7c92af4edf82918963d1c6388c947057fcf5f0ae1e6fbb2b31c3d5eb9a07d3c74ddc'
 'SKIP'
 
'f17c1c19c29518a3538a202c19fb60efc7721a42065d32c841f9ed929e571d9373c8558fdae251c1ef3781857cf51483244276179862998f94c9c1fd8bd63695'
 
'c5ce8ef29d9b338fe3623fa52904d4fee5d76a34145614d05abe168108579608f3d16d0d03d34865e43980eb1b2a814f07aa3dbcfc0da06de34bd9b0738eef67'


[arch-commits] Commit in xpdf/trunk (PKGBUILD)

2019-09-01 Thread Balló György via arch-commits
Date: Sunday, September 1, 2019 @ 23:47:57
  Author: bgyorgy
Revision: 506368

upgpkg: xpdf 4.01.01-2

Add missing qt5-svg dependency (FS#62582)

Modified:
  xpdf/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-01 23:39:30 UTC (rev 506367)
+++ PKGBUILD2019-09-01 23:47:57 UTC (rev 506368)
@@ -7,7 +7,7 @@
 
 pkgname=xpdf
 pkgver=4.01.01
-pkgrel=1
+pkgrel=2
 pkgdesc='Viewer for Portable Document Format (PDF) files'
 url='https://www.xpdfreader.com/'
 arch=('x86_64')
@@ -14,7 +14,7 @@
 license=('GPL3')
 backup=('etc/xpdfrc')
 depends=('gsfonts' 'xdg-utils' 'qt5-base' 'libxt' 'libpaper' 'freetype2'
- 'libcups' 'libjpeg-turbo' 'libtiff' 'libpng' 'zlib')
+ 'libcups' 'libjpeg-turbo' 'libtiff' 'libpng' 'zlib' 'qt5-svg')
 optdepends=('poppler: tools that used to be included in xpdf'
 'desktop-file-utils: for desktop environments')
 makedepends=('cmake' 'qt5-tools')


[arch-commits] Commit in xpdf/trunk (PKGBUILD xpdf-4.00-xpdfrc.patch)

2018-01-02 Thread Levente Polyak via arch-commits
Date: Tuesday, January 2, 2018 @ 19:58:07
  Author: anthraxx
Revision: 277818

upgpkg: xpdf 4.00-2 (fixing fonts and depends)

FS#50297
FS#52284
FS#56922

Added:
  xpdf/trunk/xpdf-4.00-xpdfrc.patch
Modified:
  xpdf/trunk/PKGBUILD

+
 PKGBUILD   |   21 +
 xpdf-4.00-xpdfrc.patch |   37 +
 2 files changed, 50 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-02 18:28:01 UTC (rev 277817)
+++ PKGBUILD2018-01-02 19:58:07 UTC (rev 277818)
@@ -7,21 +7,23 @@
 
 pkgname=xpdf
 pkgver=4.00
-pkgrel=1
+pkgrel=2
 pkgdesc='Viewer for Portable Document Format (PDF) files'
 url='https://www.xpdfreader.com/'
 arch=('x86_64')
 license=('GPL3')
 backup=('etc/xpdfrc')
-depends=('openmotif' 'gsfonts' 'libxt' 'libpaper' 'xdg-utils' 'qt5-base' 
'libpng' 'libxpm')
+depends=('gsfonts' 'xdg-utils' 'qt5-base' 'libxt' 'libpaper' 'freetype2'
+ 'libcups' 'libjpeg-turbo' 'libtiff' 'libpng' 'zlib')
 optdepends=('poppler: tools that used to be included in xpdf'
 'desktop-file-utils: for desktop environments')
 makedepends=('cmake' 'qt5-tools')
-source=(https://www.xpdfreader.com/dl/${pkgname}-${pkgver}.tar.gz{,.sig}
+source=(https://xpdfreader-dl.s3.amazonaws.com/${pkgname}-${pkgver}.tar.gz{,.sig}
 xpdf-4.00-64bit.patch
 xpdf-4.00-man-path-fix.patch
 xpdf-4.00-permissions.patch
 xpdf-4.00-libpaperfix.patch
+xpdf-4.00-xpdfrc.patch
 xpdf.desktop)
 
sha512sums=('32fb928aeb053be29c7342dda8caac8a7a3720e8f39507df29ad5a070e1423cc0960da4d7b36046d0be27b842b108e984363c0285839a0fd371a119948af0cac'
 'SKIP'
@@ -29,6 +31,7 @@
 
'77d533e0cb2ed5e232a0497891eb6ec634659305a1c19d7c3a8f7efee1d18ba9e03b1ee009a9834497f8d7721694d4bd65e897ee4c9499544194bf6b240052a0'
 
'f17c1c19c29518a3538a202c19fb60efc7721a42065d32c841f9ed929e571d9373c8558fdae251c1ef3781857cf51483244276179862998f94c9c1fd8bd63695'
 
'aa101da42a3f4d8a559f8387143909c863de80dd6c4d2454a9a6cecef41a889f6e5d88225c22ec2c271c05eb77a412a0e0d66b94554b9ff5ccfe97953f1c1c4e'
+
'c5ce8ef29d9b338fe3623fa52904d4fee5d76a34145614d05abe168108579608f3d16d0d03d34865e43980eb1b2a814f07aa3dbcfc0da06de34bd9b0738eef67'
 
'd6163eb220bd567226c6006bef30c6db1eac1263ae161392db9766dca1ce78014cc555dd9d27febd2b924150053fa01b47c06777b1e760864459574c7614bfc4')
 validpgpkeys=('A56006CA75CF8B13FA2F120DF4825F5397271342') # -Xpdf- 

 
@@ -36,12 +39,12 @@
   cd ${pkgname}-${pkgver}
   mkdir -p build
   cp doc/sample-xpdfrc xpdfrc
-  patch -p1 < "${srcdir}/xpdf-4.00-64bit.patch"
-  patch -p1 < "${srcdir}/xpdf-4.00-man-path-fix.patch"
-  patch -p1 < "${srcdir}/xpdf-4.00-permissions.patch"
-  patch -p1 < "${srcdir}/xpdf-4.00-libpaperfix.patch"
+  patch -Np1 < ../xpdf-4.00-64bit.patch
+  patch -Np1 < ../xpdf-4.00-man-path-fix.patch
+  patch -Np1 < ../xpdf-4.00-permissions.patch
+  patch -Np1 < ../xpdf-4.00-libpaperfix.patch
+  patch -Np1 < ../xpdf-4.00-xpdfrc.patch
   sed 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' -i 
xpdf/GlobalParams.cc
-  sed 's:/usr/local/share/:/usr/share/:g' -i xpdfrc
 }
 
 build() {
@@ -49,6 +52,8 @@
   cmake .. \
   -DMULTITHREADED=ON \
   -DOPI_SUPPORT=ON \
+  -DXPDFWIDGET_PRINTING=ON \
+  -DSYSTEM_XPDFRC=/etc/xpdfrc \
   -DCMAKE_INSTALL_PREFIX=/usr \
   -DCMAKE_BUILD_TYPE=Release
   make

Added: xpdf-4.00-xpdfrc.patch
===
--- xpdf-4.00-xpdfrc.patch  (rev 0)
+++ xpdf-4.00-xpdfrc.patch  2018-01-02 19:58:07 UTC (rev 277818)
@@ -0,0 +1,37 @@
+--- a/xpdfrc   2018-01-02 12:28:46.521609323 +0100
 b/xpdfrc   2018-01-02 11:18:14.342938091 +0100
+@@ -29,20 +29,20 @@
+ # installed in a "standard" location, xpdf will find them
+ # automatically.)
+ 
+-#fontFile Times-Roman /usr/local/share/ghostscript/fonts/n021003l.pfb
+-#fontFile Times-Italic
/usr/local/share/ghostscript/fonts/n021023l.pfb
+-#fontFile Times-Bold  /usr/local/share/ghostscript/fonts/n021004l.pfb
+-#fontFile Times-BoldItalic/usr/local/share/ghostscript/fonts/n021024l.pfb
+-#fontFile Helvetica   /usr/local/share/ghostscript/fonts/n019003l.pfb
+-#fontFile Helvetica-Oblique   /usr/local/share/ghostscript/fonts/n019023l.pfb
+-#fontFile Helvetica-Bold  
/usr/local/share/ghostscript/fonts/n019004l.pfb
+-#fontFile Helvetica-BoldOblique   
/usr/local/share/ghostscript/fonts/n019024l.pfb
+-#fontFile Courier /usr/local/share/ghostscript/fonts/n022003l.pfb
+-#fontFile Courier-Oblique /usr/local/share/ghostscript/fonts/n022023l.pfb
+-#fontFile Courier-Bold
/usr/local/share/ghostscript/fonts/n022004l.pfb
+-#fontFile Courier-BoldOblique /usr/local/share/ghostscript/fonts/n022024l.pfb
+-#fontFile Symbol  

[arch-commits] Commit in xpdf/trunk (PKGBUILD sanitize.patch)

2013-09-08 Thread Gaetan Bisson
Date: Sunday, September 8, 2013 @ 19:18:11
  Author: bisson
Revision: 193957

fix FS#36818

Added:
  xpdf/trunk/sanitize.patch
Modified:
  xpdf/trunk/PKGBUILD

+
 PKGBUILD   |5 -
 sanitize.patch |   55 +++
 2 files changed, 59 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-08 00:58:33 UTC (rev 193956)
+++ PKGBUILD2013-09-08 17:18:11 UTC (rev 193957)
@@ -6,7 +6,7 @@
 pkgname=xpdf
 #pkgver=3.03_pl1
 pkgver=3.03
-pkgrel=3
+pkgrel=4
 pkgdesc='Viewer for Portable Document Format (PDF) files'
 url='http://www.foolabs.com/xpdf/'
 license=('GPL2')
@@ -16,9 +16,11 @@
 'desktop-file-utils: for desktop environments')
 #   ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}pl1.patch;
 source=(ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}.tar.gz;
+'sanitize.patch'
 'char.patch'
 'desktop')
 sha1sums=('499423e8a795e0efd76ca798239eb4d0d52fe248'
+  '2face78a2f550fd15eeceb8a1ce47c566104f457'   
   '5c471944685a6b24a2b0c0e000562d1a3263aeeb'
   '17ebbfe457cb92e97b12b7362e8ce961526012d9')
 
@@ -29,6 +31,7 @@
cd ${srcdir}/${pkgname}-${pkgver%_*}
 
 #  patch -p1 -i ../${pkgname}-${_srcver}pl1.patch
+   patch -p1 -i ../sanitize.patch
patch -p1 -i ../char.patch
 
sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' 
xpdf/GlobalParams.cc

Added: sanitize.patch
===
--- sanitize.patch  (rev 0)
+++ sanitize.patch  2013-09-08 17:18:11 UTC (rev 193957)
@@ -0,0 +1,55 @@
+From 3945969e0072217c143fefa3044512a31ac2afa8 Mon Sep 17 00:00:00 2001
+From: mancha manc...@hush.com
+Date: Sun, 11 Aug 2013
+Subject: CVE-2012-2142
+
+Filter stuff that might end up in the shell to address CVE-2012-2142.
+This code was adapted from the Poppler project.
+---
+ Error.cc |   21 -
+ 1 file changed, 16 insertions(+), 5 deletions(-)
+
+--- a/xpdf/Error.cc2013-08-11
 b/xpdf/Error.cc2013-08-11
+@@ -43,7 +43,7 @@ void setErrorCallback(void (*cbk)(void *
+ 
+ void CDECL error(ErrorCategory category, int pos, const char *msg, ...) {
+   va_list args;
+-  GString *s;
++  GString *s, *sanitized;
+ 
+   // NB: this can be called before the globalParams object is created
+   if (!errorCbk  globalParams  globalParams-getErrQuiet()) {
+@@ -52,17 +52,28 @@ void CDECL error(ErrorCategory category,
+   va_start(args, msg);
+   s = GString::formatv(msg, args);
+   va_end(args);
++
++  sanitized = new GString ();
++  for (int i = 0; i  s-getLength(); ++i) {
++const char c = s-getChar(i);
++if (c  (char)0x20 || c = (char)0x7f) {
++  sanitized-appendf({0:02x}, c  0xff);
++} else {
++  sanitized-append(c);
++}
++  }
++
+   if (errorCbk) {
+-(*errorCbk)(errorCbkData, category, pos, s-getCString());
++(*errorCbk)(errorCbkData, category, pos, sanitized-getCString());
+   } else {
+ if (pos = 0) {
+   fprintf(stderr, %s (%d): %s\n,
+-errorCategoryNames[category], pos, s-getCString());
++errorCategoryNames[category], pos, sanitized-getCString());
+ } else {
+   fprintf(stderr, %s: %s\n,
+-errorCategoryNames[category], s-getCString());
++errorCategoryNames[category], sanitized-getCString());
+ }
+ fflush(stderr);
+   }
+-  delete s;
++  delete sanitized;
+ }



[arch-commits] Commit in xpdf/trunk (PKGBUILD desktop)

2013-02-04 Thread Gaetan Bisson
Date: Monday, February 4, 2013 @ 14:09:05
  Author: bisson
Revision: 177028

fix FS#33686

Modified:
  xpdf/trunk/PKGBUILD
  xpdf/trunk/desktop

--+
 PKGBUILD |4 ++--
 desktop  |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-04 11:41:33 UTC (rev 177027)
+++ PKGBUILD2013-02-04 13:09:05 UTC (rev 177028)
@@ -6,7 +6,7 @@
 pkgname=xpdf
 #pkgver=3.03_pl1
 pkgver=3.03
-pkgrel=2
+pkgrel=3
 pkgdesc='Viewer for Portable Document Format (PDF) files'
 url='http://www.foolabs.com/xpdf/'
 license=('GPL2')
@@ -20,7 +20,7 @@
 'desktop')
 sha1sums=('499423e8a795e0efd76ca798239eb4d0d52fe248'
   '5c471944685a6b24a2b0c0e000562d1a3263aeeb'
-  '3b6fe01636253676ffa0efe1b237a75af4721f6d')
+  '17ebbfe457cb92e97b12b7362e8ce961526012d9')
 
 install=install
 backup=('etc/xpdfrc')

Modified: desktop
===
--- desktop 2013-02-04 11:41:33 UTC (rev 177027)
+++ desktop 2013-02-04 13:09:05 UTC (rev 177028)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Xpdf
 Comment=Views Adobe PDF (acrobat) files
-Exec=xpdf
+Exec=xpdf %f
 Terminal=false
 Type=Application
 Icon=xpdf



[arch-commits] Commit in xpdf/trunk (PKGBUILD)

2012-05-13 Thread Gaetan Bisson
Date: Sunday, May 13, 2012 @ 12:58:20
  Author: bisson
Revision: 158959

rebuild for poppler-0.20

Modified:
  xpdf/trunk/PKGBUILD

--+
 PKGBUILD |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-13 16:11:10 UTC (rev 158958)
+++ PKGBUILD2012-05-13 16:58:20 UTC (rev 158959)
@@ -6,7 +6,7 @@
 pkgname=xpdf
 #pkgver=3.03_pl1
 pkgver=3.03
-pkgrel=1
+pkgrel=2
 pkgdesc='Viewer for Portable Document Format (PDF) files'
 url='http://www.foolabs.com/xpdf/'
 license=('GPL2')
@@ -57,10 +57,8 @@
install -Dm644 ../desktop 
${pkgdir}/usr/share/applications/xpdf.desktop
install -Dm644 xpdf/xpdfIcon.xpm ${pkgdir}/usr/share/pixmaps/xpdf.xpm
 
-   # remove libs and manpages provided by poppler
-   # pdfdetach should go there too once it is in poppler
-   for tool in pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext ; do
-   rm ${pkgdir}/usr/bin/${tool}
-   rm ${pkgdir}/usr/share/man/man1/${tool}.1
+   # stuff provided by poppler
+   for tool in pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops 
pdftotext; do
+   rm ${pkgdir}/usr/bin/${tool} 
${pkgdir}/usr/share/man/man1/${tool}.1
done
 }



[arch-commits] Commit in xpdf/trunk (PKGBUILD)

2011-04-04 Thread Gaetan Bisson
Date: Monday, April 4, 2011 @ 17:05:28
  Author: bisson
Revision: 117882

upstream update (disable t1lib)

Modified:
  xpdf/trunk/PKGBUILD

--+
 PKGBUILD |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-04 21:04:57 UTC (rev 117881)
+++ PKGBUILD2011-04-04 21:05:28 UTC (rev 117882)
@@ -1,17 +1,17 @@
 # $Id$
-# Maintainer
+# Maintainer: Gaetan Bisson bis...@archlinux.org
 # Contributor: tobias tob...@archlinux.org
-# Contributor Sarah Hay sarah...@mb.sympatico.ca
+# Contributor: Sarah Hay sarah...@mb.sympatico.ca
 
 pkgname=xpdf
 _srcver=3.02
-_patchlevel=pl5
+_patchlevel=pl6
 pkgver=${_srcver}_${_patchlevel}
 pkgrel=1
 pkgdesc=A viewer for Portable Document Format (PDF) files
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('gcc-libs' 'lesstif' 't1lib' 'gsfonts' 'libxt' 'desktop-file-utils')
+depends=('lesstif' 'gsfonts' 'libxt' 'desktop-file-utils')
 optdepends=('poppler: pdf tools that used to be included in xpdf')
 backup=('etc/xpdfrc')
 url=http://www.foolabs.com/xpdf/;
@@ -52,8 +52,6 @@
 --enable-wordlist  \
 --with-freetype2-library=/usr/lib  \
 --with-freetype2-includes=/usr/include/freetype2   \
---with-t1-library=/usr/lib \
---with-t1-includes=/usr/include\
 --x-includes=/usr/include  \
 --with-Xm-library=/usr/lib \
 --with-Xm-includes=/usr/include



[arch-commits] Commit in xpdf/trunk (PKGBUILD)

2010-10-23 Thread Andrea Scarpino
Date: Saturday, October 23, 2010 @ 09:02:22
  Author: andrea
Revision: 9

upgpkg: xpdf 3.02_pl5-1
patchlevel bump - security fixes (FS#21259)

Modified:
  xpdf/trunk/PKGBUILD

--+
 PKGBUILD |   49 ++---
 1 file changed, 30 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-23 12:10:42 UTC (rev 96665)
+++ PKGBUILD2010-10-23 13:02:22 UTC (rev 9)
@@ -1,26 +1,27 @@
 # $Id$
+# Maintainer
 # Contributor: tobias tob...@archlinux.org
 # Contributor Sarah Hay sarah...@mb.sympatico.ca
 
 pkgname=xpdf
 _srcver=3.02
-_patchlevel=pl4
+_patchlevel=pl5
 pkgver=${_srcver}_${_patchlevel}
-pkgrel=2
-pkgdesc=A viewer for Portable Document Format (PDF) files.
-arch=(i686 x86_64)
+pkgrel=1
+pkgdesc=A viewer for Portable Document Format (PDF) files
+arch=('i686' 'x86_64')
 license=('GPL')
 depends=('gcc-libs' 'lesstif' 't1lib' 'gsfonts' 'libxt' 'desktop-file-utils')
 optdepends=('poppler: pdf tools that used to be included in xpdf')
-backup=(etc/xpdfrc)
+backup=('etc/xpdfrc')
 url=http://www.foolabs.com/xpdf/;
-options=('force')
-install=xpdf.install
+install=${pkgname}.install
 source=(ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}.tar.gz
 ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}pl1.patch
 ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}pl2.patch
 ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}pl3.patch
-
ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}${_patchlevel}.patch
+ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}pl4.patch
+ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${_srcver}pl5.patch
 xpdf-3.00-xfont.patch
 xpdf.desktop)
 md5sums=('599dc4cc65a07ee868cf92a667a913d2'
@@ -28,38 +29,48 @@
  '3a5cb165ae66781e0b21e6219ae06795'
  '581963ede0fb5715e1a69f01b5b8ce63'
  '70b752716798dd341a4bf890df5f6fdc'
+ '504902ca5e9d66c67eed03636ec6b163'
  '6490de55687e0d2389212c1b5bbcf916'
  '93b9df5ebef3bc56133236ef3f176bb7')
 
 build() {
   cd ${srcdir}/${pkgname}-${_srcver}
-  patch -Np1 -i ${srcdir}/${pkgname}-${_srcver}pl1.patch || return 1
-  patch -Np1 -i ${srcdir}/${pkgname}-${_srcver}pl2.patch || return 1
-  patch -Np1 -i ${srcdir}/${pkgname}-${_srcver}pl3.patch || return 1
-  patch -Np1 -i ${srcdir}/${pkgname}-${_srcver}${_patchlevel}.patch || 
return 1
-  patch -Np1 -i ${srcdir}/xpdf-3.00-xfont.patch || return 1
-  sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' 
xpdf/GlobalParams.cc || return 1
+
+  patch -Np1 -i ${srcdir}/${pkgname}-${_srcver}pl1.patch
+  patch -Np1 -i ${srcdir}/${pkgname}-${_srcver}pl2.patch
+  patch -Np1 -i ${srcdir}/${pkgname}-${_srcver}pl3.patch
+  patch -Np1 -i ${srcdir}/${pkgname}-${_srcver}pl4.patch
+  patch -Np1 -i ${srcdir}/${pkgname}-${_srcver}pl5.patch
+  patch -Np1 -i ${srcdir}/xpdf-3.00-xfont.patch
+  sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' 
xpdf/GlobalParams.cc
+
   ./configure  \
 --prefix=/usr  \
 --sysconfdir=/etc  \
 --mandir=/usr/share/man\
---enable-multithreaded --enable-wordlist   \
+--enable-multithreaded \
+--enable-wordlist  \
 --with-freetype2-library=/usr/lib  \
 --with-freetype2-includes=/usr/include/freetype2   \
 --with-t1-library=/usr/lib \
 --with-t1-includes=/usr/include\
 --x-includes=/usr/include  \
 --with-Xm-library=/usr/lib \
---with-Xm-includes=/usr/include || return 1
-  make || return 1
+--with-Xm-includes=/usr/include
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${_srcver}
   make DESTDIR=${pkgdir} install
+
   # remove some libs and manpages provided by poppler now
   for tool in pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext ; do
 rm -f ${pkgdir}/usr/bin/${tool}
 rm -f ${pkgdir}/usr/share/man/man1/${tool}.1
   done
   install -m755 -d ${pkgdir}/usr/share/applications
-  install -m644 ${srcdir}/xpdf.desktop ${pkgdir}/usr/share/applications/ 
|| return 1
+  install -m644 ${srcdir}/xpdf.desktop ${pkgdir}/usr/share/applications/
   install -m755 -d ${pkgdir}/usr/share/pixmaps
-  install -m644 xpdf/xpdfIcon.xpm ${pkgdir}/usr/share/pixmaps/xpdf.xpm || 
return 1
+  install -m644 xpdf/xpdfIcon.xpm ${pkgdir}/usr/share/pixmaps/xpdf.xpm
 }