<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/c537061a33a8c29fd3ae24271ea5ab72f5f0747d">https://github.com/macports/macports-ports/commit/c537061a33a8c29fd3ae24271ea5ab72f5f0747d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c537061a33a8c29fd3ae24271ea5ab72f5f0747d
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Sun Mar 17 22:25:52 2024 +0100
<span style='display:block; white-space:pre;color:#404040;'> grass: patch for run-time with Python 3.12
</span>---
gis/grass/Portfile | 3 ++-
gis/grass/files/03_patch_python312.diff | 13 +++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/Portfile b/gis/grass/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1a7d0f9eb4d..66be993f8df 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,8 @@ depends_lib-append port:bzip2 \
</span> port:zlib \
patchfiles 01_patch-dyld-link.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 02_grass-python.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 02_grass-python.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 03_patch_python312.diff
</span>
# c++17 needed for PDAL 2.4+
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/files/03_patch_python312.diff b/gis/grass/files/03_patch_python312.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5e9c904b78e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass/files/03_patch_python312.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;'>+Added upstream with https://github.com/OSGeo/grass/commit/47aa6e13ce62076f77dcb4cadb452ca6a57a00c6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/init/grass.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/init/grass.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -295,7 +295,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ matches = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://docs.python.org/3/library/stdtypes.html#old-string-formatting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for m in re.finditer(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "%([#0 +-]*)([0-9]*)(\.[0-9]*)?([hlL]?[diouxXeEfFgGcrsa%])", fmt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ r"%([#0 +-]*)([0-9]*)(\.[0-9]*)?([hlL]?[diouxXeEfFgGcrsa%])", fmt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ matches.append(m)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>