From 5fdf6e5f6877e0c1ad98e3a14c35a1a62efa7aeb Mon Sep 17 00:00:00 2001 From: Sinan Date: Tue, 2 Nov 2021 18:43:29 +0300 Subject: package/qgis_revert_incorrect_constraint (#27140) * package/qgis_revert_incorrect_constraint * fix bug * also update dependency constraints * also update python version constraints Co-authored-by: sbulut --- var/spack/repos/builtin/packages/qgis/package.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/qgis/package.py b/var/spack/repos/builtin/packages/qgis/package.py index 0c67bd4d10..b50e4db81a 100644 --- a/var/spack/repos/builtin/packages/qgis/package.py +++ b/var/spack/repos/builtin/packages/qgis/package.py @@ -85,18 +85,20 @@ class Qgis(CMakePackage): depends_on('libzip') depends_on('libtasn1') depends_on('proj@4.4.0:') + depends_on('proj@4.9.3:', when='@3.8.2:') depends_on('py-psycopg2', type=('build', 'run')) # TODO: is build dependency necessary? depends_on('py-pyqt4', when='@2') depends_on('py-pyqt5@5.3:', when='@3') depends_on('py-requests', type=('build', 'run')) # TODO: is build dependency necessary? depends_on('python@2.7:2.8', type=('build', 'run'), when='@2') - # QGIS failed to build for @3.8.7: or exhibited runtime issues - # ref: https://github.com/spack/spack/issues/26803 - depends_on('python@3.0.0:3.8.6', type=('build', 'run'), when='@3') + depends_on('python@3.0.0:', type=('build', 'run'), when='@3') + depends_on('python@3.6:', type=('build', 'run'), when='@3.18:') + depends_on('python@3.7:', type=('build', 'run'), when='@3.20:') depends_on('qca@2.2.1') depends_on('qjson') depends_on('qscintilla +python') depends_on('qt+dbus') + depends_on('qt+dbus@5.12.0:', when='@3.20:') depends_on('qtkeychain@0.5:', when='@3:') depends_on('qwt@5:') depends_on('qwtpolar') @@ -123,6 +125,7 @@ class Qgis(CMakePackage): # build depends_on('cmake@3.0.0:', type='build') + depends_on('cmake@3.10.0:', type='build', when='@3.16:') depends_on('flex@2.5.6:', type='build') depends_on('bison@2.4:', type='build') depends_on('pkgconfig', type='build') -- cgit v1.2.3-60-g2f50