<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5f30685a569b2040d8cc57e8dd723c07606c3419">https://github.com/macports/macports-ports/commit/5f30685a569b2040d8cc57e8dd723c07606c3419</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 5f30685a569 qgis3: update to 3.24.3, backport pdal fix
</span>5f30685a569 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 5f30685a569b2040d8cc57e8dd723c07606c3419
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Sun Jun 12 03:07:18 2022 -0400

<span style='display:block; white-space:pre;color:#404040;'>    qgis3: update to 3.24.3, backport pdal fix
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    May not build right now because of bugs in SIP. See https://github.com/macports/macports-ports/pull/15115
</span>---
 gis/qgis3/Portfile                    | 14 ++++++++------
 gis/qgis3/files/patch-pdal-const.diff | 13 +++++++++++++
 2 files changed, 21 insertions(+), 6 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 31253b8e0be..2834877da60 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;'>@@ -8,7 +8,7 @@ PortGroup           qt5     1.0
</span> PortGroup           active_variants 1.1
 PortGroup           compiler_blacklist_versions 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        qgis QGIS 3_24_1 final-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        qgis QGIS 3_24_3 final-
</span> name                qgis3
 version             [string map {_ .} ${github.version}]
 revision            0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,9 @@ license             GPL-2+
</span> 
 homepage            https://www.qgis.org/
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  060a8b11e1dc43b49324704f28acaa9e003988d7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  4f5f6c8c675aa9c7ce6e0a8366c3c40a30a5fe40952f308ff0e4ae1ab3aed918 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    163102649
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  8718d481aabcba968fbfc1d6924f291a0f674e56 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  6b8dfae27e6881d43eac526ac0d0f91669aaef33259103bf4b5920ee6a1b6105 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    163332485
</span> 
 # Enable use of 'macports-libcxx' for macOS 10.13 and earlier, as port uses
 # libcxx features normally only available on 10.14 and later.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,7 +82,9 @@ depends_build-append \
</span> patchfiles          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:#e0ffe0;'>+                    patch-SIPMacros.cmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-pdal-const.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove pdal patch after https://github.com/qgis/QGIS/pull/48660 is released
</span> 
 post-patch {
     reinplace -E "s|@PREFIX@|${prefix}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,7 +125,7 @@ configure.args-append   "-DWITH_QSPATIALITE=OFF"
</span> 
 configure.ldflags       "-Wl,-rpath,${prefix}/libexec/qt5/lib"
 configure.args-append   "-DWITH_3D=ON"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append   "-DWITH_PDAL=OFF"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append   "-DWITH_PDAL=ON"
</span> configure.args-append   "-DLIBZIP_CONF_INCLUDE_DIR=${prefix}/lib/pkgconfig"
 configure.args-append   "-DWITH_BINDINGS=FALSE"
 configure.args-append   "-DPROJ_INCLUDE_DIR=${prefix}/lib/proj8/include"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis3/files/patch-pdal-const.diff b/gis/qgis3/files/patch-pdal-const.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2841e3c4413
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qgis3/files/patch-pdal-const.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/providers/pdal/qgspdalprovider.cpp b/src/providers/pdal/qgspdalprovider.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 52d4fdffc45b..09e6549522a6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/providers/pdal/qgspdalprovider.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/providers/pdal/qgspdalprovider.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -219,7 +219,7 @@ bool QgsPdalProvider::load( const QString &uri )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     las_reader.setOptions( las_opts );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     pdal::PointTable table;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     las_reader.prepare( table );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    const pdal::LasHeader las_header = las_reader.header();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    const pdal::LasHeader &las_header = las_reader.header();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     const std::string tableMetadata = pdal::Utils::toJSON( table.metadata() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     const QVariantMap readerMetadata = QgsJsonUtils::parseJson( tableMetadata ).toMap().value( QStringLiteral( "root" ) ).toMap();
</span></pre><pre style='margin:0'>

</pre>