<pre style='margin:0'>
Vincent (Veence) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f2ee9406fec1b81173f816a180167af810a5e173">https://github.com/macports/macports-ports/commit/f2ee9406fec1b81173f816a180167af810a5e173</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f2ee9406fec qgis3: bump to 3.14.1 and workaround a bug in the cmakefiles. Should fix #60891
</span>f2ee9406fec is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f2ee9406fec1b81173f816a180167af810a5e173
</span>Author: Veence <vince@macports.org>
AuthorDate: Sat Jul 25 21:22:15 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> qgis3: bump to 3.14.1 and workaround a bug in the cmakefiles. Should fix #60891
</span>---
gis/qgis3/Portfile | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis3/Portfile b/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 70782117d33..8a9a3b9a445 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,15 +3,14 @@
</span> PortSystem 1.0
PortGroup cmake 1.1
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cxx11 1.1
</span> PortGroup github 1.0
PortGroup qt5 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup qgis QGIS 3_14_0 final-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup qgis QGIS 3_14_1 final-
</span> name qgis3
version [string map {_ .} ${github.version}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories gis
maintainers {vince @Veence} openmaintainer
description QGIS 3 is a user-friendly GIS based on Qt 5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +24,11 @@ license GPL-2+
</span>
homepage http://www.qgis.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 37477e4ded7c7c4ef1ecc3fc9a1048badbd3388b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cfff1d83e2894d040d52817ae44af937c2fb4085e2d82739aa272d2bae2dac09 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 128705677
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 86614e4eead2ef7dbb6999744cf112df3820c52c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 56f54c81add2f569d0ae75fa34c3a4300469d47f505939b4f2f59ad4a5d0cbac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 128696389
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span>
depends_lib-append port:libiconv \
port:expat \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,7 +88,7 @@ post-patch {
</span>
compiler.blacklist {clang < 500}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.sdkroot ${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.sdkroot ${developer_dir}/Developer/SDKs/MacOSX.sdk
</span> cmake.install_prefix ${applications_dir}
#HD5/MPI related things
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,7 +112,6 @@ if {![catch {set result [active_variants hdf5 openmpi]}]} {
</span> configure.args-append "-DWITH_GRASS=OFF"
configure.args-append "-DWITH_GRASS7=OFF"
configure.args-append "-DWITH_QSPATIALITE=OFF"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DWITH_GLOBE=OFF"
</span> #configure.args-append "--trace-expand"
#configure.args-append "--debug-output"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,6 +136,7 @@ configure.args-append "-DAPPLE_APPLICATIONSERVICES_LIBRARY=${configure.sdkroot
</span> configure.args-append "-DAPPLE_COREFOUNDATION_LIBRARY=${configure.sdkroot}/System/Library/Frameworks/CoreFoundation.framework"
configure.args-append "-DAPPLE_IOKIT_LIBRARY=${configure.sdkroot}/System/Library/Frameworks/IOKit.framework"
configure.args-append "-DWITH_SERVER=OFF"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append "-DUSE_OPENCL=OFF"
</span>
variant server description "Builds with the server (FCGI) option" {
depends_lib-append port:fcgi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -274,6 +275,12 @@ configure.args-append "-DSPATIALITE_LIBRARY=${prefix}/lib/libspatialite.dylib"
</span> configure.args-append "-DSPATIALITE_INCLUDE_DIR=${prefix}/include"
configure.args-append "-DSPATIALINDEX_LIBRARY=${prefix}/lib/libspatialindex.dylib"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Workaround a bug in cmake???
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s/\\$\\$\\$\\$/$$/" ${cmake.build_dir}/src/core/CMakeFiles/qgis_core.dir/build.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s/\\$\\$\\$\\$/$$/" ${cmake.build_dir}/src/core/CMakeFiles/qgis_core_autogen.dir/build.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
# qgis_bench app doesn’t link properly. Who uses this anyway????
delete ${destroot}${applications_dir}/Qgis3.app/Contents/MacOS/bin/qgis_bench.app
</pre><pre style='margin:0'>
</pre>