Tue Aug 6 01:53:08 PDT 2013

1 files changed, 32 insertions, 14 deletions

diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index 8e412251f..046d092d9 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,37 +1,38 @@
-# $Id: PKGBUILD 188733 2013-06-18 15:55:17Z andyrtr $
+# $Id: PKGBUILD 192058 2013-08-05 14:17:25Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
-pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.22.5
+pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5')
+pkgver=0.24.0
 pkgrel=1
 arch=(i686 x86_64)
 license=('GPL')
-makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu')
+makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu' 'qt5-base')
 options=('!libtool' '!emptydirs')
 url="http://poppler.freedesktop.org/"
 _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
-source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
+source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz
         http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2)
-md5sums=('1cd27460f7e3379d1eb109cfd7bcdb39'
+md5sums=('891000481f639e996d000d767d953a7f'
          '9dc64c254a31e570507bdd4ad4ba629a')
 
-build() {
-
-  cd "${srcdir}"
+prepare() {
   ln -sf test-${_testtag} test
   cd ${pkgbase}-${pkgver}
 
   sed -i -e '/AC_PATH_XTRA/d' configure.ac
   sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac
+}
+build() {
+  cd ${pkgbase}-${pkgver}
   autoreconf -fi
-
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --enable-cairo-output \
       --enable-xpdf-headers \
       --enable-libjpeg --enable-zlib \
       --enable-poppler-qt4 \
+      --enable-poppler-qt5 \
       --enable-poppler-glib
   make
 }
@@ -49,10 +50,11 @@ package_poppler() {
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   sed -e 's/^glib_subdir =.*/glib_subdir =/' \
-      -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile
+      -e 's/^qt4_subdir =.*/qt4_subdir =/' \
+      -e 's/^qt5_subdir =.*/qt5_subdir =/' -i Makefile
   make DESTDIR="${pkgdir}" install
 
-  rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc
+  rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4,qt5}.pc
 }
 
 package_poppler-glib() {
@@ -69,8 +71,11 @@ package_poppler-glib() {
   rm -f "${pkgdir}/usr/bin/poppler-glib-demo"
 }
 
-package_poppler-qt() {
-  pkgdesc="Poppler Qt bindings"
+package_poppler-qt4() {
+  pkgdesc="Poppler Qt4 bindings"
+  provides=("poppler-qt=${pkgver}")
+  replaces=('poppler-qt')
+  conflicts=('poppler-qt')
   depends=("poppler=${pkgver}" 'qt4')
 
   cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
@@ -81,3 +86,16 @@ package_poppler-qt() {
   install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/"
   rm -f "${pkgdir}"/usr/lib/libpoppler.*
 }
+
+package_poppler-qt5() {
+  pkgdesc="Poppler Qt5 bindings"
+  depends=("poppler=${pkgver}" 'qt5-base')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
+  make DESTDIR="${pkgdir}" install-libLTLIBRARIES
+  cd "${srcdir}/${pkgbase}-${pkgver}/qt5"
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
+  install -m644 ../poppler-qt5.pc "${pkgdir}/usr/lib/pkgconfig/"
+  rm -f "${pkgdir}"/usr/lib/libpoppler.*
+}