poppler: update to 0.60.0

5 files changed, 12 insertions, 151 deletions

diff --git a/poppler/.footprint b/poppler/.footprint
index 421d3eb93..f148a6bb6 100644
--- a/poppler/.footprint
+++ b/poppler/.footprint
@@ -5,6 +5,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/pdfimages
 -rwxr-xr-x	root/root	usr/bin/pdfinfo
 -rwxr-xr-x	root/root	usr/bin/pdfseparate
+-rwxr-xr-x	root/root	usr/bin/pdfsig
 -rwxr-xr-x	root/root	usr/bin/pdftocairo
 -rwxr-xr-x	root/root	usr/bin/pdftohtml
 -rwxr-xr-x	root/root	usr/bin/pdftoppm
@@ -23,6 +24,8 @@ drwxr-xr-x	root/root	usr/include/poppler/
 -rw-r--r--	root/root	usr/include/poppler/CharCodeToUnicode.h
 -rw-r--r--	root/root	usr/include/poppler/CharTypes.h
 -rw-r--r--	root/root	usr/include/poppler/CompactFontTables.h
+-rw-r--r--	root/root	usr/include/poppler/CurlCachedFile.h
+-rw-r--r--	root/root	usr/include/poppler/CurlPDFDocBuilder.h
 -rw-r--r--	root/root	usr/include/poppler/DateInfo.h
 -rw-r--r--	root/root	usr/include/poppler/Decrypt.h
 -rw-r--r--	root/root	usr/include/poppler/Dict.h
diff --git a/poppler/.md5sum b/poppler/.md5sum
index 60796b3f6..7cb262a92 100644
--- a/poppler/.md5sum
+++ b/poppler/.md5sum
@@ -1,2 +1 @@
-6e44408a3b4f4a738f8a6770d0aea8a5  poppler-0.59.0.tar.xz
-2d8ea187fdf89d2562be28506265ae4a  poppler-cmake.patch
+2cde7f726363dbcdc23c95002ac60cc6  poppler-0.60.0.tar.xz
diff --git a/poppler/.signature b/poppler/.signature
index 1bb31bbfe..568b8f28a 100644
--- a/poppler/.signature
+++ b/poppler/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/VqOnu3Ja/nq6Q0j9xIuCqp4Bv5gULwOjmv4x2mDg0ruEw6+Ayo/RdBX9aDDPWQA2yZ59mXI0D+6BQbAylie+A4=
-SHA256 (Pkgfile) = b105c471c81f8a5b2012f90364265c0a5dd11ca3a58471f33c9c64706614c4b3
-SHA256 (.footprint) = b6718ca226e4e5ff8cbc74ab71c43f159f4d48a129b9597d02c987b5d3f58518
-SHA256 (poppler-0.59.0.tar.xz) = a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641
-SHA256 (poppler-cmake.patch) = f170e24a8c9c515df3ab5362e873f3b74b063ef152d502650524436cdac14ae9
+RWSE3ohX2g5d/aJBbvUxFVDh/FiBf/3OoeDs++mxcXRl2BmvzE5a0Rl/rB8GZigx0WwnO3Hq7K8FR1n38iT5YvPITbBu9OjfoQQ=
+SHA256 (Pkgfile) = f1a274a9f700fdae8636c74380c29f42101b35cf7bc12b9889218e56f3a371ce
+SHA256 (.footprint) = 9132d91f04b26f96b6aa3115470fc8f2012de9b72069ffaef1793308da6c8c6a
+SHA256 (poppler-0.60.0.tar.xz) = 1570774f44ba86c42ffacc5d9151a771e99584a55e6631bdf267123a2aed1c72
diff --git a/poppler/Pkgfile b/poppler/Pkgfile
index aa97865dc..9ab1320a3 100644
--- a/poppler/Pkgfile
+++ b/poppler/Pkgfile
@@ -4,22 +4,21 @@
 # Depends on:  cmake cairo lcms2
 
 name=poppler
-version=0.59.0
+version=0.60.0
 release=1
