diff --git a/qt-libs/poppler/poppler-0.85.0-20200602.diff b/qt-libs/poppler/poppler-0.85.0-20200602.diff new file mode 100644 index 00000000..d4b9aec1 --- /dev/null +++ b/qt-libs/poppler/poppler-0.85.0-20200602.diff @@ -0,0 +1,12 @@ +diff -Nrub -x '*~' -x '*\.rej' -x '*\.orig' -x '*\.o' -x '*\.pyc' -x CMakeLists.txt.user poppler-0.85.0.orig/CMakeLists.txt poppler-0.85.0/CMakeLists.txt +--- poppler-0.85.0.orig/CMakeLists.txt 2020-01-29 23:26:58.000000000 +0100 ++++ poppler-0.85.0/CMakeLists.txt 2020-06-02 12:14:08.000000000 +0200 +@@ -453,7 +453,7 @@ + poppler/CurlCachedFile.cc + poppler/CurlPDFDocBuilder.cc + ) +- set(poppler_LIBS ${poppler_LIBS} ${CURL_LIBRARIES}) ++ set(poppler_LIBS ${poppler_LIBS} CURL::libcurl) + endif() + if (ENABLE_NSS3) + set(poppler_SRCS ${poppler_SRCS} diff --git a/qt-libs/poppler/poppler.py b/qt-libs/poppler/poppler.py index bfcc3c37..ec97c697 100644 --- a/qt-libs/poppler/poppler.py +++ b/qt-libs/poppler/poppler.py @@ -1,66 +1,64 @@ # -*- coding: utf-8 -*- # Copyright Hannah von Reth # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. import info from Package.CMakePackageBase import * class subinfo(info.infoclass): def setTargets(self): self.description = "PDF rendering library based on xpdf-3.0" self.svnTargets["master"] = "git://git.freedesktop.org/git/poppler/poppler" # use latest version with all security fixes! ver = "0.85.0"; self.defaultTarget = ver self.targets[ver] = f"https://poppler.freedesktop.org/poppler-{ver}.tar.xz" + self.patchToApply["0.85.0"] = [("poppler-0.85.0-20200602.diff", 1)] self.targetInstSrc[ver] = f"poppler-{ver}" self.targetDigests[ver] = (['2bc875eb323002ae6b287e09980473518e2b2ed6b5b7d2e1089e36a6cd00d94b'], CraftHash.HashAlgorithm.SHA256) def setDependencies(self): self.buildDependencies["dev-utils/pkg-config"] = None self.runtimeDependencies["data/poppler-data"] = None self.runtimeDependencies["libs/freetype"] = None self.runtimeDependencies["libs/libjpeg-turbo"] = None self.runtimeDependencies["libs/lcms2"] = None self.runtimeDependencies["libs/zlib"] = None self.runtimeDependencies["libs/openjpeg"] = None self.runtimeDependencies["libs/libjpeg-turbo"] = None self.runtimeDependencies["libs/libpng"] = None self.runtimeDependencies["libs/libcurl"] = None self.runtimeDependencies["libs/tiff"] = None self.runtimeDependencies["libs/iconv"] = None self.runtimeDependencies["libs/fontconfig"] = None self.runtimeDependencies["data/poppler-data"] = None self.runtimeDependencies["libs/qt5/qtbase"] = None class Package(CMakePackageBase): def __init__(self, **args): CMakePackageBase.__init__(self) - - self.subinfo.options.package.packageName = "poppler" - # we use -DRUN_GPERF_IF_PRESENT=OFF to avoid running in gperf issues on windows during linking self.subinfo.options.configure.args = "-DENABLE_XPDF_HEADERS=ON -DENABLE_ZLIB=ON -DENABLE_LIBCURL=ON -DENABLE_UTILS=OFF -DENABLE_LIBOPENJPEG=openjpeg2 -DENABLE_GLIB=OFF -DRUN_GPERF_IF_PRESENT=OFF"