<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b86324bfcfa9941387187779aac01b96c0072688">https://github.com/macports/macports-ports/commit/b86324bfcfa9941387187779aac01b96c0072688</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 b86324bfcfa taisei: update to 1.4
</span>b86324bfcfa is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b86324bfcfa9941387187779aac01b96c0072688
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Wed Oct 4 16:51:42 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> taisei: update to 1.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - use MacPorts Python
</span>---
games/taisei/Portfile | 28 +++++++++++++++++++++++++--
games/taisei/files/patch-doc-meson.build.diff | 18 ++++++++---------
games/taisei/files/patch-meson.build.diff | 11 +++++++++++
3 files changed, 46 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/taisei/Portfile b/games/taisei/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 31df39cd8e0..f77c0239026 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/taisei/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/taisei/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup meson 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup taisei-project taisei 1.3.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup taisei-project taisei 1.4 v
</span> revision 0
fetch.type git
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,11 +27,13 @@ maintainers {gmail.com:herby.gillot @herbygillot} \
</span> set py_version 311
set py_branch \
[string index ${py_version} 0].[string range ${py_version} 1 end]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_bin ${prefix}/bin/python${py_branch}
</span>
depends_build-append \
path:bin/cmake:cmake \
port:pkgconfig \
port:py${py_version}-docutils \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${py_version}
</span>
depends_lib-append path:lib/libcrypto.dylib:openssl \
port:cglm \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,21 +43,38 @@ depends_lib-append path:lib/libcrypto.dylib:openssl \
</span> port:libsdl2_mixer \
port:libzip \
port:opusfile \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_version}-zstd \
</span> port:webp \
port:zlib \
port:zstd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-doc-meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-meson.build.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-doc-meson.build.diff
</span>
use_xcode yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append PATH=$env(PATH):${workpath}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-fetch {
system -W ${worksrcpath} "git submodule update --init --recursive"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${workpath}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -sf ${python_bin} ${workpath}/bin/python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace -E \
"s|@@PY_VERSION@@|${py_branch}|g" ${worksrcpath}/doc/meson.build
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|@@PYTHON_BIN@@|${python_bin}|g" ${worksrcpath}/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Force all Python scripts to use MacPorts Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach pyfile [exec find ${worksrcpath} -iname "*.py"] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|/usr/bin/env python3|${python_bin}|" ${pyfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,3 +91,8 @@ post-destroot {
</span> notes "
Taisei is installed to ${applications_dir}
"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.livecheck.regex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {([0-9.]+)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build no
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/taisei/files/patch-doc-meson.build.diff b/games/taisei/files/patch-doc-meson.build.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fca26b1c30c..15a0889ac07 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/taisei/files/patch-doc-meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/taisei/files/patch-doc-meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./doc/meson.build 2023-06-27 04:27:14.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./doc/meson.build 2023-06-27 04:27:39.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,7 +4,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./doc/meson.build 2023-09-08 14:49:39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./doc/meson.build 2023-09-08 14:51:57
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,7 +14,7 @@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # This is *completely* ridiculous, but apparently this thing has THAT many faces.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- basenames = ['rst2html5', 'rst2html', 'rst2html4']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- suffixes = ['', '-3', '3', '-docutils']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ suffixes = ['', '-3', '3', '@@PY_VERSION@@', '-@@PY_VERSION@@', '-docutils']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This is *completely* ridiculous, but apparently this thing has THAT many faces.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ basenames = ['rst2html5', 'rst2html', 'rst2html4']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-suffixes = ['', '-3', '3', '-docutils']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++suffixes = ['', '-3', '3', '@@PY_VERSION@@', '-@@PY_VERSION@@', '-docutils']
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach basename : basenames
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach suffix : suffixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach basename : basenames
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach suffix : suffixes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/taisei/files/patch-meson.build.diff b/games/taisei/files/patch-meson.build.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0cdfa4811ec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/taisei/files/patch-meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./meson.build 2023-10-04 17:04:55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./meson.build 2023-10-04 17:05:55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,7 +85,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ is_developer_build = (get_option('developer') == 'auto' ? is_debug_build : get_option('developer') == 'true')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cc = meson.get_compiler('c')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-python = import('python').find_installation()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++python = import('python').find_installation('@@PYTHON_BIN@@')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subdir('scripts')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>