From 796132fd5cdb85fe2ee9fc3b6da67ffbb79e9c39 Mon Sep 17 00:00:00 2001
From: Michael Gehring <mg@ebfe.org>
Date: Fri, 6 Oct 2017 11:23:14 +0000
Subject: [PATCH] poppler: update to 0.60.1. (soname bump)

build switched to cmake
---
 common/shlibs                       |  2 +-
 srcpkgs/poppler/patches/cmake.patch | 11 +++++++++++
 srcpkgs/poppler/template            | 22 ++++++----------------
 3 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/poppler/patches/cmake.patch

diff --git a/common/shlibs b/common/shlibs
index cbefb93677e..9a13eec6f44 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -333,7 +333,7 @@ libMagickCore-6.Q16.so.5 libmagick-6.9.9.0_1
 libMagickWand-6.Q16.so.5 libmagick-6.9.9.0_1
 libMagick++-6.Q16.so.8 libmagick-6.9.9.0_1
 libltdl.so.7 libltdl-2.2.6_1
-libpoppler.so.70 poppler-0.59.0_1
+libpoppler.so.71 poppler-0.60.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
diff --git a/srcpkgs/poppler/patches/cmake.patch b/srcpkgs/poppler/patches/cmake.patch
new file mode 100644
index 00000000000..a5f59b54bcc
--- /dev/null
+++ b/srcpkgs/poppler/patches/cmake.patch
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2017-10-05 08:11:45.375039727 +0000
++++ CMakeLists.txt	2017-10-05 08:12:51.950043161 +0000
+@@ -4,6 +4,8 @@
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+ 
++set(CMAKE_REQUIRED_FLAGS "-fPIC ${CMAKE_REQUIRED_FLAGS}")
++
+ include(PopplerDefaults)
+ include(PopplerMacros)
+ include(MacroOptionalFindPackage)
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index dc190876f15..d64ce4b611b 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -3,14 +3,12 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt{4,5}".
 #
 pkgname=poppler
-version=0.59.0
+version=0.60.1
 revision=1
-build_style=gnu-configure
-configure_args="--enable-zlib --enable-libcurl
- --enable-libtiff --enable-libopenjpeg=openjpeg2 --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"
+build_style=cmake
+configure_args="-DENABLE_XPDF_HEADERS=on $(vopt_if gir -DENABLE_GLIB=on)
+ -DENABLE_QT4=off -DENABLE_QT5=off"
+hostmakedepends="pkg-config glib-devel"
 makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel
  libcurl-devel libopenjpeg2-devel $(vopt_if gir gobject-introspection)"
 depends="poppler-data"
@@ -19,7 +17,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2"
 homepage="http://poppler.freedesktop.org"
 distfiles="${homepage}/$pkgname-$version.tar.xz"
-checksum=a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641
+checksum=19f185e05c3b59b4a1de2cec8ef39f5446035493d17bbed41d02fb9a77c8a93c
 
 # Package build options
 build_options="gir"
@@ -28,16 +26,11 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
 fi
 
-pre_configure() {
-	autoreconf -fi
-}
-
 poppler-cpp-devel_package() {
 	depends="libstdc++-devel zlib-devel poppler-devel-${version}_${revision} poppler-cpp-${version}_${revision}"
 	short_desc+=" - C++ bindings (development files)"
 	pkg_install() {
 		vmove usr/include/poppler/cpp
-		vmove usr/lib/libpoppler-cpp.a
 		vmove usr/lib/libpoppler-cpp.so
 		vmove usr/lib/pkgconfig/poppler-cpp.pc
 	}
@@ -56,11 +49,9 @@ poppler-devel_package() {
 		vmove usr/include/poppler/splash
 		vmove usr/include/poppler/fofi
 		vmove usr/include/poppler/goo
-		vmove usr/lib/libpoppler.a
 		vmove usr/lib/libpoppler.so
 		vmove usr/lib/pkgconfig/poppler.pc
 		vmove usr/lib/pkgconfig/poppler-splash.pc
-		vmove usr/share/gtk-doc
 	}
 }
 poppler-glib-devel_package() {
@@ -68,7 +59,6 @@ poppler-glib-devel_package() {
 	short_desc+=" - GLib bindings (development files)"
 	pkg_install() {
 		vmove usr/include/poppler/glib
-		vmove usr/lib/libpoppler-glib.a
 		vmove usr/lib/libpoppler-glib.so
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0