<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7df2a63e3b8d780aa899cbbbb9142cfbd2a0b3a5">https://github.com/macports/macports-ports/commit/7df2a63e3b8d780aa899cbbbb9142cfbd2a0b3a5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7df2a63e3b8d780aa899cbbbb9142cfbd2a0b3a5
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Sun Nov 26 14:37:25 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> qgis3{-ltr}: rename LTR app name, enable concurrent installation
</span>---
gis/qgis3/Portfile | 9 ++++++---
gis/qgis3/files/patch-CMakelists_txt.diff | 2 +-
2 files changed, 7 insertions(+), 4 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 d617e6b789f..938070c49ac 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;'>@@ -27,7 +27,7 @@ if {${subport} eq ${name}} {
</span> # Latest version
github.setup qgis QGIS 3_34_0 final-
revision 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${name-ltr}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set app_name QGIS3
</span>
checksums rmd160 430a8c2578515939857dcc32172a183a9ab126a2 \
sha256 0dbe9d3a4d956f59e8f5d50efa29b0f0032aec7b0c2a43628a093074ae3050b2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@ if {${subport} eq ${name}} {
</span> # LTR version
github.setup qgis QGIS 3_28_12 final-
revision 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set app_name QGIS3-LTR
</span> description {*}${description} (LTR)
checksums rmd160 8f50db65c3ae86fc1dd1d45a2e4115c0312f85e6 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,6 +114,9 @@ post-patch {
</span> # Handle QGIS Fix #11399 which doesn’t seem to work anymore
reinplace -E "s|#ifdef Q_OS_MAC$|#if 0|" \
${worksrcpath}/src/app/layout/qgslayoutdesignerdialog.cpp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|@APP_NAME@|${app_name}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/CMakeLists.txt
</span> }
cmake.install_prefix ${applications_dir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -429,7 +432,7 @@ post-configure {
</span>
post-destroot {
# qgis_bench app doesn’t link properly. Who uses this anyway????
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${applications_dir}/Qgis3.app/Contents/MacOS/bin/qgis_bench.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${applications_dir}/${app_name}.app/Contents/MacOS/bin/qgis_bench.app
</span> }
if {${subport} eq ${name-ltr}} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis3/files/patch-CMakelists_txt.diff b/gis/qgis3/files/patch-CMakelists_txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5543dd31063..de1fadc8989 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis3/files/patch-CMakelists_txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qgis3/files/patch-CMakelists_txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@
</span>
if (APPLE)
- set(QGIS_APP_NAME "QGIS")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(QGIS_APP_NAME "QGIS3")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(QGIS_APP_NAME "@APP_NAME@")
</span> else()
set(QGIS_APP_NAME "qgis")
endif()
</pre><pre style='margin:0'>
</pre>