From e3096e94b18bfae813ceb198b2199294f8348534 Mon Sep 17 00:00:00 2001 From: Dylan Simon Date: Wed, 28 Jul 2021 12:23:56 -0400 Subject: [PATCH] poppler: drop splash patch for 21.07.0 (#25032) ENABLE_SPLASH configuration has been removed entirely after 21.06 so patch is no longer necessary after #24931. (Versions between 0.90.1 and 21.06 will likely still need a patch, and while it's not clear if this patch is the right one, seems better to leave something in.) --- var/spack/repos/builtin/packages/poppler/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/poppler/package.py b/var/spack/repos/builtin/packages/poppler/package.py index ccf2516fb3d..a3004b2725b 100644 --- a/var/spack/repos/builtin/packages/poppler/package.py +++ b/var/spack/repos/builtin/packages/poppler/package.py @@ -66,7 +66,7 @@ class Poppler(CMakePackage): # a small section of code in the QT5 wrappers that expects it # to be present. 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:') + patch('poppler_page_splash.0.90.1.patch', when='@0.90.1:21.06 ^qt@5.0:') # Only needed to run `make test` resource(