zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

poplpler: fix patch for 0.90.1. (#18969)

Browse Source
This commit is contained in:
Toyohisa Kameyama 2020-10-11 10:53:05 +09:00 committed by GitHub
parent 5a49c2bcaf
commit 6383ef808d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
var/spack/repos/builtin/packages/poppler/package.py
View File

@ -62,7 +62,8 @@ class Poppler(CMakePackage):
# Splash is unconditionally disabled. Unfortunately there's
# a small section of code in the QT5 wrappers that expects it
# to be present.
patch('poppler_page_splash.patch', when='@0.64.0: ^qt@5.0:')
patch('poppler_page_splash.patch', when='@0.64.0:0.90.0 ^qt@5.0:')
patch('poppler_page_splash.0.90.1.patch', when='@0.90.1: ^qt@5.0:')
# Only needed to run `make test`
resource(

20
var/spack/repos/builtin/packages/poppler/poppler_page_splash.0.90.1.patch Executable file
View File

@ -0,0 +1,20 @@
diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc
index c4d00a6..e72c26b 100644
--- a/qt5/src/poppler-page.cc
+++ b/qt5/src/poppler-page.cc
@@ -103,6 +103,8 @@ public:
QVariant payload;
};
+#if defined(HAVE_SPLASH)
+
class Qt5SplashOutputDev : public SplashOutputDev, public OutputDevCallbackHelper
{
public:
@@ -163,5 +156,6 @@ private:
bool ignorePaperColor;
};
+#endif
class QImageDumpingArthurOutputDev : public ArthurOutputDev, public OutputDevCallbackHelper
{