diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/qt/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/qt/package.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index ef660a97ae..8bc9e920af 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -133,6 +133,8 @@ class Qt(Package): patch('qt5-15-gcc-10.patch', when='@5.12.7:5.15 %gcc@8:') patch('qt514.patch', when='@5.14') patch('qt514-isystem.patch', when='@5.14.2') + # https://bugreports.qt.io/browse/QTBUG-84037 + patch('qt514-quick3d-assimp.patch', when='@5.14:5') # https://bugreports.qt.io/browse/QTBUG-90395 patch('https://src.fedoraproject.org/rpms/qt5-qtbase/raw/6ae41be8260f0f5403367eb01f7cd8319779674a/f/qt5-qtbase-gcc11.patch', sha256='9378afd071ad5c0ec8f7aef48421e4b9fab02f24c856bee9c0951143941913c5', @@ -181,7 +183,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", when='@5:+opengl') + depends_on("assimp@5.0.0:5", when='@5.14:+opengl') depends_on("harfbuzz", when='@5:') depends_on("double-conversion", when='@5.7:') @@ -583,8 +585,11 @@ class Qt(Package): '-no-nis', ]) - if '@5.9: +opengl' in spec: - use_spack_dep('assimp') + if '+opengl' in spec: + if version >= Version('5.14'): + use_spack_dep('assimp') + else: + config_args.append('-no-assimp') # COMPONENTS |