<pre style='margin:0'>
ra1nb0w (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6e540f4c2c47e9c972e74cc85918022c7071d010">https://github.com/macports/macports-ports/commit/6e540f4c2c47e9c972e74cc85918022c7071d010</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6e540f4c2c47e9c972e74cc85918022c7071d010
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Sun Jan 2 01:10:49 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> py-wxpython-4.0: use system wxWidgets-3.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - use system wxWidgets library
</span><span style='display:block; white-space:pre;color:#404040;'> - remove old python 3.5 and 3.6
</span><span style='display:block; white-space:pre;color:#404040;'> - remove old webkit interface
</span><span style='display:block; white-space:pre;color:#404040;'> - use system sip4 and pathlib2
</span><span style='display:block; white-space:pre;color:#404040;'> next version requirement.
</span>---
python/py-wxpython-4.0/Portfile | 35 ++--
python/py-wxpython-4.0/files/webkit.patch | 257 +++++++++++++++++++++++++++++
python/py-wxpython-4.0/files/webkit2.patch | 64 +++++++
3 files changed, 338 insertions(+), 18 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 c2c7ae2cdc6..ac0e5bdff47 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;'>@@ -7,7 +7,7 @@ PortGroup wxWidgets 1.0
</span> name py-wxpython-4.0
python.rootname wxPython
version 4.1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span>
categories-append graphics devel
license wxwidgets-3.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,19 +28,16 @@ checksums rmd160 e0d66dfb24bd7738306e70588ed0a5f6f7116de1 \
</span> sha256 00e5e3180ac7f2852f342ad341d57c44e7e4326de0b550b9a5c4a8361b6c3528 \
size 66043287
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append fix_cc_cxx.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 35 36 37 38 39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 37 38 39
</span>
if {${name} ne ${subport}} {
if {${python.version} == 27} {
conflicts py${python.version}-wxpython-3.0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # wxPython uses internal wxwidgets source code
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # therefore should be not needed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # note: doesn't work with system wx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append fix_cc_cxx.patch webkit.patch webkit2.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> wxWidgets.use wxWidgets-3.2
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,21 +48,23 @@ if {${name} ne ${subport}} {
</span>
if {${python.version} < 38} {
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-importlib-metadata
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-importlib-metadata
</span> }
depends_run-append \
port:py${python.version}-numpy \
port:py${python.version}-pillow \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-six
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append PATH=${wxWidgets.prefix}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.cmd ${python.bin} build.py build --release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.cmd ${python.bin} setup.py
</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;'>- delete ${destroot}${wxWidgets.prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-six \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-sip4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pathlib2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append SIP=${python.prefix}/bin/sip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append PATH=${python.prefix}/bin:${wxWidgets.prefix}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.cmd ${python.bin} build.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target build_py --use_syswx --release --python ${python.bin} --osx_cocoa --no_magic --nodoc --prefix=${python.prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.cmd ${python.bin} build.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.target install_py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.destdir --prefix=${python.prefix} --destdir=${destroot}
</span>
livecheck.type none
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-wxpython-4.0/files/webkit.patch b/python/py-wxpython-4.0/files/webkit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4d9f0357975
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-wxpython-4.0/files/webkit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,257 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 70535a722b945b817af5217841fbd5895d3ba7a9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Robin Dunn <robin@alldunn.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 24 Jul 2021 15:59:37 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] remove wx.webkit
</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;'>+ etg/_webkit.py | 71 ------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ etg/webkit.py | 77 ----------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unittests/test_webkit.py | 77 ----------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 225 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete mode 100644 etg/_webkit.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete mode 100644 etg/webkit.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete mode 100644 unittests/test_webkit.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/etg/_webkit.py b/etg/_webkit.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+deleted file mode 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 95e9e8a52..000000000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/etg/_webkit.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,71 +0,0 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Name: etg/_webkit.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Author: Robin Dunn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Created: 22-Aug-2013
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Copyright: (c) 2013-2020 by Total Control Software
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# License: wxWindows License
</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;'>+-import etgtools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-import etgtools.tweaker_tools as tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PACKAGE = "wx"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MODULE = "_webkit"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-NAME = "_webkit" # Base name of the file to generate to for this script
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DOCSTRING = """\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-The :ref:`wx.webkit.wxWebKitCtrl` and related classes are provided mainly for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-backwards compatibility only. New code would be more future-proof by using the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-``wx.html2`` module. The classes in this module are light wrappers around
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-the OSX WebKit control and is not implemented on any other platform.
</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;'>+-# The classes and/or the basename of the Doxygen XML files to be processed by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# this script.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ITEMS = [ ]
</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;'>+-# The list of other ETG scripts and back-end generator modules that are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# included as part of this module. These should all be items that are put in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# the wxWidgets "webview" library in a multi-lib build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-INCLUDES = [ 'webkit',
</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;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Separate the list into those that are generated from ETG scripts and the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# rest. These lists can be used from the build scripts to get a list of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# sources and/or additional dependencies when building this extension module.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ETGFILES = ['etg/%s.py' % NAME] + tools.getEtgFiles(INCLUDES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DEPENDS = tools.getNonEtgFiles(INCLUDES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OTHERDEPS = [ ]
</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;'>+-#---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-def run():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Parse the XML file(s) building a collection of Extractor objects
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- module = etgtools.ModuleDef(PACKAGE, MODULE, NAME, DOCSTRING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- etgtools.parseDoxyXML(module, ITEMS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- module.check4unittest = False
</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;'>+- # Tweak the parsed meta objects in the module object as needed for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # customizing the generated code and docstrings.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- module.addHeaderCode('#include <wxPython/wxpy_api.h>')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- module.addImport('_core')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- module.addPyCode('import wx', order=10)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- module.addInclude(INCLUDES)
</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;'>+- #-----------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #-----------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tools.doCommonTweaks(module)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tools.runGenerators(module)
</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;'>+-
</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;'>+-if __name__ == '__main__':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- run()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/etg/webkit.py b/etg/webkit.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+deleted file mode 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7a3e70e6d..000000000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/etg/webkit.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,77 +0,0 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Name: etg/webkit.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Author: Robin Dunn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Created: 22-Aug-2013
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Copyright: (c) 2013-2020 by Total Control Software
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# License: wxWindows License
</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;'>+-import etgtools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-import etgtools.tweaker_tools as tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PACKAGE = "wx"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MODULE = "_webkit"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-NAME = "webkit" # Base name of the file to generate to for this script
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DOCSTRING = ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# The classes and/or the basename of the Doxygen XML files to be processed by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# this script.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ITEMS = [ 'wxWebKitCtrl',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'wxWebKitBeforeLoadEvent',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'wxWebKitStateChangedEvent',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'wxWebKitNewWindowEvent',
</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;'>+-#---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-def run():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Parse the XML file(s) building a collection of Extractor objects
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- module = etgtools.ModuleDef(PACKAGE, MODULE, NAME, DOCSTRING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- etgtools.parseDoxyXML(module, ITEMS)
</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;'>+- # Tweak the parsed meta objects in the module object as needed for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # customizing the generated code and docstrings.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- module.addHeaderCode('#include <wx/html/webkit.h>')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tools.generateStubs('wxUSE_WEBKIT', module,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- extraHdrCode='extern const char* wxWebKitCtrlNameStr;\n',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- extraCppCode='const char* wxWebKitCtrlNameStr = "";\n')
</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;'>+- c = module.find('wxWebKitCtrl')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- assert isinstance(c, etgtools.ClassDef)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- c.addPrivateCopyCtor()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tools.fixWindowClass(c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- c.find('wxWebKitCtrl.strURL').default = '""'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- c.find('Create.strURL').default = '""'
</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;'>+- module.addGlobalStr('wxWebKitCtrlNameStr', c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- c = module.find('wxWebKitBeforeLoadEvent')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tools.fixEventClass(c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- c = module.find('wxWebKitStateChangedEvent')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tools.fixEventClass(c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- c = module.find('wxWebKitNewWindowEvent')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tools.fixEventClass(c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- module.addPyCode("""\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- EVT_WEBKIT_BEFORE_LOAD = wx.PyEventBinder( wxEVT_WEBKIT_BEFORE_LOAD, 1 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- EVT_WEBKIT_STATE_CHANGED = wx.PyEventBinder( wxEVT_WEBKIT_STATE_CHANGED, 1 )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- EVT_WEBKIT_NEW_WINDOW = wx.PyEventBinder( wxEVT_WEBKIT_NEW_WINDOW, 1 )
</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;'>+- #-----------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tools.doCommonTweaks(module)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tools.runGenerators(module)
</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;'>+-#---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if __name__ == '__main__':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- run()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/unittests/test_webkit.py b/unittests/test_webkit.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+deleted file mode 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3241d319a..000000000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/unittests/test_webkit.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,77 +0,0 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-import unittest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-from unittests import wtc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-import wx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-import sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- import wx.webkit
</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;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-class webkit_Tests(wtc.WidgetTestCase):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @unittest.skipIf(sys.platform != 'darwin', 'WebKit only implemented on Mac')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- def test_webkit01(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wk = wx.webkit.WebKitCtrl()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wk.Create(self.frame)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @unittest.skipIf(sys.platform != 'darwin', 'WebKit only implemented on Mac')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- def test_webkit02(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wk = wx.webkit.WebKitCtrl(self.frame)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @unittest.skipIf(sys.platform != 'darwin', 'WebKit only implemented on Mac')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- def test_webkit03(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wk = wx.webkit.WebKitCtrl(self.frame, -1, "http://wxpython.org")
</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;'>+- @unittest.skipIf(sys.platform != 'darwin', 'WebKit only implemented on Mac')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- def test_webkit04(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- e = wx.webkit.WebKitBeforeLoadEvent()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @unittest.skipIf(sys.platform != 'darwin', 'WebKit only implemented on Mac')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- def test_webkit05(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- e = wx.webkit.WebKitStateChangedEvent()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @unittest.skipIf(sys.platform != 'darwin', 'WebKit only implemented on Mac')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- def test_webkit06(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- e = wx.webkit.WebKitNewWindowEvent()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @unittest.skipIf(sys.platform != 'darwin', 'WebKit only implemented on Mac')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- def test_webkit07(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.WEBKIT_STATE_START
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.WEBKIT_STATE_NEGOTIATING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.WEBKIT_STATE_REDIRECTING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.WEBKIT_STATE_TRANSFERRING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.WEBKIT_STATE_STOP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.WEBKIT_STATE_FAILED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.WEBKIT_NAV_LINK_CLICKED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.WEBKIT_NAV_BACK_NEXT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.WEBKIT_NAV_FORM_SUBMITTED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.WEBKIT_NAV_RELOAD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.WEBKIT_NAV_FORM_RESUBMITTED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.WEBKIT_NAV_OTHER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.wxEVT_WEBKIT_STATE_CHANGED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.wxEVT_WEBKIT_BEFORE_LOAD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.wxEVT_WEBKIT_NEW_WINDOW
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.EVT_WEBKIT_STATE_CHANGED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.EVT_WEBKIT_BEFORE_LOAD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.EVT_WEBKIT_NEW_WINDOW
</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;'>+- @unittest.skipIf(sys.platform != 'darwin', 'WebKit only implemented on Mac')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- def test_webkit08(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.wxEVT_WEBKIT_STATE_CHANGED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.wxEVT_WEBKIT_BEFORE_LOAD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.wxEVT_WEBKIT_NEW_WINDOW
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.EVT_WEBKIT_STATE_CHANGED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.EVT_WEBKIT_BEFORE_LOAD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wx.webkit.EVT_WEBKIT_NEW_WINDOW
</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;'>+-#---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if __name__ == '__main__':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unittest.main()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-wxpython-4.0/files/webkit2.patch b/python/py-wxpython-4.0/files/webkit2.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1ee2a428eff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-wxpython-4.0/files/webkit2.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,64 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From af2c2b63c66a7f2295fc2074668b28f88dea7e5c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Robin Dunn <robin@alldunn.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 24 Jul 2021 16:01:37 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Add wx.FullScreenEvent
</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;'>+ etg/event.py | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/event_ex.py | 3 ++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wscript | 8 --------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 3 insertions(+), 9 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/etg/event.py b/etg/event.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index aeb506f48..49edfd7c0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/etg/event.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/etg/event.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,6 +44,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'wxJoystickEvent',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'wxKeyEvent',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'wxMaximizeEvent',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'wxFullScreenEvent',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'wxMenuEvent',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'wxMouseCaptureChangedEvent',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'wxMouseCaptureLostEvent',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/event_ex.py b/src/event_ex.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 01ab19cbe..521e777bc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/event_ex.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/event_ex.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -217,8 +217,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EVT_LONG_PRESS = wx.PyEventBinder( wxEVT_LONG_PRESS )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EVT_PRESS_AND_TAP = wx.PyEventBinder( wxEVT_PRESS_AND_TAP )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-EVT_CLIPBOARD_CHANGED = PyEventBinder(wxEVT_CLIPBOARD_CHANGED, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++EVT_CLIPBOARD_CHANGED = wx.PyEventBinder(wxEVT_CLIPBOARD_CHANGED, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++EVT_FULLSCREEN = wx.PyEventBinder(wxEVT_FULLSCREEN, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # deprecated wxEVT aliases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxEVT_COMMAND_BUTTON_CLICKED = wxEVT_BUTTON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/wscript b/wscript
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7fc4f7ca8..9a54e329f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/wscript
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/wscript
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -253,12 +253,6 @@ def configure(conf):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uselib_store='WXWEBVIEW', mandatory=True,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ msg='Finding libs for WXWEBVIEW')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if isDarwin:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- conf.check_cfg(path=conf.options.wx_config, package='',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- args='--cxxflags --libs core,net' + rpath,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uselib_store='WXWEBKIT', mandatory=True,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- msg='Finding libs for WXWEBKIT')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.check_cfg(path=conf.options.wx_config, package='',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args='--cxxflags --libs xml,core,net' + rpath,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uselib_store='WXXML', mandatory=True,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -616,8 +610,6 @@ def build(bld):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ makeETGRule(bld, 'etg/_aui.py', '_aui', 'WXAUI')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Modules that are platform-specific
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if isDarwin:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- makeETGRule(bld, 'etg/_webkit.py', '_webkit', 'WXWEBKIT')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if isWindows:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ makeETGRule(bld, 'etg/_msw.py', '_msw', 'WX')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>