zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qgis: Updates for proj@6 (#16172)

Browse Source 
* 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>
This commit is contained in:
Elizabeth Fischer 2020-08-22 14:22:57 -04:00 committed by GitHub
parent 488d8ae747
commit 8ce5718922
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
var/spack/repos/builtin/packages/qgis/package.py
View File

@ -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')