svn commit: r546049 - in head/graphics/qgis: . files
Loïc Bartoletti
lbartoletti at FreeBSD.org
Mon Aug 24 06:43:02 UTC 2020
Author: lbartoletti
Date: Mon Aug 24 06:43:01 2020
New Revision: 546049
URL: https://svnweb.freebsd.org/changeset/ports/546049
Log:
graphics/qgis: Update to 3.14.15
* Update to 3.14.15
* Remove files/patch-src_core_CMakeLists.txt (upstreamed) [1]
* Prepare for PyQt5 and Sip5 [2]
[1] https://github.com/qgis/QGIS/pull/38103
[2] Upstream PR https://github.com/qgis/QGIS/pull/37901 (included in 3.14.15) and https://github.com/qgis/QGIS/pull/37842 (patches taken from commits)
PR: 248783
Approved by: Rainer Hurling (maintainer)
Added:
head/graphics/qgis/files/patch-cmake_FindPyQt5.py (contents, props changed)
head/graphics/qgis/files/patch-cmake_FindSIP.py (contents, props changed)
Deleted:
head/graphics/qgis/files/patch-src_core_CMakeLists.txt
Modified:
head/graphics/qgis/Makefile
head/graphics/qgis/distinfo
Modified: head/graphics/qgis/Makefile
==============================================================================
--- head/graphics/qgis/Makefile Mon Aug 24 06:42:42 2020 (r546048)
+++ head/graphics/qgis/Makefile Mon Aug 24 06:43:01 2020 (r546049)
@@ -3,9 +3,14 @@
PORTNAME= qgis
DISTVERSIONPREFIX= final-
-DISTVERSION= 3_14_0
+DISTVERSION= 3_14_15
CATEGORIES= graphics geography
+PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES= 33192f38bc7d.patch:-p1 \
+ 12203f0ce527.patch:-p1 \
+ 6e9d42d70099.patch:-p1
+
MAINTAINER= rhurlin at gwdg.de
COMMENT= Free and Open Source Geographic Information System
@@ -155,6 +160,9 @@ post-patch:
@${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \
${WRKSRC}/src/core/CMakeLists.txt
.endif
+ @${REINPLACE_CMD} -e 's|%%PYQT_SIPDIR%%|${PYQT_SIPDIR}|' \
+ ${WRKSRC}/cmake/FindPyQt5.py \
+ ${WRKSRC}/cmake/FindSIP.py
pre-configure:
${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
Modified: head/graphics/qgis/distinfo
==============================================================================
--- head/graphics/qgis/distinfo Mon Aug 24 06:42:42 2020 (r546048)
+++ head/graphics/qgis/distinfo Mon Aug 24 06:43:01 2020 (r546049)
@@ -1,3 +1,9 @@
-TIMESTAMP = 1593334785
-SHA256 (qgis-QGIS-final-3_14_0_GH0.tar.gz) = 4fe200a4070fd2f2b65c43f5e33fa36b101ba82d47cb4cdc9ccef1230265f9e5
-SIZE (qgis-QGIS-final-3_14_0_GH0.tar.gz) = 128709719
+TIMESTAMP = 1597911962
+SHA256 (qgis-QGIS-final-3_14_15_GH0.tar.gz) = 6f50f055f56f54b592c4d7ea5dc20a2e11c02ce888b4279b92af5f8bb1b3e26d
+SIZE (qgis-QGIS-final-3_14_15_GH0.tar.gz) = 129856895
+SHA256 (33192f38bc7d.patch) = 97d3f882bea11c5342ddf53f6c055f9f38c5af18edb2d52c116f1dab4a49189b
+SIZE (33192f38bc7d.patch) = 12604
+SHA256 (12203f0ce527.patch) = bb30342fbf19f1a9150abd97fb1b5d6bbe3f3062bb217a7179332d0b02168235
+SIZE (12203f0ce527.patch) = 2452
+SHA256 (6e9d42d70099.patch) = 44c3ecc27c839492d9eae2d352e0ea9f37c11a419fb3f8862350b1e52cb359a6
+SIZE (6e9d42d70099.patch) = 1513
Added: head/graphics/qgis/files/patch-cmake_FindPyQt5.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/qgis/files/patch-cmake_FindPyQt5.py Mon Aug 24 06:43:01 2020 (r546049)
@@ -0,0 +1,11 @@
+--- cmake/FindPyQt5.py.orig 2020-08-20 07:52:34 UTC
++++ cmake/FindPyQt5.py
+@@ -61,7 +61,7 @@ else: # Code for SIP v5
+ import shutil
+ cfg = {
+ 'pyqt_mod_dir': os.path.dirname(PyQt5.__file__),
+- 'pyqt_sip_dir': os.path.join(get_python_lib(plat_specific=1), "PyQt5", "bindings"),
++ 'pyqt_sip_dir': "%%PYQT_SIPDIR%%",
+ 'pyqt_bin_dir': os.path.dirname(shutil.which("pyuic5")),
+ }
+
Added: head/graphics/qgis/files/patch-cmake_FindSIP.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/qgis/files/patch-cmake_FindSIP.py Mon Aug 24 06:43:01 2020 (r546049)
@@ -0,0 +1,9 @@
+--- cmake/FindSIP.py.orig 2020-08-20 07:34:51 UTC
++++ cmake/FindSIP.py
+@@ -56,5 +56,5 @@ else: # Code for SIP v5
+ print("sip_bin:%s" % shutil.which("sip5"))
+
+ from distutils.sysconfig import get_python_lib
+- python_modules_dir = get_python_lib(plat_specific=1)
++ python_modules_dir = "%%PYQT_SIPDIR%%"
+ print("default_sip_dir:%s" % python_modules_dir)
More information about the svn-ports-head
mailing list