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

[Andrea Scarpino]

    Date: Saturday, October 23, 2010 @ 09:02:22
  Author: andrea
Revision: 96666

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
===================================================================
--- PKGBUILD	2010-10-23 12:10:42 UTC (rev 96665)
+++ PKGBUILD	2010-10-23 13:02:22 UTC (rev 96666)
@@ -1,26 +1,27 @@
 # $Id$
+# Maintainer
 # Contributor: tobias <tobias at archlinux.org>
 # Contributor Sarah Hay <sarahhay at 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
 }