From 586609102bde55d495d79ff4c5457a38224e7c8c Mon Sep 17 00:00:00 2001
From: Jim Galarowicz <jeg@trenzasynergy.com>
Date: Wed, 18 Mar 2020 08:45:17 -0500
Subject: Previous qt package file changes broke the openspeedshop gui build.
(#15471)
* Previous qt changes broke the openspeedshop gui build. This puts back the changes that caused the breakage.
* Update the qt version to be more robust.
Co-authored-by: Galarowicz, James <jgalarowicz@newmexicoconsortium.org>
---
var/spack/repos/builtin/packages/openspeedshop/package.py | 2 +-
var/spack/repos/builtin/packages/qt/package.py | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py
index 56f9b0c689..a0cf6e46cd 100644
--- a/var/spack/repos/builtin/packages/openspeedshop/package.py
+++ b/var/spack/repos/builtin/packages/openspeedshop/package.py
@@ -96,7 +96,7 @@ class Openspeedshop(CMakePackage):
depends_on("libxml2")
- depends_on("qt@3", when='gui=qt3')
+ depends_on("qt@3:3.9", when='gui=qt3')
# Dependencies for the openspeedshop cbtf packages.
depends_on("cbtf@develop", when='@develop', type=('build', 'link', 'run'))
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index c07aa5c86e..1ffb17ceb4 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -132,9 +132,10 @@ class Qt(Package):
depends_on("sqlite+column_metadata", when='+sql%intel', type=('build', 'run'))
depends_on("libpng@1.2.57", when='@3')
+ depends_on("libsm", when='@3')
depends_on("pcre+multibyte", when='@5.0:5.8')
depends_on("inputproto", when='@:5.8')
- depends_on("openssl@:1.0.999", when='@:5.9+ssl')
+ depends_on("openssl@:1.0.999", when='@4:5.9+ssl')
depends_on("glib", when='@4:')
depends_on("libpng", when='@4:')
--
cgit v1.2.3-70-g09d2