From adc4699c3adb343b7f4dcd92cc078ffdd4a76e5f Mon Sep 17 00:00:00 2001 From: Manuela Kuhn <36827019+manuelakuhn@users.noreply.github.com> Date: Fri, 11 Jun 2021 19:24:28 +0200 Subject: [PATCH] qt+webkit: fix python2 dependency and add opengl conflict (#24276) --- var/spack/repos/builtin/packages/qt/package.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 26b205f253..e0d6081e70 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -160,7 +160,7 @@ class Qt(Package): depends_on("gperf", when='+webkit') depends_on("gtkplus", when='+gtk') depends_on("openssl", when='+ssl') - depends_on("python@2.7.5:2.999", when='@5.14: +webkit', type='build') + depends_on("python@2.7.5:2.999", when='+webkit', type='build') depends_on("sqlite+column_metadata", when='+sql', type=('build', 'run')) depends_on("libpng@1.2.57", when='@3') @@ -179,6 +179,9 @@ class Qt(Package): depends_on("pcre2+multibyte", when='@5.9:') depends_on("llvm", when='@5.11: +doc') + # the gl headers are needed to build webkit + conflicts('~opengl', when='+webkit') + # gcc@4 is not supported as of Qt@5.14 # https://doc.qt.io/qt-5.14/supported-platforms.html conflicts('%gcc@:4.99', when='@5.14:')