<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3a3a9f09b33fcfe592b12f149a2c7f5fb58641f1">https://github.com/macports/macports-ports/commit/3a3a9f09b33fcfe592b12f149a2c7f5fb58641f1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3a3a9f09b33fcfe592b12f149a2c7f5fb58641f1
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Sun Mar 24 21:08:27 2024 +0100
<span style='display:block; white-space:pre;color:#404040;'> qgis3, qgis3-ltr: update to 3.36.1 and 3.34.5 (LTR)
</span>---
gis/qgis3/Portfile | 21 ++++++++++-----------
gis/qgis3/files/patch-PROJ94.diff | 16 ----------------
2 files changed, 10 insertions(+), 27 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 8126dad82d8..ac7a793b4c2 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,25 +25,25 @@ subport ${name-ltr} {}
</span>
if {${subport} eq ${name}} {
# Latest version
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup qgis QGIS 3_36_0 final-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup qgis QGIS 3_36_1 final-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> set app_name QGIS3
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 4f4abd2b50ece1e094f27d6fd4c4cb5c38fb944d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4c2fd5d44b95d861ffbb8ded8724ad38b49d601ccd27fa38457f6127cfc6c87b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 199052249
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 778513d1f9257e13328091b4a9f6dd1bf353727d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d69a199e524473b50343151ef53eb8c8ae525e765c96be61cb58a2b0840bc441 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 199220288
</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_4 final-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup qgis QGIS 3_34_5 final-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> set app_name QGIS3-LTR
description {*}${description} (LTR)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 0730bdf3e121a185224f4602124f5a359ea6c8ac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 890526e82dca56ad39574b414dfb516438bea739076d49f37cb0b3fa6f1abd5f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 196392186
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 161961469e10f3aaf55fceaf2aec82e8874d4fdc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 563cf17fdd8db1995f0bba4750668bf8ac9104819651152febe7a9f28ab3a4e5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 196445110
</span>
set grass_utils_file Grass7Utils.py
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,7 +108,6 @@ patchfiles-append patch-app_info_plist_in.diff \
</span> patch-CMakelists_txt.diff \
patch-MacBundleMacros.cmake.diff \
patch-SIPMacros.cmake.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-PROJ94.diff \
</span> patch-configure_PROJ94.diff
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis3/files/patch-PROJ94.diff b/gis/qgis3/files/patch-PROJ94.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fdfed4d703c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis3/files/patch-PROJ94.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 893483fdfd240f20aa7fbec3d2fe35dde469d503 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Nyall Dawson <nyall.dawson@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 8 Mar 2024 09:17:28 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix compilation with proj 9.4+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/core/proj/qgscoordinatereferencesystemutils.cpp.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/core/proj/qgscoordinatereferencesystemutils.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -348,6 +348,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return QObject::tr( "Miller Oblated Stereographic" );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( projection == QLatin1String( "mill" ) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return QObject::tr( "Miller Cylindrical" );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( projection == QLatin1String( "mod_krovak" ) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return QObject::tr( "Modified Krovak" );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( projection == QLatin1String( "moll" ) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return QObject::tr( "Mollweide" );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( projection == QLatin1String( "murd1" ) )
</span></pre><pre style='margin:0'>
</pre>