<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/0b047bbd6ecef760f1cc50977fa42739cf736758">https://github.com/macports/macports-ports/commit/0b047bbd6ecef760f1cc50977fa42739cf736758</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 0b047bbd6ec qgis3: update to 3.26.0
</span>0b047bbd6ec is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0b047bbd6ecef760f1cc50977fa42739cf736758
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Fri Jun 17 21:25:18 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> qgis3: update to 3.26.0
</span>---
gis/qgis3/Portfile | 12 +++++-------
gis/qgis3/files/patch-pdal-const.diff | 13 -------------
2 files changed, 5 insertions(+), 20 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 24221c86427..086045697ee 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_3 final-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup qgis QGIS 3_26_0 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 8718d481aabcba968fbfc1d6924f291a0f674e56 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6b8dfae27e6881d43eac526ac0d0f91669aaef33259103bf4b5920ee6a1b6105 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 163332485
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f6f7048041ccd67932db4c913742fb9ed86b731a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 af67acf192d93ccfc33074614adf3d58f28c6ec717c6531f2b8102af3caf878f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 172034374
</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,9 +82,7 @@ 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:#ffe0e0;'>- patch-pdal-const.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Remove pdal patch after https://github.com/qgis/QGIS/pull/48660 is released
</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;color:#808080;'>diff --git a/gis/qgis3/files/patch-pdal-const.diff b/gis/qgis3/files/patch-pdal-const.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2841e3c4413..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis3/files/patch-pdal-const.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/providers/pdal/qgspdalprovider.cpp b/src/providers/pdal/qgspdalprovider.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 52d4fdffc45b..09e6549522a6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/providers/pdal/qgspdalprovider.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/providers/pdal/qgspdalprovider.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -219,7 +219,7 @@ bool QgsPdalProvider::load( const QString &uri )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- las_reader.setOptions( las_opts );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pdal::PointTable table;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- las_reader.prepare( table );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const pdal::LasHeader las_header = las_reader.header();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const pdal::LasHeader &las_header = las_reader.header();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const std::string tableMetadata = pdal::Utils::toJSON( table.metadata() );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const QVariantMap readerMetadata = QgsJsonUtils::parseJson( tableMetadata ).toMap().value( QStringLiteral( "root" ) ).toMap();
</span></pre><pre style='margin:0'>
</pre>