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

package/qgis: fix runtime issue, improve package file, add new versions (#27084)

Browse Source 
* package/qgis: fix runtime issue, improve package file, add new versions

* replace conflict with depends_on

* tidy up

Co-authored-by: sbulut <sbulut@3vgeomatics.com>
This commit is contained in:
Sinan 2021-11-01 02:24:44 +03:00 committed by GitHub
parent f45ef21e37
commit 6c1f952bda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,9 +17,11 @@ class Qgis(CMakePackage):
maintainers = ['adamjstewart', 'Sinan81']
version('3.22.0', sha256='cf0c169863f332aab67d8c4943e14b73a564f0254bf54015f5826c6427e6785b')
version('3.18.2', sha256='1913e4d5596bbc8b7d143f3defb18bf376f750a71f334f69d76af5deca7ecc5d')
# Prefer latest long term release
version('3.16.5', sha256='525f469ad6e40dd7a8f09ebab5eb6a2dffc45939b99b7d937750cc04ed78d61c', preferred=True)
version('3.16.12', sha256='65e9634b5c885c98f3555cf77bc2e3fae5e19279aa17e3f6626ff5d7455fd2b9', preferred=True)
version('3.16.5', sha256='525f469ad6e40dd7a8f09ebab5eb6a2dffc45939b99b7d937750cc04ed78d61c')
version('3.14.16', sha256='c9915c2e577f1812a2b35b678b123c58407e07824d73e5ec0dda13db7ca75c04')
version('3.14.0', sha256='1b76c5278def0c447c3d354149a2afe2562ac26cf0bcbe69b9e0528356d407b8')
version('3.12.3', sha256='c2b53815f9b994e1662995d1f25f90628156b996758f5471bffb74ab29a95220')
@ -88,7 +90,9 @@ class Qgis(CMakePackage):
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')
depends_on('python@3.0.0:', type=('build', 'run'), when='@3')
# 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('qca@2.2.1')
depends_on('qjson')
depends_on('qscintilla +python')
@ -151,6 +155,8 @@ def cmake_args(self):
self.spec['qscintilla'].prefix.include,
'-DQSCINTILLA_LIBRARY=' + self.spec['qscintilla'].prefix +
'/lib/libqscintilla2_qt5.so',
'-DQSCI_SIP_DIR=' +
self.spec['qscintilla'].prefix.share.sip.PyQt5,
'-DLIBZIP_INCLUDE_DIR=' +
self.spec['libzip'].prefix.include,
'-DLIBZIP_CONF_INCLUDE_DIR=' +