0.47, drop Qt4 support

3 files changed, 22 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9d78427c2799..5152649c063e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Jan 28 07:16:43 UTC 2016
+# Sun Aug 21 06:51:20 UTC 2016
 pkgbase = mingw-w64-poppler
 	pkgdesc = PDF rendering library based on xpdf 3.0 (mingw-w64)
-	pkgver = 0.40.0
+	pkgver = 0.47.0
 	pkgrel = 1
 	url = http://poppler.freedesktop.org
 	arch = any
@@ -10,20 +10,15 @@ pkgbase = mingw-w64-poppler
 	makedepends = mingw-w64-configure
 	makedepends = mingw-w64-glib2
 	makedepends = mingw-w64-qt5-base
-	makedepends = mingw-w64-qt4
-	depends = mingw-w64-crt
-	depends = mingw-w64-libtiff
-	depends = mingw-w64-openjpeg
+	depends = mingw-w64-openjpeg2
 	depends = mingw-w64-cairo
-	depends = mingw-w64-curl
 	optdepends = mingw-w64-glib2: libpoppler-glib
 	optdepends = mingw-w64-qt5-base: libpoppler-qt5
-	optdepends = mingw-w64-qt4: libpoppler-qt4
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = http://poppler.freedesktop.org/poppler-0.40.0.tar.xz
-	md5sums = 2fec3b2401a1722418b1f5bf64cd00cd
+	source = http://poppler.freedesktop.org/poppler-0.47.0.tar.xz
+	md5sums = 669b195ff24173d35cacf1d20b6fe4fa
 
 pkgname = mingw-w64-poppler
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..436a59477780
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+pkg/
+src/
+*.tar
+*.xz
diff --git a/PKGBUILD b/PKGBUILD
index 68a993c29953..494a894745bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,18 @@
 # Maintainer: ant32 <antreimer@gmail.com>
 pkgname=mingw-w64-poppler
-pkgver=0.40.0
+pkgver=0.47.0
 pkgrel=1
 pkgdesc="PDF rendering library based on xpdf 3.0 (mingw-w64)"
 arch=(any)
 url="http://poppler.freedesktop.org"
 license=("GPL")
-makedepends=('mingw-w64-configure'
-             'mingw-w64-glib2'
-             'mingw-w64-qt5-base'
-             'mingw-w64-qt4')
-depends=('mingw-w64-crt'
-         'mingw-w64-libtiff'
-         'mingw-w64-openjpeg'
-         'mingw-w64-cairo'
-         'mingw-w64-curl')
+makedepends=(mingw-w64-configure mingw-w64-glib2 mingw-w64-qt5-base)
+depends=(mingw-w64-openjpeg2 mingw-w64-cairo)
 optdepends=("mingw-w64-glib2: libpoppler-glib"
-            "mingw-w64-qt5-base: libpoppler-qt5"
-            "mingw-w64-qt4: libpoppler-qt4")
-options=('!strip' '!buildflags' 'staticlibs')
+            "mingw-w64-qt5-base: libpoppler-qt5")
+options=(!strip !buildflags staticlibs)
 source=("http://poppler.freedesktop.org/poppler-${pkgver}.tar.xz")
-md5sums=('2fec3b2401a1722418b1f5bf64cd00cd')
+md5sums=('669b195ff24173d35cacf1d20b6fe4fa')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
@@ -32,19 +24,17 @@ build() {
     mkdir -p "${_arch%%-*}" && pushd "${_arch%%-*}"
     ${_arch}-configure \
       --enable-cairo-output \
-      --enable-poppler-qt4 \
+      --disable-poppler-qt4 \
       --enable-poppler-qt5 \
       --enable-xpdf-headers \
       --enable-poppler-glib \
       --enable-libjpeg \
-      --enable-libopenjpeg=openjpeg1 \
-      --disable-zlib \
-      --enable-libcurl \
+      --enable-zlib \
+      --enable-libopenjpeg=openjpeg2 \
       --disable-gtk-test \
-      --disable-utils \
       --disable-gtk-doc-html \
       --with-font-configuration=win32
-    make V=1
+    make
     popd
   done
 }
@@ -53,8 +43,8 @@ package() {
   for _arch in ${_architectures}; do
     cd "${srcdir}/poppler-$pkgver/${_arch%%-*}"
     make DESTDIR="$pkgdir" install
-    find "$pkgdir/usr/${_arch}" -name '*.exe' -o -name '*.bat' -o -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
-    find "$pkgdir/usr/${_arch}" -name '*.dll' | xargs -rtl1 ${_arch}-strip --strip-unneeded
-    find "$pkgdir/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs -rtl1 ${_arch}-strip -g
+    find "$pkgdir/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip {} \;
+    find "$pkgdir/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
+    find "$pkgdir/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs ${_arch}-strip -g
   done
 }