<pre style='margin:0'>
Vincent (Veence) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4321b092665bafacc9004ef48f03b776cebb17a3">https://github.com/macports/macports-ports/commit/4321b092665bafacc9004ef48f03b776cebb17a3</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 4321b09 py-wxpython-4.0: disable webkit for MacOS 10.15 (missing .h file in WebKit framework)
</span>4321b09 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4321b092665bafacc9004ef48f03b776cebb17a3
</span>Author: Veence <vince@macports.org>
AuthorDate: Sat Feb 8 17:34:25 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> py-wxpython-4.0: disable webkit for MacOS 10.15 (missing .h file in WebKit framework)
</span>---
python/py-wxpython-4.0/Portfile | 40 +++++++++++++++-------------------------
1 file changed, 15 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-wxpython-4.0/Portfile b/python/py-wxpython-4.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4b9ab00..59a2e41 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-wxpython-4.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-wxpython-4.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,45 +35,35 @@ if {${name} ne ${subport}} {
</span> if {${python.version} == 27} {
conflicts py${python.version}-wxpython-2.8 py${python.version}-wxpython-3.0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # As long as wxPython and wxWidgets are at the same version,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this port could also depend on wxWidgets-3.0.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # A separate port is there just because wxPython usually lags behind.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> wxWidgets.use wxWidgets-3.2
depends_lib-append \
port:${wxWidgets.port} \
port:py${python.version}-pathlib2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-sip
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # patchfiles patch-config.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set extra_options "'--enable-utf8'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The HIWebView.h file disappeared from the WebKit framework in 10.15, meaning
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # wxWebKit cannot be built anymore
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} > 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append extra_options ", '--disable-webkit'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|configure_opts = \\\[\\\]|configure_opts = \[${extra_options}\]|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/buildtools/build_wxwidgets.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: is it possible to use build arguments instead of redefining the whole command?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set boptions "--enable-plugins --enable-utf8 --enable-std_string_conv_in_wxstring \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-permissive"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.cmd ${python.bin} setup.py WX_CONFIG="${wxWidgets.wxconfig}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.cmd ${python.bin} build.py build
</span> destroot.cmd ${python.bin} setup.py WX_CONFIG="${wxWidgets.wxconfig}"
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # When a new release of wxPython comes out, the contents of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ${destroot}${wxWidgets.prefix}/Versions/wxPython/${branch}/include/wx-${branch}/wx/wxPython
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # should be stored separately into wxPython-${version}-MacPorts-subset.tar.bz2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # to be extracted/installed by wxPython-3.0 rather than this port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This allows parallel installation of several versions of py**-wxpython-3.0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> delete ${destroot}${wxWidgets.prefix}
}
livecheck.type none
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Once upon a time this would install the documentation,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # however the python PortGroup disables all steps including fetching & extracting
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # which makes it a bit inconvenient to do things like this.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If anyone is missing the docs badly enough, you are welcome to fix this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # in both py-wxpython-2.8 and py-wxpython-3.0.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # xinstall -d -m 755 ${destroot}${prefix}/share/doc/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # file copy ${worksrcpath}/docs ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # file copy ${worksrcpath}/samples ${destroot}${prefix}/share/doc/${name}/examples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # }
</span>
livecheck.url https://api.github.com/repos/wxWidgets/wxPython/tags
livecheck.regex tarball/wxPy-(3\\.0\\.\[^"\]+)
</pre><pre style='margin:0'>
</pre>