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

package/QGIS: fix cmake/FindPyqt.py (#15455)

Browse Source 
* fix cmake/FindPyqt.py

* apply patch

* generalize patch

* rename patch

* fix typo

Co-authored-by: Sinan81 <sbulut@3vgeomatics.com>
Co-authored-by: Sinan81 <Sinan81@github>
This commit is contained in:
Sinan 2020-03-18 11:19:46 -07:00 committed by GitHub
parent 056fc99676
commit 3bcb5b3a59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,6 +114,8 @@ class Qgis(CMakePackage):
depends_on('qtkeychain@:1.5.99', when='^qt@4')
depends_on('qt@:4', when='@2')
patch('pyqt5.patch', when='^qt@5')
def cmake_args(self):
spec = self.spec
args = []

25
var/spack/repos/builtin/packages/qgis/pyqt5.patch Normal file
View File

@ -0,0 +1,25 @@
diff --git a/cmake/FindPyQt5.py b/cmake/FindPyQt5.py
index 6a55a0f801..d6eda1fa1e 100644
--- a/cmake/FindPyQt5.py
+++ b/cmake/FindPyQt5.py
@@ -40,6 +40,7 @@ except ImportError:
import sys
cfg = sipconfig.Configuration()
sip_dir = cfg.default_sip_dir
+ pyqt_prefix = os.sep.join(PyQt5.QtCore.__file__.split(os.sep)[0:-5])
if sys.platform.startswith('freebsd'):
py_version = str(sys.version_info.major) + str(sys.version_info.minor)
sip_dir = sip_dir.replace(py_version, '')
@@ -53,9 +54,9 @@ except ImportError:
'pyqt_version': PyQt5.QtCore.PYQT_VERSION,
'pyqt_version_str': PyQt5.QtCore.PYQT_VERSION_STR,
'pyqt_sip_flags': PyQt5.QtCore.PYQT_CONFIGURATION['sip_flags'],
- 'pyqt_mod_dir': os.path.join(cfg.default_mod_dir, "PyQt5"),
- 'pyqt_sip_dir': sip_dir,
- 'pyqt_bin_dir': cfg.default_bin_dir,
+ 'pyqt_mod_dir': os.path.dirname(PyQt5.QtCore.__file__),
+ 'pyqt_sip_dir': os.path.join(pyqt_prefix,'share','sip','PyQt5'),
+ 'pyqt_bin_dir': os.path.join(pyqt_prefix,'bin'),
}
pyqtcfg = sipconfig.Configuration([cfg])