Date: Monday, December 16, 2019 @ 16:33:44 Author: arojas Revision: 537863
Update to 3.10.1, fix build with latest pyqt5 Added: qgis/trunk/qgis-pyqt5-sip5.patch Modified: qgis/trunk/PKGBUILD -----------------------+ PKGBUILD | 10 +++++----- qgis-pyqt5-sip5.patch | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-12-16 16:10:26 UTC (rev 537862) +++ PKGBUILD 2019-12-16 16:33:44 UTC (rev 537863) @@ -9,7 +9,7 @@ # Contributor: Eric Forgeot < http://esclinux.tk > pkgname=qgis -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats' url='https://qgis.org/' @@ -29,15 +29,15 @@ 'python-numpy: Processing plugin' 'python-yaml: Processing plugin') source=("https://qgis.org/downloads/$pkgname-$pkgver.tar.bz2" - qgis-fix-dependency.patch::"https://github.com/qgis/QGIS/commit/319ee306.patch") -sha256sums=('25eb1c41d9fb922ffa337a720dfdceee43cf2d38409923f087c2010c9742f012' - '92f255dfa0eba785dbf278fe87c08468b0546b4fe330a720596b883f0bb82b3f') + qgis-pyqt5-sip5.patch) +sha256sums=('466ac9fad91f266cf3b9d148f58e2adebd5b9fcfc03e6730eb72251e6c34c8ab' + '47fdab75c94ecf5b61a41b334e23714226e895cef507c35a3bc4b46c7d307981') prepare() { [[ -d build ]] || mkdir build cd $pkgname-$pkgver - patch -p1 -i ../qgis-fix-dependency.patch # Fix race + patch -p1 -i ../qgis-pyqt5-sip5.patch # Use new pyqt sip file location } build() { Added: qgis-pyqt5-sip5.patch =================================================================== --- qgis-pyqt5-sip5.patch (rev 0) +++ qgis-pyqt5-sip5.patch 2019-12-16 16:33:44 UTC (rev 537863) @@ -0,0 +1,22 @@ +diff --git a/cmake/FindPyQt5.py b/cmake/FindPyQt5.py +index 6a55a0f801..ba46441059 100644 +--- a/cmake/FindPyQt5.py ++++ b/cmake/FindPyQt5.py +@@ -37,7 +37,7 @@ except ImportError: + import PyQt5.QtCore + import sipconfig # won't work for SIP v5 + import os.path +- import sys ++ import sys, site + cfg = sipconfig.Configuration() + sip_dir = cfg.default_sip_dir + if sys.platform.startswith('freebsd'): +@@ -54,7 +54,7 @@ except ImportError: + '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_sip_dir': os.path.join(site.getsitepackages()[0], "PyQt5", "bindings"), + 'pyqt_bin_dir': cfg.default_bin_dir, + } + pyqtcfg = sipconfig.Configuration([cfg])