<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/0cbc77798641c3a5eb52b1d88fe0c30c00547150">https://github.com/macports/macports-ports/commit/0cbc77798641c3a5eb52b1d88fe0c30c00547150</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 0cbc7779864 sigil: add python310 variant
</span>0cbc7779864 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0cbc77798641c3a5eb52b1d88fe0c30c00547150
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Mon Mar 21 15:36:31 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> sigil: add python310 variant
</span>---
editors/sigil/Portfile | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/sigil/Portfile b/editors/sigil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3e413eeb57c..9caad031627 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/sigil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/sigil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,7 @@ configure.args -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF \
</span> -DUSE_SYSTEM_LIBS=ON
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset python39] && ![variant_isset python38]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset python310] && ![variant_isset python39] && ![variant_isset python38]} {
</span> ui_error "${name} requires Python, please use a Python variant."
return -code error
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,12 +66,22 @@ proc python-depends {python_branch} {
</span> PATH=${frameworks_dir}/Python.framework/Versions/${python_branch}/bin:$env(PATH)
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 conflicts python38 description {Use Python 3.9 during build} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python310 conflicts python38 python39 description {Use Python 3.10 during build} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|Python3 3\.9 COMPONENTS Interpreter Development|Python3 3.10 COMPONENTS Interpreter Development|g} ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|PythonInterp 3\.9|PythonInterp 3.10|g} ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|PythonLibs 3\.9|PythonLibs 3.10|g} ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_branch 3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python-depends ${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python38 python310 description {Use Python 3.9 during build} {
</span> set python_branch 3.9
python-depends ${python_branch}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python39 description {Use Python 3.8 during build} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python39 python310 description {Use Python 3.8 during build} {
</span> post-patch {
reinplace {s|Python3 3\.9 COMPONENTS Interpreter Development|Python3 3.8 COMPONENTS Interpreter Development|g} ${worksrcpath}/CMakeLists.txt
reinplace {s|PythonInterp 3\.9|PythonInterp 3.8|g} ${worksrcpath}/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,5 +92,5 @@ variant python38 conflicts python39 description {Use Python 3.8 during build} {
</span> }
if {![variant_isset python38]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python310
</span> }
</pre><pre style='margin:0'>
</pre>