diff options
| author | Wouter Deconinck <wdconinc@gmail.com> | 2022-02-28 19:42:08 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-28 18:42:08 -0700 |
| commit | a3947381c762e2d7257fba5b9b355925504f39ec (patch) | |
| tree | 9722a87af7e40b64e49c96fe410f7d6135d8f825 /var | |
| parent | 6eef12cd1030e540b470542ee2fe405d20b001e9 (diff) | |
| download | spack-a3947381c762e2d7257fba5b9b355925504f39ec.tar.gz spack-a3947381c762e2d7257fba5b9b355925504f39ec.tar.bz2 spack-a3947381c762e2d7257fba5b9b355925504f39ec.tar.xz spack-a3947381c762e2d7257fba5b9b355925504f39ec.zip | |
assimp: patch for issue that prevents 5.1: from working with qt (#29257)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/assimp/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/assimp/package.py b/var/spack/repos/builtin/packages/assimp/package.py index 69b06e58ec..2e94725405 100644 --- a/var/spack/repos/builtin/packages/assimp/package.py +++ b/var/spack/repos/builtin/packages/assimp/package.py @@ -23,6 +23,10 @@ class Assimp(CMakePackage): version('5.0.1', sha256='11310ec1f2ad2cd46b95ba88faca8f7aaa1efe9aa12605c55e3de2b977b3dbfc') version('4.0.1', sha256='60080d8ab4daaab309f65b3cffd99f19eb1af8d05623fff469b9b652818e286e') + patch('https://patch-diff.githubusercontent.com/raw/assimp/assimp/pull/4203.patch', + sha256='a227714a215023184536e38b4bc7f8341f635e16bfb3b0ea029d420c29aacd2d', + when='@5.1:5.2.2') + variant('shared', default=True, description='Enables the build of shared libraries') diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 53a4e08831..f520bd98be 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -182,7 +182,7 @@ class Qt(Package): depends_on("libpng", when='@4:') depends_on("dbus", when='@4:+dbus') depends_on("gl", when='@4:+opengl') - depends_on("assimp@5.0.0:5.0", when='@5.14:+opengl') + depends_on("assimp@5.0.0:5", when='@5.14:+opengl') depends_on("harfbuzz", when='@5:') depends_on("double-conversion", when='@5.7:') |