-source=(http://poppler.freedesktop.org/poppler-$version.tar.xz
-        poppler-cmake.patch)
+source=(http://poppler.freedesktop.org/poppler-$version.tar.xz)
 
 build() {
     cd poppler-$version
 
-    patch -p0 -i $SRC/poppler-cmake.patch
+    # fix version string
+    sed -i '/POPPLER_MINOR_VERSION/s/59/60/' CMakeLists.txt
 
     cmake . \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DENABLE_XPDF_HEADERS=ON \
         -DENABLE_UTILS=ON \
         -DENABLE_SPLASH=ON \
-        -DENABLE_CAIRO=ON \
         -DENABLE_CPP=ON \
         -DENABLE_GLIB=OFF \
         -DENABLE_QT4=OFF \
diff --git a/poppler/poppler-cmake.patch b/poppler/poppler-cmake.patch
deleted file mode 100644
index ac346d9a2..000000000
--- a/poppler/poppler-cmake.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- CMakeLists.txt.orig	2017-09-03 22:54:06.000000000 +0200
-+++ CMakeLists.txt	2017-09-04 14:38:15.234927567 +0200
-@@ -36,8 +36,14 @@
- option(BUILD_QT5_TESTS "Whether compile the Qt5 test programs." ON)
- option(BUILD_CPP_TESTS "Whether compile the CPP test programs." ON)
- option(ENABLE_SPLASH "Build the Splash graphics backend." ON)
-+option(ENABLE_CAIRO "Build the Cairo graphics backend." ON)
- option(ENABLE_UTILS "Compile poppler command line utils." ON)
- option(ENABLE_CPP "Compile poppler cpp wrapper." ON)
-+option(ENABLE_GLIB "Compile poppler glib wrapper." ON)
-+option(ENABLE_QT4 "Compile poppler QT4 wrapper." ON)
-+option(ENABLE_QT5 "Compile poppler QT5 wrapper." ON)
-+option(ENABLE_NSS3 "Build with NSS3 support." OFF)
-+
- set(ENABLE_LIBOPENJPEG "auto" CACHE STRING "Use libopenjpeg for JPX streams. Possible values: auto, openjpeg1, openjpeg2, unmaintained, none. 'auto' prefers openjpeg2 over openjpeg1 if both are available. 'unmaintained' gives you the internal unmaintained decoder. Use at your own risk. 'none' compiles no JPX decoder at all. Default: auto")
- set(ENABLE_CMS "auto" CACHE STRING "Use color management system. Possible values: auto, lcms1, lcms2. 'auto' prefers lcms2 over lcms1 if both are available. Unset to disable color management system.")
- set(ENABLE_DCTDECODER "libjpeg" CACHE STRING "Use libjpeg for DCT streams. Possible values: libjpeg, unmaintained, none. will use libjpeg if available or fail if not. 'unmaintained' gives you the internal unmaintained decoder. Use at your own risk. 'none' compiles no DCT decoder at all. Default: libjpeg")
-@@ -130,38 +136,47 @@
-   message(FATAL_ERROR "Invalid ENABLE_DCTDECODER value.")
- endif()
- macro_optional_find_package(Qt4)
--find_package(Qt5Core)
--find_package(Qt5Gui)
--find_package(Qt5Xml)
--find_package(Qt5Widgets)
--find_package(Qt5Test)
--if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND)
--  set(QT5_FOUND true)
--else ()
--  message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found")
--  set(QT5_FOUND false)
-+
-+
-+if(ENABLE_QT5)
-+  find_package(Qt5Core)
-+  find_package(Qt5Gui)
-+  find_package(Qt5Xml)
-+  find_package(Qt5Widgets)
-+  find_package(Qt5Test)
-+  if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND)
-+    set(QT5_FOUND true)
-+  else ()
-+    message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found")
-+    set(QT5_FOUND false)
-+  endif()
- endif()
- 
--macro_optional_find_package(Cairo ${CAIRO_VERSION})
--if(CAIRO_FOUND)
--  set(HAVE_CAIRO ${CAIRO_FOUND})
--  set(CAIRO_FEATURE "#define POPPLER_HAS_CAIRO 1")
--  set(CAIRO_REQ "cairo")
--  set(POPPLER_GLIB_DISABLE_DEPRECATED "")
--  set(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES "")
--  macro_optional_find_package(GLIB)
--  if(GLIB_FOUND)
--    set(ENABLE_GLIB ON)
--    # Check for introspection
--    macro_optional_find_package(GObjectIntrospection 0.9.12)
--    set(HAVE_INTROSPECTION ${INTROSPECTION_FOUND})
--    set(POPPLER_GLIB_DISABLE_DEPRECATED "${POPPLER_GLIB_DISABLE_DEPRECATED} -DG_DISABLE_DEPRECATED")
--    set(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES "${POPPLER_GLIB_DISABLE_SINGLE_INCLUDES} -DG_DISABLE_SINGLE_INCLUDES")
--    macro_optional_find_package(GTK)
-+
-+if(ENABLE_CAIRO)
-+  macro_optional_find_package(Cairo ${CAIRO_VERSION})
-+  if(CAIRO_FOUND)
-+    set(HAVE_CAIRO ${CAIRO_FOUND})
-+    set(CAIRO_FEATURE "#define POPPLER_HAS_CAIRO 1")
-+    set(CAIRO_REQ "cairo")
-+    set(POPPLER_GLIB_DISABLE_DEPRECATED "")
-+    set(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES "")
-+    macro_optional_find_package(GLIB)
-+    if(ENABLE_GLIB)
-+      set(ENABLE_GLIB ON)
-+      # Check for introspection
-+      macro_optional_find_package(GObjectIntrospection 0.9.12)
-+      set(HAVE_INTROSPECTION ${INTROSPECTION_FOUND})
-+      set(POPPLER_GLIB_DISABLE_DEPRECATED "${POPPLER_GLIB_DISABLE_DEPRECATED} -DG_DISABLE_DEPRECATED")
-+      set(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES "${POPPLER_GLIB_DISABLE_SINGLE_INCLUDES} -DG_DISABLE_SINGLE_INCLUDES")
-+      macro_optional_find_package(GTK)
-+    endif()
-+  else()
-+    set(CAIRO_FEATURE "#undef POPPLER_HAS_CAIRO")
-   endif()
--else()
--  set(CAIRO_FEATURE "#undef POPPLER_HAS_CAIRO")
- endif()
-+
-+
- if(ENABLE_CPP)
-   macro_optional_find_package(Iconv)
-   set(ENABLE_CPP ${ICONV_FOUND})
-@@ -275,7 +290,7 @@
-   include_directories(${ZLIB_INCLUDE_DIR})
- endif()
- 
--if (NSS3_FOUND)
-+if (ENABLE_NSS3 AND NSS3_FOUND)
-   add_definitions(${NSS3_CFLAGS})
-   set(ENABLE_NSS3 ON)
- endif()
-@@ -716,10 +731,10 @@
-   add_subdirectory(glib)
- endif()
- add_subdirectory(test)
--if(QT4_FOUND)
-+if(ENABLE_QT4)
-   add_subdirectory(qt4)
- endif()
--if(QT5_FOUND)
-+if(ENABLE_QT5)
-   add_subdirectory(qt5)
- endif()
- if(ENABLE_CPP)
-@@ -743,10 +758,10 @@
- if(ENABLE_SPLASH)
-   poppler_create_install_pkgconfig(poppler-splash.pc lib${LIB_SUFFIX}/pkgconfig)
- endif()
--if(QT4_FOUND)
-+if(ENABLE_QT4)
-   poppler_create_install_pkgconfig(poppler-qt4.pc lib${LIB_SUFFIX}/pkgconfig)
- endif()
--if(QT5_FOUND)
-+if(ENABLE_QT5)
-   poppler_create_install_pkgconfig(poppler-qt5.pc lib${LIB_SUFFIX}/pkgconfig)
- endif()
- if(ENABLE_GLIB)
-@@ -767,8 +782,8 @@
-   message("      with CMYK support")
- endif()
- show_end_message_yesno("cairo output" CAIRO_FOUND)
--show_end_message_yesno("qt4 wrapper" QT4_FOUND)
--show_end_message_yesno("qt5 wrapper" QT5_FOUND)
-+show_end_message_yesno("qt4 wrapper" ENABLE_QT4)
-+show_end_message_yesno("qt5 wrapper" ENABLE_QT5)
- show_end_message_yesno("glib wrapper" ENABLE_GLIB)
- show_end_message_yesno("  introspection" INTROSPECTION_FOUND)
- show_end_message_yesno("cpp wrapper" ENABLE_CPP)