diff options
| author | Wouter Deconinck <wdconinc@gmail.com> | 2021-09-26 08:52:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-26 15:52:51 +0200 |
| commit | 798ef2bdb0b53809e121a1f5956459a1c51de559 (patch) | |
| tree | 6446fe03ed37522f2ddcb1bb6aa1987e75d57be3 /var | |
| parent | cc658c5f1e065a206555668b4aaa49b568839279 (diff) | |
| download | spack-798ef2bdb0b53809e121a1f5956459a1c51de559.tar.gz spack-798ef2bdb0b53809e121a1f5956459a1c51de559.tar.bz2 spack-798ef2bdb0b53809e121a1f5956459a1c51de559.tar.xz spack-798ef2bdb0b53809e121a1f5956459a1c51de559.zip | |
vtk: depends_on freetype @:2.10.2 through @:9.0.1 only (#26180)
The issues in https://gitlab.kitware.com/vtk/vtk/-/issues/18033 were fixed in:
- https://github.com/Kitware/VTK/commit/dae1718d50bec1b40b860280acafbdd94fc4cd5d
- https://github.com/Kitware/VTK/commit/31e8e4ebeb3152f7cfdb3f14f24f7e5d31a4f8b5
These fixes are in vtk@9.0.2 https://github.com/Kitware/VTK/releases/tag/v9.0.2 and beyond.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/vtk/package.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/vtk/package.py b/var/spack/repos/builtin/packages/vtk/package.py index eefd034be8..20ed4c7a14 100644 --- a/var/spack/repos/builtin/packages/vtk/package.py +++ b/var/spack/repos/builtin/packages/vtk/package.py @@ -98,7 +98,7 @@ class Vtk(CMakePackage): depends_on('expat') # See <https://gitlab.kitware.com/vtk/vtk/-/issues/18033> for why vtk doesn't # work yet with freetype 2.10.3 (including possible patches) - depends_on('freetype @:2.10.2') + depends_on('freetype @:2.10.2', when='@:9.0.1') depends_on('freetype') depends_on('glew') # set hl variant explicitly, similar to issue #7145 @@ -124,7 +124,7 @@ class Vtk(CMakePackage): # See https://gitlab.kitware.com/vtk/vtk/-/issues/18033 patch('https://gitlab.kitware.com/vtk/vtk/uploads/c6fa799a1a028b8f8a728a40d26d3fec/vtk-freetype-2.10.3-replace-FT_CALLBACK_DEF.patch', sha256='eefda851f844e8a1dfb4ebd8a9ff92d2b78efc57f205774052c5f4c049cc886a', - when='^freetype@2.10.3:') + when='@:9.0.1 ^freetype@2.10.3:') def url_for_version(self, version): url = "http://www.vtk.org/files/release/{0}/VTK-{1}.tar.gz" |