git » poppler.git » commit c4cf76d

diff --git a/PKGBUILD b/PKGBUILD
index 87213fc..0a5106c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,42 +3,38 @@
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5')
-pkgver=0.59.0
+pkgver=0.60.0
 pkgrel=1
 arch=(i686 x86_64)
 license=('GPL')
 makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg2' 'gtk3' 'qt4' 'pkgconfig' 'lcms2' 
-             'gobject-introspection' 'icu' 'qt5-base' 'git' 'nss' 'gtk-doc' 'curl' 'poppler-data')
+             'gobject-introspection' 'icu' 'qt5-base' 'git' 'nss' 'gtk-doc' 'curl' 'poppler-data'
+             'cmake' 'python2') # python2 just for make-glib-api-docs/gtkdoc.py
 options=('!emptydirs')
 url="https://poppler.freedesktop.org/"
 source=(https://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz
         test::git+https://anongit.freedesktop.org/git/poppler/test/#commit=0d2bfd4)
-sha256sums=('a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641'
+sha256sums=('1570774f44ba86c42ffacc5d9151a771e99584a55e6631bdf267123a2aed1c72'
             'SKIP')
 
-build() {
-  cd ${pkgbase}-${pkgver}
-  ./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 \
-      --enable-libopenjpeg=openjpeg2 \
-      --enable-libcurl \
-      --enable-gtk-doc \
-      --enable-gtk-test
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+prepare() {
+  mkdir build
+  sed -i -e "s:python:python2:" ${pkgbase}-${pkgver}/make-glib-api-docs
+}
 
+build() {
+  cd build
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+    -DENABLE_XPDF_HEADERS=ON \
+    -DENABLE_GTK_DOC=ON
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  LANG=en_US.UTF8 make check
+  cd build
+  LANG=en_US.UTF8 make test
 }
 
 package_poppler() {
@@ -47,26 +43,28 @@ package_poppler() {
   optdepends=('poppler-data: encoding data to display PDF documents containing CJK characters')
   conflicts=("poppler-qt3<${pkgver}")
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -e 's/^glib_subdir =.*/glib_subdir =/' \
-      -e 's/^qt4_subdir =.*/qt4_subdir =/' \
-      -e 's/^qt5_subdir =.*/qt5_subdir =/' -i Makefile
+  cd build
   make DESTDIR="${pkgdir}" install
 
-  rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4,qt5}.pc
+  # cleanup for splitted build
+  rm -vrf "${pkgdir}"/usr/include/poppler/{glib,qt4,qt5}
+  rm -vf "${pkgdir}"//usr/lib/libpoppler-{glib,qt4,qt5}.*
+  rm -vf "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4,qt5}.pc
+  rm -vrf "${pkgdir}"/usr/{lib,share}/gir*
+  rm -vrf "${pkgdir}"/usr/share/gtk-doc
 }
 
 package_poppler-glib() {
   pkgdesc="Poppler glib bindings"
   depends=("poppler=${pkgver}" 'glib2')
 
-  cd "${pkgbase}-${pkgver}"
-  make -C poppler DESTDIR="${pkgdir}" install-libLTLIBRARIES
+  cd build
+
   make -C glib DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
   install -m644 poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/"
-  rm -f "${pkgdir}"/usr/lib/libpoppler.*
-  rm -f "${pkgdir}/usr/bin/poppler-glib-demo"
+  rm -vf "${pkgdir}"/usr/lib/libpoppler.*
+  rm -vf "${pkgdir}/usr/bin/poppler-glib-demo"
 }
 
 package_poppler-qt4() {
@@ -76,22 +74,19 @@ package_poppler-qt4() {
   conflicts=('poppler-qt')
   depends=("poppler=${pkgver}" 'qt4')
 
-  cd "${pkgbase}-${pkgver}"
-  make -C poppler DESTDIR="${pkgdir}" install-libLTLIBRARIES
+  cd build
   make -C qt4 DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
   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 "${pkgbase}-${pkgver}"
-  make -C poppler DESTDIR="${pkgdir}" install-libLTLIBRARIES
+  cd build
   make -C qt5 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.*
 }
+