<pre style='margin:0'>
rainbow (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bceb6190e4b6d4d19c0bf512307f683165b2396e">https://github.com/macports/macports-ports/commit/bceb6190e4b6d4d19c0bf512307f683165b2396e</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 bceb619 py-wxpython-4.0: fix build on macOS 10.15
</span>bceb619 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bceb6190e4b6d4d19c0bf512307f683165b2396e
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Thu Apr 9 20:58:05 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> py-wxpython-4.0: fix build on macOS 10.15
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60056
</span>---
python/py-wxpython-4.0/Portfile | 23 ++-
.../files/fix_webview_macos1015.patch | 204 +++++++++++++++++++++
.../files/patch-ext_wxWidgets_configure_in.diff | 51 ------
...Widgets_src_html_htmlctrl_webkit_webkit_mm.diff | 14 --
4 files changed, 219 insertions(+), 73 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 eae82de..dbff5c5 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;'>@@ -37,18 +37,25 @@ if {${name} ne ${subport}} {
</span> conflicts py${python.version}-wxpython-2.8 py${python.version}-wxpython-3.0
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # wxPython uses internal wxwidgets source code
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # therefore should be not needed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # note: doesn't work with system wx
</span> wxWidgets.use wxWidgets-3.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-ext_wxWidgets_src_html_htmlctrl_webkit_webkit_mm.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ext_wxWidgets_configure_in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix build for 10.15 SDK (WebKit errors).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fixed in 4.1.x.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fix_webview_macos1015.patch
</span>
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${wxWidgets.port} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pathlib2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pip \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-sip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${wxWidgets.port} \
</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;'>+ 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;'>- build.cmd ${python.bin} build.py build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.cmd ${python.bin} setup.py WX_CONFIG="${wxWidgets.wxconfig}"
</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.cmd ${python.bin} build.py build --release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.cmd ${python.bin} setup.py
</span>
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-wxpython-4.0/files/fix_webview_macos1015.patch b/python/py-wxpython-4.0/files/fix_webview_macos1015.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a854d3c
</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/fix_webview_macos1015.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,204 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0044bf4a7af60a46a8b2ab2a8514ce298ff0fadf Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Stefan Csomor <csomor@advancedconcepts.ch>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 7 Aug 2019 12:05:13 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/2] macos 10.15 build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+adapt to removed headers, add version defines
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ext/wxWidgets/include/wx/platform.h | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ext/wxWidgets/src/html/htmlctrl/webkit/webkit.mm | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ext/wxWidgets/src/osx/webview_webkit.mm | 6 ++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 9 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/ext/wxWidgets/include/wx/platform.h b/ext/wxWidgets/include/wx/platform.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 91749a1c8bd7a5f21cec274af54703c0b0b5aabf..d100c2b7ab9d8aa2feb510b6809d701ddf6a3dd0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/wxWidgets/include/wx/platform.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/wxWidgets/include/wx/platform.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,6 +32,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ifndef MAC_OS_X_VERSION_10_8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define MAC_OS_X_VERSION_10_8 1080
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ifndef MAC_OS_X_VERSION_10_15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# define MAC_OS_X_VERSION_10_15 101500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include "wx/osx/config_xcode.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ifndef __WXOSX__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define __WXOSX__ 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/ext/wxWidgets/src/html/htmlctrl/webkit/webkit.mm b/ext/wxWidgets/src/html/htmlctrl/webkit/webkit.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e9a8742a4545a4b4763526b9ca5d5da216d82146..41334ea13d58d7e01a2eba4ce11685fe423a281e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/wxWidgets/src/html/htmlctrl/webkit/webkit.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/wxWidgets/src/html/htmlctrl/webkit/webkit.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,8 +21,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "wx/osx/private.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <WebKit/WebKit.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <WebKit/HIWebView.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <WebKit/CarbonUtils.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "wx/html/webkit.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/ext/wxWidgets/src/osx/webview_webkit.mm b/ext/wxWidgets/src/osx/webview_webkit.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f818b090f52b0529251ce56d79fb7abdbde86f48..381d0f333002a875dcf0902c8b6334824d3bfa91 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/wxWidgets/src/osx/webview_webkit.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/wxWidgets/src/osx/webview_webkit.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,8 +29,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "wx/filesys.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <WebKit/WebKit.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <WebKit/HIWebView.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <WebKit/CarbonUtils.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <WebKit/HIWebView.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <WebKit/CarbonUtils.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Foundation/NSURLError.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From b8fbecc261d267c1b9c56675e176810914c4e54e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Vadim Zeitlin <vadim@wxwidgets.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 8 Oct 2019 15:06:01 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/2] Remove configure tests for WebView headers under Mac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+They shouldn't be necessary, as these headers should be always available
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+on all supported macOS versions, and they fail when using 10.15 SDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+which doesn't include Carbon headers at all any more.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[Homebrew edit] 4e5095e5a5090dd025efd9f8818e69e50ea68f67 is squashed into
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+this diff.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ext/wxWidgets/configure | 48 +++---------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ext/wxWidgets/configure.in | 39 +++++----------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 8 insertions(+), 79 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/ext/wxWidgets/configure b/ext/wxWidgets/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3dea582d757f1d2f2726a921d434259fde651fee..0426df54c9a8103d7f90cea2784bec3de3aace79 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/wxWidgets/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/wxWidgets/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36394,34 +36394,11 @@ if test "$wxUSE_HTML" = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$wxUSE_WEBKIT" = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- old_CPPFLAGS="$CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CPPFLAGS="-x objective-c++ $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ac_fn_c_check_header_compile "$LINENO" "WebKit/HIWebView.h" "ac_cv_header_WebKit_HIWebView_h" "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #include <Carbon/Carbon.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #include <WebKit/WebKit.h>
</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 test "x$ac_cv_header_WebKit_HIWebView_h" = xyes; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $as_echo "#define wxUSE_WEBKIT 1" >>confdefs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- WEBKIT_LINK="-framework WebKit"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: WebKit headers not found; disabling wxWebKit" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$as_echo "$as_me: WARNING: WebKit headers not found; disabling wxWebKit" >&2;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wxUSE_WEBKIT=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</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;'>+- CPPFLAGS="$old_CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elif test "$wxUSE_OLD_COCOA" = 1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "#define wxUSE_WEBKIT 1" >>confdefs.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ WEBKIT_LINK="-framework WebKit"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxUSE_WEBKIT=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$wxUSE_WEBKIT" = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36753,27 +36728,8 @@ $as_echo "yes" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- old_CPPFLAGS="$CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CPPFLAGS="-x objective-c++ $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ac_fn_c_check_header_compile "$LINENO" "WebKit/HIWebView.h" "ac_cv_header_WebKit_HIWebView_h" "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #include <Carbon/Carbon.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #include <WebKit/WebKit.h>
</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 test "x$ac_cv_header_WebKit_HIWebView_h" = xyes; then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- USE_WEBVIEW_WEBKIT=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- WEBKIT_LINK="-framework WebKit"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: WebKit headers not found" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$as_echo "$as_me: WARNING: WebKit headers not found" >&2;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</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;'>+- CPPFLAGS="$old_CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ USE_WEBVIEW_WEBKIT=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ WEBKIT_LINK="-framework WebKit"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/ext/wxWidgets/configure.in b/ext/wxWidgets/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bd15f7e34427b82de6a4d62da4aa09e58251d3cb..4a05cc5efec972d9cea978002f279ccccb416740 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/wxWidgets/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/wxWidgets/configure.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7150,26 +7150,11 @@ if test "$wxUSE_HTML" = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$wxUSE_WEBKIT" = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dnl This is only supported under Mac.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- old_CPPFLAGS="$CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CPPFLAGS="-x objective-c++ $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_CHECK_HEADER([WebKit/HIWebView.h],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_DEFINE(wxUSE_WEBKIT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- WEBKIT_LINK="-framework 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;'>+- AC_MSG_WARN([WebKit headers not found; disabling wxWebKit])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wxUSE_WEBKIT=no
</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;'>+- #include <Carbon/Carbon.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #include <WebKit/WebKit.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CPPFLAGS="$old_CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elif test "$wxUSE_OLD_COCOA" = 1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE(wxUSE_WEBKIT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ WEBKIT_LINK="-framework WebKit"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxUSE_WEBKIT=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$wxUSE_WEBKIT" = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7296,23 +7279,9 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dnl Under Mac we always have the libraries but check for the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dnl headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- old_CPPFLAGS="$CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CPPFLAGS="-x objective-c++ $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_CHECK_HEADER([WebKit/HIWebView.h],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- USE_WEBVIEW_WEBKIT=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- WEBKIT_LINK="-framework 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;'>+- AC_MSG_WARN([WebKit headers not found])
</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;'>+- #include <Carbon/Carbon.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #include <WebKit/WebKit.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CPPFLAGS="$old_CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dnl Under Mac we always have the libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ USE_WEBVIEW_WEBKIT=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ WEBKIT_LINK="-framework WebKit"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-wxpython-4.0/files/patch-ext_wxWidgets_configure_in.diff b/python/py-wxpython-4.0/files/patch-ext_wxWidgets_configure_in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 198420f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-wxpython-4.0/files/patch-ext_wxWidgets_configure_in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,51 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/wxWidgets/configure.in.old 2020-02-20 13:32:29.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/wxWidgets/configure.in 2020-02-20 13:33:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7151,22 +7151,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$wxUSE_WEBKIT" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- old_CPPFLAGS="$CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CPPFLAGS="-x objective-c++ $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CHECK_HEADER([WebKit/HIWebView.h],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_DEFINE(wxUSE_WEBKIT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- WEBKIT_LINK="-framework WebKit"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_WARN([WebKit headers not found; disabling wxWebKit])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- wxUSE_WEBKIT=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #include <Carbon/Carbon.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #include <WebKit/WebKit.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CPPFLAGS="$old_CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_DEFINE(wxUSE_WEBKIT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ WEBKIT_LINK="-framework WebKit"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif test "$wxUSE_OLD_COCOA" = 1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFINE(wxUSE_WEBKIT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7315,21 +7301,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Under Mac we always have the libraries but check for the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- old_CPPFLAGS="$CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CPPFLAGS="-x objective-c++ $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CHECK_HEADER([WebKit/HIWebView.h],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- USE_WEBVIEW_WEBKIT=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- WEBKIT_LINK="-framework WebKit"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_WARN([WebKit headers not found])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #include <Carbon/Carbon.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #include <WebKit/WebKit.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CPPFLAGS="$old_CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ USE_WEBVIEW_WEBKIT=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ WEBKIT_LINK="-framework WebKit"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-wxpython-4.0/files/patch-ext_wxWidgets_src_html_htmlctrl_webkit_webkit_mm.diff b/python/py-wxpython-4.0/files/patch-ext_wxWidgets_src_html_htmlctrl_webkit_webkit_mm.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e14345b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-wxpython-4.0/files/patch-ext_wxWidgets_src_html_htmlctrl_webkit_webkit_mm.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/wxWidgets/src/html/htmlctrl/webkit/webkit.mm.old 2020-02-20 13:20:05.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/wxWidgets/src/html/htmlctrl/webkit/webkit.mm 2020-02-20 13:20:56.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,9 +24,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "wx/osx/private.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <WebKit/WebKit.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <WebKit/HIWebView.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <WebKit/CarbonUtils.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "wx/html/webkit.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>