autu: Update to 0.68.0.r60.g7c6c1fef-1

2 files changed, 86 insertions, 96 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c7d50baebb01..6596a47eb845 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,30 @@
+# Generated by mksrcinfo v8
+# Tue Sep  4 03:44:59 UTC 2018
 pkgbase = poppler-git
-	pkgver = 0.33.0.r4409.11f117c
-	pkgrel = 2
-	url = http://poppler.freedesktop.org/
+	pkgver = 0.68.0.r60.g7c6c1fef
+	pkgrel = 1
+	url = https://poppler.freedesktop.org/
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = git
 	makedepends = libjpeg
 	makedepends = gcc-libs
 	makedepends = cairo
 	makedepends = fontconfig
-	makedepends = openjpeg
-	makedepends = gtk2
-	makedepends = qt4
+	makedepends = openjpeg2
+	makedepends = gtk3
 	makedepends = pkgconfig
 	makedepends = lcms2
 	makedepends = gobject-introspection
 	makedepends = icu
 	makedepends = qt5-base
+	makedepends = git
+	makedepends = nss
+	makedepends = gtk-doc
+	makedepends = curl
+	makedepends = poppler-data
+	makedepends = cmake
+	makedepends = python
 	options = !emptydirs
 	source = git://git.freedesktop.org/git/poppler/poppler
 	source = git://git.freedesktop.org/git/poppler/test
@@ -30,35 +37,27 @@ pkgname = poppler-git
 	depends = gcc-libs
 	depends = cairo
 	depends = fontconfig
-	depends = openjpeg
+	depends = openjpeg2
 	depends = lcms2
+	depends = nss
+	depends = curl
 	optdepends = poppler-data: encoding data to display PDF documents containing CJK characters
-	provides = poppler=0.33.0
-	provides = poppler
-	conflicts = poppler-qt3<0.33.0
+	provides = poppler=0.68.0
+	conflicts = poppler-qt3<0.68.0
+	conflicts = poppler-qt4<0.68.0
 	conflicts = poppler
 
 pkgname = poppler-glib-git
 	pkgdesc = Poppler glib bindings
-	depends = poppler-git
+	depends = poppler=0.68.0
 	depends = glib2
-	provides = poppler-glib
+	provides = poppler-glib=0.68.0
 	conflicts = poppler-glib
 
-pkgname = poppler-qt4-git
-	pkgdesc = Poppler Qt4 bindings
-	depends = poppler-git
-	depends = qt4
-	provides = poppler-qt=0.33.0
-	conflicts = poppler-qt
-	conflicts = poppler-qt4
-	replaces = poppler-qt
-	replaces = poppler-qt4
-
 pkgname = poppler-qt5-git
 	pkgdesc = Poppler Qt5 bindings
-	depends = poppler-git
+	depends = poppler=0.68.0
 	depends = qt5-base
-	provides = poppler-qt5
+	provides = poppler-qt5=0.68.0
 	conflicts = poppler-qt5
 
diff --git a/PKGBUILD b/PKGBUILD
index 8715a64c609d..0284787a2b41 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,121 +1,112 @@
-# Maintainer:  jyantis <yantis@yantis.net>
-
-# I basically ripped 90% of this from the official poppler PKGBUILD
-# So all the credit goes to Jan de Groot <jgc@archlinux.org>
-# Unless of course there is some epic fail then that is all me =)
-
-# Development takes place on git in what will be the 0.29 release series.
-
-pkgbase=poppler-git
-pkgname=('poppler-git' 'poppler-glib-git' 'poppler-qt4-git' 'poppler-qt5-git')
-pkgver=0.33.0.r4409.11f117c
-pkgrel=2
+# Maintainer:  Chris Severance aur.severach aATt spamgourmet dott com
+# Contributor: jyantis <yantis@yantis.net>
+# Contributor: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+set -u
+pkgbase='poppler-git'
+pkgname=('poppler-git' 'poppler-glib-git' 'poppler-qt5-git')
+pkgver=0.68.0.r60.g7c6c1fef
+pkgrel=1
 arch=(i686 x86_64)
 license=('GPL')
-makedepends=('git'  'libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu' 'qt5-base')
+makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg2' 'gtk3' 'pkgconfig' 'lcms2' 
+             'gobject-introspection' 'icu' 'qt5-base' 'git' 'nss' 'gtk-doc' 'curl' 'poppler-data'
+             'cmake' 'python') 
 options=('!emptydirs')
