diff options
| author | Toyohisa Kameyama <kameyama@riken.jp> | 2020-10-11 10:53:05 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-10 20:53:05 -0500 |
| commit | 6383ef808d9568708a2cd987db75b6da68c4e823 (patch) | |
| tree | f49bec62f2611b93918336325b8e222c2595f06e | |
| parent | 5a49c2bcafe69bac2164a7d6bfcffa83e07e090b (diff) | |
| download | spack-6383ef808d9568708a2cd987db75b6da68c4e823.tar.gz spack-6383ef808d9568708a2cd987db75b6da68c4e823.tar.bz2 spack-6383ef808d9568708a2cd987db75b6da68c4e823.tar.xz spack-6383ef808d9568708a2cd987db75b6da68c4e823.zip | |
poplpler: fix patch for 0.90.1. (#18969)
| -rw-r--r-- | var/spack/repos/builtin/packages/poppler/package.py | 3 | ||||
| -rwxr-xr-x | var/spack/repos/builtin/packages/poppler/poppler_page_splash.0.90.1.patch | 20 |
2 files changed, 22 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/poppler/package.py b/var/spack/repos/builtin/packages/poppler/package.py index 6ecab70351..7368e73428 100644 --- a/var/spack/repos/builtin/packages/poppler/package.py +++ b/var/spack/repos/builtin/packages/poppler/package.py @@ -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( diff --git a/var/spack/repos/builtin/packages/poppler/poppler_page_splash.0.90.1.patch b/var/spack/repos/builtin/packages/poppler/poppler_page_splash.0.90.1.patch new file mode 100755 index 0000000000..100d026f27 --- /dev/null +++ b/var/spack/repos/builtin/packages/poppler/poppler_page_splash.0.90.1.patch @@ -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 + { |