<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/6f153c3a9aa15012e697e4e200608c4cf0f7ea39">https://github.com/macports/macports-ports/commit/6f153c3a9aa15012e697e4e200608c4cf0f7ea39</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 6f153c3a9aa sigil: enable and use python 3.12 by default
</span>6f153c3a9aa is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6f153c3a9aa15012e697e4e200608c4cf0f7ea39
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Mon Jan 8 01:52:26 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> sigil: enable and use python 3.12 by default
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Simplify portfile
</span>---
editors/sigil/Portfile | 55 +++++++++++++++++++++++---------------------------
1 file changed, 25 insertions(+), 30 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 c976c2c20fa..f0ec5b305fa 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;'>@@ -43,7 +43,7 @@ configure.args -DCMAKE_BUILD_WITH_INSTALL_RPATH=OFF \
</span> -DCMAKE_OSX_DEPLOYMENT_TARGET=${macosx_deployment_target}
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset python311] && ![variant_isset python310] && ![variant_isset python39] && ![variant_isset python38]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset python312] && ![variant_isset python311] && ![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;'>@@ -55,6 +55,11 @@ destroot {
</span>
proc python-depends {python_branch} {
global frameworks_dir env
<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\.8 COMPONENTS Interpreter Development|Python3 ${::python_branch} COMPONENTS Interpreter Development|g" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|PythonInterp 3\.8|PythonInterp ${::python_branch}|g" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|PythonLibs 3\.8|PythonLibs ${::python_branch}|g" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> set python_version [string map {. ""} ${python_branch}]
depends_lib-append port:python${python_version} \
port:py${python_version}-chardet \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,41 +74,31 @@ 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 python311 conflicts python38 python39 python310 description {Use Python 3.11 during build} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|Python3 3\.8 COMPONENTS Interpreter Development|Python3 3.11 COMPONENTS Interpreter Development|g} ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|PythonInterp 3\.8|PythonInterp 3.11|g} ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|PythonLibs 3\.8|PythonLibs 3.11|g} ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_branch 3.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python-depends ${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python312 conflicts python38 python39 python310 python311 description {Build with Python 3.12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ::python_branch 3.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python-depends ${::python_branch}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python310 conflicts python38 python39 python311 description {Use Python 3.10 during build} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|Python3 3\.8 COMPONENTS Interpreter Development|Python3 3.10 COMPONENTS Interpreter Development|g} ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|PythonInterp 3\.8|PythonInterp 3.10|g} ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|PythonLibs 3\.8|PythonLibs 3.10|g} ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_branch 3.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python-depends ${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python311 conflicts python38 python39 python310 python312 description {Build with Python 3.11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ::python_branch 3.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python-depends ${::python_branch}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 conflicts python38 python310 python311 description {Use Python 3.9 during build} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|Python3 3\.8 COMPONENTS Interpreter Development|Python3 3.9 COMPONENTS Interpreter Development|g} ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|PythonInterp 3\.8|PythonInterp 3.9|g} ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|PythonLibs 3\.8|PythonLibs 3.9|g} ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_branch 3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python-depends ${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python310 conflicts python38 python39 python311 python312 description {Build with Python 3.10} {
</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 python311 python312 description {Build with Python 3.9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ::python_branch 3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python-depends ${::python_branch}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python39 python310 python311 description {Use Python 3.8 during build} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_branch 3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python-depends ${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python39 python310 python311 python312 description {Build with Python 3.8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ::python_branch 3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python-depends ${::python_branch}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python311
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310] && ![variant_isset python311]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python312
</span> }
</pre><pre style='margin:0'>
</pre>