From 356561c5c7de639d15d4cc964a3484d144424fec Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Sat, 29 Nov 2014 23:32:23 +0100
Subject: [PATCH] poppler: update to 0.28.1 (soname bump)

---
 common/shlibs                |  3 +--
 srcpkgs/poppler-qt4/template | 20 ++++++++++++--------
 srcpkgs/poppler/template     | 28 +++++++++++++---------------
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ac0ed75f6e7..8012d524d92 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -339,7 +339,7 @@ libMagickCore-6.Q16.so.2 libmagick-6.8.8.4_1
 libMagickWand-6.Q16.so.2 libmagick-6.8.8.4_1
 libMagick++-6.Q16.so.5 libmagick-6.8.9.5_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.46 poppler-0.26.0_1
+libpoppler.so.47 poppler-0.28.1_1
 libpoppler-glib.so.8 poppler-glib-0.18.2_1
 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt4.so.4 poppler-qt4-0.22.3_1
@@ -1827,4 +1827,3 @@ libCDApplet.so cairo-dock-plugins-3.4.0_1
 libhydrogen-core-0.9.6.1.so hydrogen-0.9.6.1_1
 libldns.so.1 libldns-1.6.17_1
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
-
diff --git a/srcpkgs/poppler-qt4/template b/srcpkgs/poppler-qt4/template
index 70a421aaa1f..67c4e5e9d4e 100644
--- a/srcpkgs/poppler-qt4/template
+++ b/srcpkgs/poppler-qt4/template
@@ -1,24 +1,28 @@
-# Template file for 'poppler-qt4'.
+# Template file for 'poppler-qt4'
+#
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler"; IT IS SPLITTED TO AVOID
+# A CYCLIC DEPENDENCY: qt -> cups -> poppler -> qt.
+#
 pkgname=poppler-qt4
-version=0.26.4
+version=0.28.1
 revision=1
 wrksrc="poppler-${version}"
 build_style=gnu-configure
 configure_args="--enable-zlib --enable-libcurl --enable-libjpeg
  --enable-libtiff --disable-libopenjpeg --enable-cairo-output
  --enable-xpdf-headers --disable-gtk-test --disable-poppler-glib
- --enable-poppler-qt4 --disable-poppler-cpp --disable-utils
- --disable-static --disable-introspection"
+ --enable-poppler-qt4 --disable-poppler-qt5 --disable-poppler-cpp
+ --disable-utils --disable-static --disable-introspection"
 hostmakedepends="pkg-config"
-makedepends="libpng-devel>=1.5.10 tiff-devel lcms2-devel libcurl-devel
- fontconfig-devel cairo-devel qt-devel>=4.8.2_2"
-short_desc="PDF rendering library - QT4 bindings"
+makedepends="libpng-devel>=1.6 tiff-devel lcms2-devel libcurl-devel
+ fontconfig-devel cairo-devel qt-devel"
+short_desc="PDF rendering library - Qt4 bindings"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://poppler.freedesktop.org"
 update_pkgname=poppler
 distfiles="${homepage}/poppler-$version.tar.xz"
-checksum=7ede502a5ad6651d2ca56f3846ddee1ae66d0b1ab9bd302fb8b39a366d195c65
+checksum=2ccf6e234209aa5082ba99d3547e6798cd8758e7a921c72c00aedf0d5793fd06
 
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/libpoppler.*
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index 55b162dc0ef..74b6d094560 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -1,20 +1,25 @@
-# Template build file for 'poppler'.
+# Template file for 'poppler'
+#
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt4".
+#
 pkgname=poppler
-version=0.26.4
+version=0.28.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-zlib --enable-libcurl --enable-libjpeg
---enable-libtiff --disable-libopenjpeg --enable-cairo-output
---enable-xpdf-headers --disable-poppler-qt4 --disable-gtk-test"
-hostmakedepends="libtool pkg-config glib-devel"
-makedepends="libpng-devel>=1.6 glib-devel cairo-devel tiff-devel lcms2-devel libcurl-devel"
+ --enable-libtiff --disable-libopenjpeg --enable-cairo-output
+ --enable-xpdf-headers --disable-poppler-qt4 --disable-poppler-qt5
+ --disable-gtk-test $(vopt_enable gir introspection)"
+hostmakedepends="automake libtool pkg-config glib-devel gettext-devel"
+makedepends="libpng-devel>=1.6 glib-devel cairo-devel tiff-devel lcms2-devel
+ libcurl-devel $(vopt_if gir gobject-introspection)"
 depends="poppler-data"
 short_desc="PDF rendering library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://poppler.freedesktop.org"
 distfiles="${homepage}/$pkgname-$version.tar.xz"
-checksum=7ede502a5ad6651d2ca56f3846ddee1ae66d0b1ab9bd302fb8b39a366d195c65
+checksum=2ccf6e234209aa5082ba99d3547e6798cd8758e7a921c72c00aedf0d5793fd06
 
 # Package build options
 build_options="gir"
@@ -23,15 +28,8 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
 fi
 
-if [ "$build_option_gir" ]; then
-	configure_args+=" --enable-introspection"
-	makedepends+=" gobject-introspection"
-else
-	configure_args+=" --disable-introspection"
-fi
-
 pre_configure() {
-	libtoolize -f
+	autoreconf -fi
 }
 
 poppler-cpp-devel_package() {