diff --git a/common/shlibs b/common/shlibs index 72a57db3a38..f8c63d69d4c 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.71 poppler-0.60.1_1 +libpoppler.so.72 poppler-0.61.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/0001-do-not-install-function.cc-as-it-s-not-a-header.patch b/srcpkgs/poppler/patches/0001-do-not-install-function.cc-as-it-s-not-a-header.patch deleted file mode 100644 index 0ef234ca11b..00000000000 --- a/srcpkgs/poppler/patches/0001-do-not-install-function.cc-as-it-s-not-a-header.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 369cd504e70e55378c6395355056fa8676679e56 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Fri, 6 Oct 2017 08:07:35 +0200 -Subject: do not install Function.cc, as it's not a header - - -diff --git CMakeLists.txt.orig CMakeLists.txt -index 7485b2a..fe5911c 100644 ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -572,7 +572,6 @@ if(ENABLE_XPDF_HEADERS) - poppler/FontEncodingTables.h - poppler/FontInfo.h - poppler/Form.h -- poppler/Function.cc - poppler/Function.h - poppler/Gfx.h - poppler/GfxFont.h --- -cgit v0.10.2 - diff --git a/srcpkgs/poppler/patches/cmake.patch b/srcpkgs/poppler/patches/cmake.patch deleted file mode 100644 index a5f59b54bcc..00000000000 --- a/srcpkgs/poppler/patches/cmake.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 691fbf6e50a..fb2852f1aad 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -3,8 +3,8 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt{4,5}". # pkgname=poppler -version=0.60.1 -revision=2 +version=0.61.1 +revision=1 build_style=cmake configure_args="-DENABLE_XPDF_HEADERS=on $(vopt_if gir -DENABLE_GLIB=on) -DENABLE_QT4=off -DENABLE_QT5=off" @@ -17,7 +17,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://poppler.freedesktop.org" distfiles="${homepage}/$pkgname-$version.tar.xz" -checksum=19f185e05c3b59b4a1de2cec8ef39f5446035493d17bbed41d02fb9a77c8a93c +checksum=1266096343f5163c1a585124e9a6d44474e1345de5cdfe55dc7b47357bcfcda9 # Package build options build_options="gir"