-url="http://poppler.freedesktop.org/"
+url="https://poppler.freedesktop.org/"
 source=('git://git.freedesktop.org/git/poppler/poppler'
         'git://git.freedesktop.org/git/poppler/test')
 sha256sums=('SKIP' 'SKIP')
-_standdardversion=$(echo $pkgver | cut -c -6)
-pkgver() {
-  cd poppler
 
-  _majorversion=$(grep -F "m4_define([poppler_version_major]" configure.ac | awk 'BEGIN {FS = "["} {print $3}' | sed -r 's/(\[|\])//g' | sed -r 's/(\(|\))//g')
-  _minorversion=$(grep -F "m4_define([poppler_version_minor]" configure.ac | awk 'BEGIN {FS = "["} {print $3}' | sed -r 's/(\[|\])//g' | sed -r 's/(\(|\))//g')
-  _microversion=$(grep -F "m4_define([poppler_version_micro]" configure.ac | awk 'BEGIN {FS = "["} {print $3}' | sed -r 's/(\[|\])//g' | sed -r 's/(\(|\))//g')
+_pkgver="${pkgver%%.r*}"
 
-  printf "%s." "$_majorversion"
-  printf "%s." "$_minorversion"
-  printf "%s." "$_microversion"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+pkgver() {
+  set -u
+  cd 'poppler'
+  git describe --long | sed -e 's/\([^-]*-g\)/r\1/;s/-/./g' -e 's:^poppler\.::g'
+  set +u
 }
 
 prepare() {
-  ln -sf test-${_testtag} test
-
-  cd poppler
-  git submodule init
-  git config submodule.test.url poppler/test
-  git submodule update test
+  set -u
+  cd 'poppler'
+  mkdir build
+  set +u
 }
 
 build() {
+  set -u
   cd poppler
-  ./autogen.sh
-  ./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
+  cd build
+  cmake .. \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+    -DENABLE_XPDF_HEADERS=ON \
+    -DENABLE_GTK_DOC=ON
   make
+  set +u
 }
 
 check() {
+  set -u
   cd poppler
-  LANG=en_US.UTF8 make check
+  cd build
+  LANG=en_US.UTF8 make test
+  set +u
 }
 
 package_poppler-git() {
+  set -u
   pkgdesc="PDF rendering library based on xpdf 3.0"
-  depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms2')
+  depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg2' 'lcms2' 'nss' 'curl')
   optdepends=('poppler-data: encoding data to display PDF documents containing CJK characters')
-  conflicts=("poppler-qt3<${_standdardversion}" 'poppler')
-  provides=("poppler=${_standdardversion}" 'poppler')
+  conflicts=("poppler-qt3<${_pkgver}" "poppler-qt4<${_pkgver}" 'poppler')
+  provides=("poppler=${_pkgver}")
 
   cd poppler
-  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,qt5}
+  rm -vf "${pkgdir}"//usr/lib/libpoppler-{glib,qt5}.*
+  rm -vf "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt5}.pc
+  rm -vrf "${pkgdir}"/usr/{lib,share}/gir*
+  rm -vrf "${pkgdir}"/usr/share/gtk-doc
 }
 
 package_poppler-glib-git() {
+  set -u
   pkgdesc="Poppler glib bindings"
-  depends=('poppler-git' 'glib2')
+  depends=("poppler=${_pkgver}" 'glib2')
   conflicts=('poppler-glib')
-  provides=( 'poppler-glib')
+  provides=("poppler-glib=${_pkgver}")
 
   cd poppler
-  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"
-}
-
-package_poppler-qt4-git() {
-  pkgdesc="Poppler Qt4 bindings"
-  provides=("poppler-qt=${_standdardversion}")
-  replaces=('poppler-qt' 'poppler-qt4' )
-  conflicts=('poppler-qt'  'poppler-qt4' )
-  depends=('poppler-git' 'qt4')
-
-  cd poppler
-  make -C poppler DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  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.*
+  rm -vf "${pkgdir}"/usr/lib/libpoppler.*
+  rm -vf "${pkgdir}/usr/bin/poppler-glib-demo"
+  set +u
 }
 
 package_poppler-qt5-git() {
+  set -u
   pkgdesc="Poppler Qt5 bindings"
-  depends=('poppler-git' 'qt5-base')
+  depends=("poppler=${_pkgver}" 'qt5-base')
   conflicts=('poppler-qt5')
-  provides=('poppler-qt5')
+  provides=("poppler-qt5=${_pkgver}")
 
   cd poppler
-  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.*
+  set +u
 }
+set +u