diff options
| author | nicolas le goff <14815625+nicolaslg@users.noreply.github.com> | 2023-03-08 18:38:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-08 18:38:33 +0100 |
| commit | 7d54c24939a831a223ccc749ad240668f04d15f6 (patch) | |
| tree | ddd321a5e7046729df2e46963ab0918d58336ab2 /var | |
| parent | 960923287d52ad88215a64210c71598feb377258 (diff) | |
| download | spack-7d54c24939a831a223ccc749ad240668f04d15f6.tar.gz spack-7d54c24939a831a223ccc749ad240668f04d15f6.tar.bz2 spack-7d54c24939a831a223ccc749ad240668f04d15f6.tar.xz spack-7d54c24939a831a223ccc749ad240668f04d15f6.zip | |
qwt: lift restrictions on qt version and added an opengl variant and VisIt use (#35734)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/qwt/no-opengl_6_1.patch | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/qwt/package.py | 9 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/visit/package.py | 2 |
3 files changed, 21 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/qwt/no-opengl_6_1.patch b/var/spack/repos/builtin/packages/qwt/no-opengl_6_1.patch new file mode 100644 index 0000000000..6c84e22c1a --- /dev/null +++ b/var/spack/repos/builtin/packages/qwt/no-opengl_6_1.patch @@ -0,0 +1,12 @@ +diff -Naur qwt-6.1.4_orig/qwtconfig.pri qwt-6.1.4_dest/qwtconfig.pri +--- qwt-6.1.4_orig/qwtconfig.pri 2019-01-02 17:21:31.556467499 +0100 ++++ qwt-6.1.4_dest/qwtconfig.pri 2023-02-24 12:21:06.730207447 +0100 +@@ -99,7 +99,7 @@ + # If you want to use a OpenGL plot canvas + ###################################################################### + +-QWT_CONFIG += QwtOpenGL ++#QWT_CONFIG += QwtOpenGL + + ###################################################################### + # You can use the MathML renderer of the Qt solutions package to diff --git a/var/spack/repos/builtin/packages/qwt/package.py b/var/spack/repos/builtin/packages/qwt/package.py index c8ff0bd18f..e2d7a8e0ee 100644 --- a/var/spack/repos/builtin/packages/qwt/package.py +++ b/var/spack/repos/builtin/packages/qwt/package.py @@ -23,11 +23,18 @@ class Qwt(QMakePackage): version("5.2.2", sha256="36bf2ee51ca9c74fde1322510ffd39baac0db60d5d410bb157968a78d9c1464b") variant("designer", default=False, description="Build extensions to QT designer") + variant("opengl", default=False, description="Build OpenGL plot canvas") patch("no-designer.patch", when="~designer") + patch("no-opengl_6_1.patch", when="@6.1 ~opengl") - depends_on("qt@:5.14.2+opengl") depends_on("qt+tools", when="+designer") + depends_on("qt+opengl", when="+opengl") + + depends_on("qt") + # the qt@5.14.2 limitation was lifted in qwt@6.1.5 + # https://sourceforge.net/p/qwt/code/HEAD/tree/tags/qwt-6.1.6/CHANGES-6.1 + depends_on("qt@:5.14.2", when="@:6.1.4") # Qwt 6.1.1 and older use a constant that was removed in Qt 5.4 # https://bugs.launchpad.net/ubuntu/+source/qwt-qt5/+bug/1485213 depends_on("qt@:5.3", when="@:6.1.1") diff --git a/var/spack/repos/builtin/packages/visit/package.py b/var/spack/repos/builtin/packages/visit/package.py index a9ed58a902..55940c96b9 100644 --- a/var/spack/repos/builtin/packages/visit/package.py +++ b/var/spack/repos/builtin/packages/visit/package.py @@ -124,7 +124,7 @@ class Visit(CMakePackage): # VisIt doesn't work with later versions of qt. depends_on("qt+gui+opengl@5:5.14", when="+gui") - depends_on("qwt", when="+gui") + depends_on("qwt+opengl", when="+gui") # python@3.8 doesn't work with VisIt. depends_on("python@3.2:3.7", when="+python") |