<pre style='margin:0'>
Mark Anderson (markemer) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d6053d2dd885aa1f9a4ffc482197454d95175c4f">https://github.com/macports/macports-ports/commit/d6053d2dd885aa1f9a4ffc482197454d95175c4f</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 d6053d2dd88 qgis3: update to 3.40.0; qgis3-ltr: updated to 3.34.12 (#26322)
</span>d6053d2dd88 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d6053d2dd885aa1f9a4ffc482197454d95175c4f
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Tue Oct 29 21:46:29 2024 +0100
<span style='display:block; white-space:pre;color:#404040;'> qgis3: update to 3.40.0; qgis3-ltr: updated to 3.34.12 (#26322)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * qgis3: drop Python 3.8 support
</span><span style='display:block; white-space:pre;color:#404040;'> * qgis3: use latest version of PROJ
</span><span style='display:block; white-space:pre;color:#404040;'> * qgis3: update to 3.40.0
</span><span style='display:block; white-space:pre;color:#404040;'> * qgis3-ltr: update to 3.34.12
</span>---
gis/qgis3/Portfile | 62 +++++++++++++++++++++---------------------------------
1 file changed, 24 insertions(+), 38 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 e7b344f1e97..2ffd1df22f8 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;'>@@ -25,27 +25,29 @@ subport ${name-ltr} {}
</span>
if {${subport} eq ${name}} {
# Latest version
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup qgis QGIS 3_38_3 final-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup qgis QGIS 3_40_0 final-
</span> revision 0
set app_name QGIS3
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 fbb559ff83795b9b0b1664adf1ebc0f7132eb1ca \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 febb773d05de3bc20759e4b436d59f1f257a2cd75d05e980febb35660027d7c2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 203765027
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 a0161ddc275d45656f87a935944c874e1236b924 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a7870c61da5fdc279423b653b81c5f2e50f99fc629541722ad0213f8745725c0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 210783871
</span>
set grass_utils_file grass_utils.py
} else {
# LTR version
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup qgis QGIS 3_34_11 final-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup qgis QGIS 3_34_12 final-
</span> revision 0
set app_name QGIS3-LTR
description {*}${description} (LTR)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 36e2748333e043de7c3dd16f1974e00c4416704f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5bbe12fa8dee8ac325d6798f6fc364454433a21b6ccf46047ece7d9c9f7e2c69 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 197995244
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 16a4047cc06e9c8b9e328e2641547512ea50090e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2ae366654e0601574bcd0f48ff09bf8c0195f602a2efbe4f46c20238733be7c3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 198012259
</span>
set grass_utils_file Grass7Utils.py
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-configure_PROJ94.diff
</span> }
version [string map {_ .} ${github.version}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,6 +90,7 @@ depends_lib-append port:draco \
</span> port:libtasn1 \
port:libzip \
port:pdal \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj \
</span> port:protobuf3-cpp \
port:qca-qt5 \
port:qca-qt5-ossl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,8 +112,7 @@ qt5.depends_component \
</span> patchfiles-append patch-app_info_plist_in.diff \
patch-CMakelists_txt.diff \
patch-MacBundleMacros.cmake.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-SIPMacros.cmake.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure_PROJ94.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-SIPMacros.cmake.diff
</span>
post-patch {
reinplace -E "s|@PREFIX@|${prefix}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -162,6 +164,7 @@ configure.args-append \
</span> -DGDAL_CONFIG=${prefix}/bin/gdal-config \
-DGEOS_CONFIG=${prefix}/bin/geos-config \
-DLIBZIP_CONF_INCLUDE_DIR=${prefix}/lib/pkgconfig \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPROJ_ROOT=${prefix}/lib/proj9 \
</span> -DQCA_INCLUDE_DIR=${prefix}/libexec/qt5/include/QtCrypto \
-DQCA_LIBRARY=${prefix}/libexec/qt5/lib/libqca-qt5.dylib \
-DQGIS_MACAPP_BUNDLE=0 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,7 +187,11 @@ configure.args-append \
</span> -DWITH_QWTPOLAR=ON \
-DWITH_SERVER=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags "-Wl,-rpath,${prefix}/libexec/qt5/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/lib/proj9/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-Wl,-rpath,${prefix}/libexec/qt5/lib" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/lib/proj9/lib
</span>
# GRASS variants
variant grass7 conflicts grass description "Build GRASS 7 plugin" {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -242,32 +249,8 @@ set pgdefault [string range ${pgdefault} 0 end-4]
</span> set pgdefault "${pgdefault}} { default_variants +postgresql16 }"
eval ${pgdefault}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# PROJ variants
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set proj_versions {6 7 8 9}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set proj_variants {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach pjver ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend proj_variants proj${pjver}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach proj_ver ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set index [lsearch -exact ${proj_variants} proj${proj_ver}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cflcts [lreplace ${proj_variants} ${index} ${index}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant proj${proj_ver} description "Use Proj${proj_ver}" conflicts {*}${cflcts} "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:proj${proj_ver}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPROJ_ROOT=${prefix}/lib/proj${proj_ver}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append -I${prefix}/lib/proj${proj_ver}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -L${prefix}/lib/proj${proj_ver}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set projdf "if {"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach pv ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set projdf "${projdf}!\[variant_isset proj${pv}\] && "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set projdf [string range ${projdf} 0 end-4]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set projdf "${projdf}} { default_variants +proj${pv} }"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-eval ${projdf}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Python variants
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_suffixes {38 39 310 311 312}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_suffixes {39 310 311 312}
</span> set python_variants {}
set plugin_variants {}
foreach pyver ${python_suffixes} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -304,10 +287,13 @@ foreach pyver ${python_suffixes} {
</span>
configure.args-append -DPython_EXECUTABLE=${prefix}/bin/python${pyversion}
configure.args-append -DWITH_BINDINGS=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYUIC_PROGRAM=${prefix}/bin/pyuic5-${pyversion}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYRCC_PROGRAM=${prefix}/bin/pyrcc5-${pyversion}
</span> configure.args-append -DQSCI_SIP_DIR=${frameworks_dir}/Python.framework/Versions/${pyversion}/lib/python${pyversion}/site-packages/PyQt5/bindings
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {\"${subport}\" eq \"${name-ltr}\"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPYUIC_PROGRAM=${prefix}/bin/pyuic5-${pyversion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPYRCC_PROGRAM=${prefix}/bin/pyrcc5-${pyversion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
# Complies with py-gdal layout
set gdal_py_prefix \"${worksrcpath}/python/plugins/processing/algs/gdal\"
</pre><pre style='margin:0'>
</pre>