commit 7e5714408233a33483b8c1fa1770a77877ba9f11 Author: Juergen Daubert <jue@jue.li> Date: Mon Sep 11 12:54:08 2017 +0200 poppler: update to 0.59.0 diff --git a/poppler/.footprint b/poppler/.footprint index e46ee9e36..421d3eb93 100644 --- a/poppler/.footprint +++ b/poppler/.footprint @@ -154,9 +154,9 @@ drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/libpoppler-cpp.so -> libpoppler-cpp.so.0 lrwxrwxrwx root/root usr/lib/libpoppler-cpp.so.0 -> libpoppler-cpp.so.0.3.0 -rwxr-xr-x root/root usr/lib/libpoppler-cpp.so.0.3.0 -lrwxrwxrwx root/root usr/lib/libpoppler.so -> libpoppler.so.68 -lrwxrwxrwx root/root usr/lib/libpoppler.so.68 -> libpoppler.so.68.0.0 --rwxr-xr-x root/root usr/lib/libpoppler.so.68.0.0 +lrwxrwxrwx root/root usr/lib/libpoppler.so -> libpoppler.so.70 +lrwxrwxrwx root/root usr/lib/libpoppler.so.70 -> libpoppler.so.70.0.0 +-rwxr-xr-x root/root usr/lib/libpoppler.so.70.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/poppler-cairo.pc -rw-r--r-- root/root usr/lib/pkgconfig/poppler-cpp.pc diff --git a/poppler/.md5sum b/poppler/.md5sum index cd691abef..60796b3f6 100644 --- a/poppler/.md5sum +++ b/poppler/.md5sum @@ -1,2 +1,2 @@ -bc5a191741604552c90d484103229374 poppler-0.57.0.tar.xz -3550e95260ee788c6cc5ef0a579d3037 poppler-cmake.patch +6e44408a3b4f4a738f8a6770d0aea8a5 poppler-0.59.0.tar.xz +2d8ea187fdf89d2562be28506265ae4a poppler-cmake.patch diff --git a/poppler/.signature b/poppler/.signature index 2d1bd3138..1bb31bbfe 100644 --- a/poppler/.signature +++ b/poppler/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/VeTSqDgJOUBAd41gZ3QBHTEq+n0knvX5EKrfbVYemiMoFB/esrYYz0DF/DxSbx5ytHVBmOGO9QtYXBRLFBj8Q0= -SHA256 (Pkgfile) = 1b2bcfe22d0bace686669e9b3b4b88a4d5ee4778f22c715e8dd8ac3156ac85f5 -SHA256 (.footprint) = 3bb46ca2783dde9e912039140a3dc9b43f1ed02495a114a2933965a398bb0c1b -SHA256 (poppler-0.57.0.tar.xz) = 0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8 -SHA256 (poppler-cmake.patch) = 8a75147e58d5ecc2eb5baced98fcc405320ff94e2a8eb613c04c91aa8e441d5c +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 diff --git a/poppler/Pkgfile b/poppler/Pkgfile index 283bbe283..aa97865dc 100644 --- a/poppler/Pkgfile +++ b/poppler/Pkgfile @@ -4,7 +4,7 @@ # Depends on: cmake cairo lcms2 name=poppler -version=0.57.0 +version=0.59.0 release=1 source=(http://poppler.freedesktop.org/poppler-$version.tar.xz poppler-cmake.patch) @@ -27,11 +27,7 @@ build() { -DENABLE_ZLIB=ON \ -DENABLE_CMS=lcms2 \ -DENABLE_LIBOPENJPEG=none \ - -DENABLE_NSS3=OFF \ - -DBUILD_GTK_TESTS=OFF \ - -DBUILD_QT4_TESTS=OFF \ - -DBUILD_QT5_TESTS=OFF \ - -DBUILD_CPP_TESTS=OFF \ + -DENABLE_NSS3=OFF make make DESTDIR=$PKG install diff --git a/poppler/poppler-cmake.patch b/poppler/poppler-cmake.patch index c123c6d3c..ac346d9a2 100644 --- a/poppler/poppler-cmake.patch +++ b/poppler/poppler-cmake.patch @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2017-05-21 23:01:39.000000000 +0200 -+++ CMakeLists.txt 2017-05-22 14:12:44.635191266 +0200 -@@ -35,8 +35,14 @@ +--- 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) @@ -15,41 +15,36 @@ 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") -@@ -127,43 +133,46 @@ +@@ -130,38 +136,47 @@ message(FATAL_ERROR "Invalid ENABLE_DCTDECODER value.") endif() macro_optional_find_package(Qt4) --if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7) -- 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") -+if(ENABLE_QT5) -+ if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7) -+ 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() -+ else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7) - set(QT5_FOUND false) -- endif() --else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7) +-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) -- message("-- CMake >= 2.8.8 is needed to enable Qt5") --endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7) -- ++ ++ ++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}) @@ -66,13 +61,7 @@ - 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(GLIB_FOUND) --else(CAIRO_FOUND) -- set(CAIRO_FEATURE "#undef POPPLER_HAS_CAIRO") --endif(CAIRO_FOUND) -+ message("-- CMake >= 2.8.8 is needed to enable Qt5") -+ endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7) -+endif() ++ +if(ENABLE_CAIRO) + macro_optional_find_package(Cairo ${CAIRO_VERSION}) + if(CAIRO_FOUND) @@ -90,62 +79,54 @@ + 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(ENABLE_GLIB) -+ else(CAIRO_FOUND) ++ endif() ++ else() + set(CAIRO_FEATURE "#undef POPPLER_HAS_CAIRO") -+ endif(CAIRO_FOUND) -+endif(ENABLE_CAIRO) + endif() +-else() +- set(CAIRO_FEATURE "#undef POPPLER_HAS_CAIRO") + endif() ++ ++ if(ENABLE_CPP) macro_optional_find_package(Iconv) set(ENABLE_CPP ${ICONV_FOUND}) -@@ -277,10 +286,10 @@ +@@ -275,7 +290,7 @@ include_directories(${ZLIB_INCLUDE_DIR}) - endif(ENABLE_ZLIB) + endif() -if (NSS3_FOUND) +if (ENABLE_NSS3 AND NSS3_FOUND) add_definitions(${NSS3_CFLAGS}) set(ENABLE_NSS3 ON) --endif(NSS3_FOUND) -+endif(ENABLE_NSS3 AND NSS3_FOUND) - if(JPEG_FOUND) - include_directories(${JPEG_INCLUDE_DIR}) - endif(JPEG_FOUND) -@@ -716,12 +725,12 @@ + endif() +@@ -716,10 +731,10 @@ add_subdirectory(glib) - endif(ENABLE_GLIB) + endif() add_subdirectory(test) -if(QT4_FOUND) +if(ENABLE_QT4) add_subdirectory(qt4) --endif(QT4_FOUND) + endif() -if(QT5_FOUND) -+endif(ENABLE_QT4) +if(ENABLE_QT5) add_subdirectory(qt5) --endif(QT5_FOUND) -+endif(ENABLE_QT5) + endif() if(ENABLE_CPP) - add_subdirectory(cpp) - endif(ENABLE_CPP) -@@ -743,12 +752,12 @@ +@@ -743,10 +758,10 @@ if(ENABLE_SPLASH) poppler_create_install_pkgconfig(poppler-splash.pc lib${LIB_SUFFIX}/pkgconfig) - endif(ENABLE_SPLASH) + endif() -if(QT4_FOUND) +if(ENABLE_QT4) poppler_create_install_pkgconfig(poppler-qt4.pc lib${LIB_SUFFIX}/pkgconfig) --endif(QT4_FOUND) + endif() -if(QT5_FOUND) -+endif(ENABLE_QT4) +if(ENABLE_QT5) poppler_create_install_pkgconfig(poppler-qt5.pc lib${LIB_SUFFIX}/pkgconfig) --endif(QT5_FOUND) -+endif(ENABLE_QT5) + endif() if(ENABLE_GLIB) - poppler_create_install_pkgconfig(poppler-glib.pc lib${LIB_SUFFIX}/pkgconfig) - endif(ENABLE_GLIB) -@@ -767,8 +776,8 @@ +@@ -767,8 +782,8 @@ message(" with CMYK support") endif() show_end_message_yesno("cairo output" CAIRO_FOUND)