<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/d57429f1087cc91c53f22c551f5f4789357e0e88">https://github.com/macports/macports-ports/commit/d57429f1087cc91c53f22c551f5f4789357e0e88</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 d57429f1087 sigil: update to 1.4.0 & add python39 variant
</span>d57429f1087 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d57429f1087cc91c53f22c551f5f4789357e0e88
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Fri Nov 13 18:08:48 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> sigil: update to 1.4.0 & add python39 variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> the new variant will be unusable until all dependencies get py39 variant
</span>---
editors/sigil/Portfile | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 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 3f6f0d885a4..5e76076f823 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;'>@@ -6,7 +6,7 @@ PortGroup conflicts_build 1.0
</span> PortGroup github 1.0
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup Sigil-Ebook Sigil 1.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup Sigil-Ebook Sigil 1.4.0
</span> revision 0
name sigil
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +19,9 @@ description Sigil, the ePub editor
</span> long_description Sigil is a multi-platform WYSIWYG ebook editor. It is \
designed to edit books in ePub format
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 7c37a3b4429f7d36dd693647ab2f45a62e2d7043 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ebe0566348821866458c96911222bb800998db1e90ed425ef13fb5d28c1cf96f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 21699910
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5143e954749702d2161940c9c82841604d227dd2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b1c8da40725af6546b9dd468baf50a17b106f3765608715178ae11d99dd2fd98 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 24116659
</span>
qt5.depends_component qttools qtwebengine
qt5.min_version 5.12
<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 python38] && ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset python39] && ![variant_isset python38] && ![variant_isset python37]} {
</span> ui_error "Sigil requires Python, please use a Python variant."
return -code error
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,12 +65,21 @@ proc python-depends {python_branch} {
</span> configure.env-append PATH=${frameworks_dir}/Python.framework/Versions/${python_branch}/bin:$env(PATH)
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python37 description {Use Python 3.8 during build} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python37 python38 description {Use Python 3.9 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|PythonInterp 3\.8|PythonInterp 3.9|g} ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace {s|PythonLibs 3\.8|PythonLibs 3.9|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.9
</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 python38 conflicts python37 python39 description {Use Python 3.8 during build} {
</span> set python_branch 3.8
python-depends ${python_branch}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python38 description {Use Python 3.7 during build} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python38 python39 description {Use Python 3.7 during build} {
</span> post-patch {
reinplace {s|PythonInterp 3\.8|PythonInterp 3.7|g} ${worksrcpath}/CMakeLists.txt
reinplace {s|PythonLibs 3\.8|PythonLibs 3.7|g} ${worksrcpath}/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,6 +88,6 @@ variant python37 conflicts python38 description {Use Python 3.7 during build} {
</span> python-depends ${python_branch}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python37] && ![variant_isset python39]} {
</span> default_variants +python38
}
</pre><pre style='margin:0'>
</pre>