diff options
| author | Elizabeth Fischer <eafischer2@alaska.edu> | 2020-08-22 14:22:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-22 13:22:57 -0500 |
| commit | 8ce5718922b4299e720924dbab61e18405d381bb (patch) | |
| tree | 7e95c0f471b0088275a19e1e951dd718ad3af5d2 | |
| parent | 488d8ae747b9e9151c38a959243755ddc768bb84 (diff) | |
| download | spack-8ce5718922b4299e720924dbab61e18405d381bb.tar.gz spack-8ce5718922b4299e720924dbab61e18405d381bb.tar.bz2 spack-8ce5718922b4299e720924dbab61e18405d381bb.tar.xz spack-8ce5718922b4299e720924dbab61e18405d381bb.zip | |
qgis: Updates for proj@6 (#16172)
* qgis
* Update package.py
QGIS 3.12.1 can use PROJ >= 4.9.3. Therefore both version restrictions on PROJ were incorrect.
https://github.com/qgis/QGIS/blob/final-3_12_1/INSTALL
* Update package.py
Add explanation to (hopefully temporary) removal of hdf5 dependency.
* Remove overly restrictive GRASS version number.
* flake8
Co-authored-by: Elizabeth Fischer <elizabeth.fischer@alaska.edu>
| -rw-r--r-- | var/spack/repos/builtin/packages/qgis/package.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/qgis/package.py b/var/spack/repos/builtin/packages/qgis/package.py index 45856f90cf..f86a76a0ca 100644 --- a/var/spack/repos/builtin/packages/qgis/package.py +++ b/var/spack/repos/builtin/packages/qgis/package.py @@ -78,6 +78,7 @@ class Qgis(CMakePackage): depends_on('libspatialindex') depends_on('libspatialite@4.2.0:') depends_on('libzip') + depends_on('libtasn1') depends_on('proj@4.4.0:') depends_on('py-psycopg2', type=('build', 'run')) # TODO: is build dependency necessary? depends_on('py-pyqt4', when='@2') @@ -103,10 +104,13 @@ class Qgis(CMakePackage): # optionals depends_on('postgresql@8:', when='+postgresql') # for PostGIS support depends_on('gsl', when='+georeferencer') # for georeferencer - depends_on('grass@7.0.0', type=('build', 'link', 'run'), when='+grass7') # for georeferencer + # grass@7.8.1 is the first version that supports proj@6 + depends_on('grass@7:', type=('build', 'link', 'run'), when='+grass7') # for georeferencer - # the below dependencies are shown in cmake config - depends_on('hdf5') + # The below dependencies are shown in cmake config + # hdf5 and netcdf-c together run afoul of a concretizer bug. + # netcdf-c already depends on hdf5 + # depends_on('hdf5'). depends_on('netcdf-c') # build @@ -116,7 +120,6 @@ class Qgis(CMakePackage): depends_on('pkgconfig', type='build') # Take care of conflicts using depends_on - depends_on('proj@5:', when='@3.8.2:') depends_on('qt@5.9.0:5.12.99', when='@3.8') depends_on('qt@5.9.0:', when='@3.10.0:') depends_on('qtkeychain@:1.5.99', when='^qt@4') |