diff options
author | Denis Davydov <davydden@gmail.com> | 2019-10-06 21:28:34 +0200 |
---|---|---|
committer | Adam J. Stewart <ajstewart426@gmail.com> | 2019-10-06 14:28:34 -0500 |
commit | 79bd6bbd04bcf33f9574f95dc2fc1ecad6403dda (patch) | |
tree | c803f93f0598a3f40ed7ad1597001d68ac10da2b | |
parent | 3d247d9567e700f7bc27c84a8687bf86013e7944 (diff) | |
download | spack-79bd6bbd04bcf33f9574f95dc2fc1ecad6403dda.tar.gz spack-79bd6bbd04bcf33f9574f95dc2fc1ecad6403dda.tar.bz2 spack-79bd6bbd04bcf33f9574f95dc2fc1ecad6403dda.tar.xz spack-79bd6bbd04bcf33f9574f95dc2fc1ecad6403dda.zip |
gnuplot: add 5.2.7 and fix qt dep (#13058)
-rw-r--r-- | var/spack/repos/builtin/packages/gnuplot/package.py | 2 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/gnuplot/package.py b/var/spack/repos/builtin/packages/gnuplot/package.py index c33b207cf2..63578e2f5d 100644 --- a/var/spack/repos/builtin/packages/gnuplot/package.py +++ b/var/spack/repos/builtin/packages/gnuplot/package.py @@ -26,6 +26,7 @@ class Gnuplot(AutotoolsPackage): # dependency of readline. Fix it with a small patch patch('term_include.patch') + version('5.2.7', '97fe503ff3b2e356fe2ae32203fc7fd2cf9cef1f46b60fe46dc501a228b9f4ed') version('5.2.5', '039db2cce62ddcfd31a6696fe576f4224b3bc3f919e66191dfe2cdb058475caa') version('5.2.2', '60aedd08998160593199459dea8467fe') version('5.2.0', '0bd8f9af84c0ad2fa9de16772c366416') @@ -64,6 +65,7 @@ class Gnuplot(AutotoolsPackage): depends_on('pango@1.10:', when='+cairo') depends_on('libx11', when='+X') depends_on('qt@5.7:+opengl', when='+qt') + depends_on('qt+framework', when='+qt platform=darwin') def configure_args(self): # see https://github.com/Homebrew/homebrew-core/blob/master/Formula/gnuplot.rb diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 8585f6a272..2df6befa71 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -51,7 +51,7 @@ class Qt(Package): description="Build the Webkit extension") variant('examples', default=False, description="Build examples.") - variant('framework', default=False, + variant('framework', default=bool(MACOS_VERSION), description="Build as a macOS Framework package.") variant('tools', default=True, description="Build tools, including Qt Designer.") |