<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/47ae29b007508cbb838b850ca44ddc31657f6005">https://github.com/macports/macports-ports/commit/47ae29b007508cbb838b850ca44ddc31657f6005</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 47ae29b0075 py-wxpython-4.0: update version to 4.1.1
</span>47ae29b0075 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 47ae29b007508cbb838b850ca44ddc31657f6005
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Fri Jan 15 14:52:17 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> py-wxpython-4.0: update version to 4.1.1
</span>---
python/py-wxpython-4.0/Portfile | 25 +-
python/py-wxpython-4.0/files/fix_cc_cxx.patch | 308 +++++++++++++++++++++
.../files/fix_webview_macos1015.patch | 204 --------------
3 files changed, 319 insertions(+), 218 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 3be7c0ba048..9238d204cc5 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;'>@@ -5,9 +5,9 @@ PortGroup python 1.0
</span> PortGroup wxWidgets 1.0
name py-wxpython-4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.0.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname wxPython-${version}.post2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname wxPython-${version}
</span> set wx_version [join [lrange [split ${version} .] 0 2] .]
set branch [join [lrange [split ${version} .] 0 1] .]
categories-append graphics devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,11 +26,14 @@ long_description wxPython is a GUI toolkit for the Python programming \
</span> homepage http://www.wxpython.org/
master_sites pypi:w/wxPython
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0acb106cb0095a743096875449a23454c8d4378c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5a229e695b64f9864d30a5315e0c1e4ff5e02effede0a07f16e8d856737a0c4e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 68891167
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e0d66dfb24bd7738306e70588ed0a5f6f7116de1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 00e5e3180ac7f2852f342ad341d57c44e7e4326de0b550b9a5c4a8361b6c3528 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 66043287
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 35 36 37 38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append fix_cc_cxx.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><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 35 36 37 38 39
</span>
if {${name} ne ${subport}} {
if {${python.version} == 27} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,11 +45,6 @@ if {${name} ne ${subport}} {
</span> # note: doesn't work with system wx
wxWidgets.use wxWidgets-3.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix build for 10.15 SDK (WebKit errors).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fixed in 4.1.x.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fix_webview_macos1015.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append \
port:${wxWidgets.port} \
port:py${python.version}-pathlib2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,17 +52,16 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-sip
build.env-append SIP=${python.prefix}/bin/sip
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append PATH=${wxWidgets.prefix}/bin:$env(PATH)
</span> build.cmd ${python.bin} build.py build --release
destroot.cmd ${python.bin} setup.py
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> delete ${destroot}${wxWidgets.prefix}
}
livecheck.type none
} else {
<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\\.\[^"\]+)
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-wxpython-4.0/files/fix_cc_cxx.patch b/python/py-wxpython-4.0/files/fix_cc_cxx.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a34c8a0b0e4
</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_cc_cxx.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,308 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 201228c52908bf445d450c39e1e2630533da2878 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: Tue, 1 Dec 2020 16:18:14 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/2] Improve code to use the same CC and CXX as wxWidgets,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ including flags that may be added on to wx's CC/CXX.
</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;'>+ buildtools/config.py | 107 ++++++++++++++++++++++++++++---------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wscript | 30 ++++++------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 86 insertions(+), 51 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/buildtools/config.py b/buildtools/config.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c837e5d36..99a1a2258 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/buildtools/config.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/buildtools/config.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import glob
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import fnmatch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++import shlex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import re
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import shutil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import subprocess
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -195,6 +196,7 @@ def finishSetup(self, wx_config=None, debug=None):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '/EHsc',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # '/GX-' # workaround for internal compiler error in MSVC on some machines
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self.cxxflags = self.cflags[:]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.lflags = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # These confuse WAF, but since it already reliably picks the correct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -206,6 +208,7 @@ def finishSetup(self, wx_config=None, debug=None):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Other MSVC flags...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Uncomment these to have debug info for all kinds of builds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #self.cflags += ['/Od', '/Z7']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #self.cxxflags += ['/Od', '/Z7']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #self.lflags = ['/DEBUG', ]
</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;'>+@@ -219,13 +222,15 @@ def finishSetup(self, wx_config=None, debug=None):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.libdirs = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.libs = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.cflags = self.getWxConfigValue('--cxxflags')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.cflags = self.cflags.split()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self.cflags = self.getWxConfigValue('--cflags').split()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self.cxxflags = self.getWxConfigValue('--cxxflags').split()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if self.debug:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.cflags.append('-ggdb')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.cflags.append('-O0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for lst in [self.cflags, self.cxxflags]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lst.append('-ggdb')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lst.append('-O0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.cflags.append('-O3')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for lst in [self.cflags, self.cxxflags]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lst.append('-O3')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lflags = self.getWxConfigValue('--libs')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.MONOLITHIC = (lflags.find("_xrc") == -1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -235,9 +240,47 @@ def finishSetup(self, wx_config=None, debug=None):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.WXRELEASE = self.getWxConfigValue('--release')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.WXPREFIX = self.getWxConfigValue('--prefix')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Set CC, CXX and maybe LDSHARED based on what was configured for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # wxWidgets, but not if those values are in the environment.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.CC = self.CXX = self.LDSHARED = None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # wxMac settings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if not os.environ.get('CC'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ compiler, flags = self.unpackCompilerCommand(self.getWxConfigValue('--cc'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self.CC = os.environ["CC"] = compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for flag in flags:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if flag not in self.cflags:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self.cflags.insert(0, flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if not os.environ.get('CXX'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ compiler, flags = self.unpackCompilerCommand(self.getWxConfigValue('--cxx'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self.CXX = os.environ["CXX"] = compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for flag in flags:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if flag not in self.cxxflags:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self.cxxflags.insert(0, flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if sys.platform[:6] == "darwin" and not os.environ.get('LDSHARED'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # We want to use the linker command from wx to make sure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # we get the right sysroot, but we also need to ensure that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # the other linker flags that distutils wants to use are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # included as well.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LDSHARED = distutils.sysconfig.get_config_var('LDSHARED').split()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # remove the compiler command
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ del LDSHARED[0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # remove any -sysroot flags and their arg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while True:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ index = LDSHARED.index('-isysroot')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Strip this argument and the next one:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ del LDSHARED[index:index+2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ except ValueError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LDSHARED = ' '.join(LDSHARED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Combine with wx's ld command and stash it in the env
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # where distutils will get it later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LDSHARED = self.getWxConfigValue('--ld').replace(' -o', '') + ' ' + LDSHARED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self.LDSHARED = os.environ["LDSHARED"] = LDSHARED
</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;'>++ # Other wxMac-only settings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if sys.platform[:6] == "darwin":
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.WXPLAT = '__WXMAC__'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -247,41 +290,16 @@ def finishSetup(self, wx_config=None, debug=None):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.WXPLAT2 = '__WXOSX_COCOA__'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.libs = ['stdc++']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not self.ARCH == "":
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for arch in self.ARCH.split(','):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.cflags.append("-arch")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.cflags.append(arch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for lst in [self.cflags, self.cxxflags]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lst.append("-arch")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ lst.append(arch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.lflags.append("-arch")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.lflags.append(arch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if not os.environ.get('CC') or not os.environ.get('CXX'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.CC = os.environ["CC"] = self.getWxConfigValue('--cc')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.CXX = os.environ["CXX"] = self.getWxConfigValue('--cxx')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # We want to use the linker command from wx to make sure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # we get the right sysroot, but we also need to ensure that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # the other linker flags that distutils wants to use are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # included as well.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDSHARED = distutils.sysconfig.get_config_var('LDSHARED').split()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # remove the compiler command
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- del LDSHARED[0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # remove any -sysroot flags and their arg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- while 1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- index = LDSHARED.index('-isysroot')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Strip this argument and the next one:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- del LDSHARED[index:index+2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- except ValueError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDSHARED = ' '.join(LDSHARED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Combine with wx's ld command and stash it in the env
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # where distutils will get it later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDSHARED = self.getWxConfigValue('--ld').replace(' -o', '') + ' ' + LDSHARED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self.LDSHARED = os.environ["LDSHARED"] = LDSHARED
</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;'>+- # wxGTK settings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # wxGTK-only settings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set flags for other Unix type platforms
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if self.WXPORT == 'gtk':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -296,7 +314,7 @@ def finishSetup(self, wx_config=None, debug=None):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.WXPLAT = '__WXGTK__'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portcfg = os.popen('pkg-config gtk+-3.0 --cflags', 'r').read()[:-1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif self.WXPORT == 'x11':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- msg("WARNING: The wxX11 port is no supported")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ msg("WARNING: The wxX11 port is not supported")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.WXPLAT = '__WXX11__'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portcfg = ''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.BUILD_BASE = self.BUILD_BASE + '-' + self.WXPORT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -307,6 +325,7 @@ def finishSetup(self, wx_config=None, debug=None):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ raise SystemExit("Unknown WXPORT value: " + self.WXPORT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.cflags += portcfg.split()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self.cxxflags += portcfg.split()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Some distros (e.g. Mandrake) put libGLU in /usr/X11R6/lib, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # wx-config doesn't output that for some reason. For now, just
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -318,9 +337,11 @@ def finishSetup(self, wx_config=None, debug=None):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Move the various -I, -D, etc. flags we got from the config scripts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # into the distutils lists.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.cflags = self.adjustCFLAGS(self.cflags, self.defines, self.includes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self.cxxflags = self.adjustCFLAGS(self.cxxflags, self.defines, self.includes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.lflags = self.adjustLFLAGS(self.lflags, self.libdirs, self.libs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.cflags.insert(0, '-UNDEBUG')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self.cxxflags.insert(0, '-UNDEBUG')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if self.debug and self.WXPORT == 'msw' and self.COMPILER != 'mingw32':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.defines.append( ('_DEBUG', None) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -430,6 +451,16 @@ def getWxConfigValue(self, flag):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return value
</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 unpackCompilerCommand(self, cmd):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ """
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ It's possible for the CC and CXX values coming from wx-config to have
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ some extra parameters tacked on. Let's split them apart.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ """
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cmd = shlex.split(cmd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ compiler = cmd[0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ flags = cmd[1:]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return compiler, flags
</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 build_locale_dir(self, destdir, verbose=1):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """Build a locale dir under the wxPython package."""
</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 2eea2600a..1e143be67 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;'>+@@ -125,8 +125,10 @@ def configure(conf):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.env.INCLUDES_WX = cfg.includes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.env.DEFINES_WX = cfg.wafDefines
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- conf.env.CFLAGS_WX = cfg.cflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- conf.env.CXXFLAGS_WX = cfg.cflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ conf.env.CFLAGS = cfg.cflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ conf.env.CXXFLAGS = cfg.cxxflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ conf.env.CFLAGS_WX = list()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ conf.env.CXXFLAGS_WX = list()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.env.LIBPATH_WX = cfg.libdirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.env.LIB_WX = cfg.libs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.env.LIBFLAGS_WX = cfg.lflags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -192,20 +194,22 @@ def configure(conf):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.env['LIB_PYEXT'][0] += '_d'
</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;'>+- else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else: # not isWindows
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: Double-check that this works when using an installed wxWidgets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxConfigDir = cfg.findWxConfigDir(conf.options.wx_config)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Configuration stuff for non-Windows ports using wx-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- conf.env.CFLAGS_WX = list()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- conf.env.CXXFLAGS_WX = list()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- conf.env.CFLAGS_WXPY = list()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- conf.env.CXXFLAGS_WXPY = list()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # finish configuring the Config object
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # First finish configuring the Config object
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.env.wx_config = conf.options.wx_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cfg.finishSetup(conf.env.wx_config, conf.env.debug)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ conf.env.CFLAGS = cfg.cflags[:]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ conf.env.CXXFLAGS = cfg.cxxflags[:]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ conf.env.CFLAGS_WX = list()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ conf.env.CXXFLAGS_WX = list()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ conf.env.CFLAGS_WXPY = list()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ conf.env.CXXFLAGS_WXPY = list()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check wx-config exists and fetch some values from it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rpath = ' --no-rpath' if not conf.options.no_magic else ''
</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;'>+@@ -364,14 +368,14 @@ def configure(conf):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Some Mac-specific stuff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if isDarwin:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- conf.env.MACOSX_DEPLOYMENT_TARGET = "10.6"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ conf.env.MACOSX_DEPLOYMENT_TARGET = "10.10"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if conf.options.mac_arch:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf.env.ARCH_WXPY = conf.options.mac_arch.split(',')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #import pprint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #pprint.pprint( [(k, conf.env[k]) for k in conf.env.keys()] )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # import pprint
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # pprint.pprint( [(k, conf.env[k]) for k in conf.env.keys()] )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # sys.exit(0)
</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;'>+From 800e0dee756cbcd603db96d9aae431616e65844d 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: Tue, 1 Dec 2020 17:46:46 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/2] Add changelog note
</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;'>+ CHANGES.rst | 18 ++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 18 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CHANGES.rst b/CHANGES.rst
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c062f6112..0582ae31e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CHANGES.rst
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CHANGES.rst
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,6 +8,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxPython Changelog
</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;'>++4.1.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++* (unreleased)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PyPI: https://pypi.python.org/pypi/wxPython/4.1.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Extras: https://extras.wxPython.org/wxPython4/extras/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Pip: ``pip install wxPython==4.1.2``
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++New and improved in this release:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++* Tweaked the build scripts a bit to ensure that on non-Windows platforms that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ the complier and flags used by default match those used by wxWidgets, (with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ the flags needed by Python added on.) The compiler commands can be overridden
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ by setting CC and CXX in the environment if needed. (#1247)
</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;'>+ 4.1.1 "An attitude of gratitude"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * 21-Nov-2020
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a854d3ce5f9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-wxpython-4.0/files/fix_webview_macos1015.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,204 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 0044bf4a7af60a46a8b2ab2a8514ce298ff0fadf Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Stefan Csomor <csomor@advancedconcepts.ch>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 7 Aug 2019 12:05:13 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/2] macos 10.15 build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-adapt to removed headers, add version defines
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ext/wxWidgets/include/wx/platform.h | 3 +++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ext/wxWidgets/src/html/htmlctrl/webkit/webkit.mm | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ext/wxWidgets/src/osx/webview_webkit.mm | 6 ++++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 9 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index 91749a1c8bd7a5f21cec274af54703c0b0b5aabf..d100c2b7ab9d8aa2feb510b6809d701ddf6a3dd0 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/wxWidgets/include/wx/platform.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/wxWidgets/include/wx/platform.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,6 +32,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ifndef MAC_OS_X_VERSION_10_8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define MAC_OS_X_VERSION_10_8 1080
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ifndef MAC_OS_X_VERSION_10_15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define MAC_OS_X_VERSION_10_15 101500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include "wx/osx/config_xcode.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ifndef __WXOSX__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define __WXOSX__ 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index e9a8742a4545a4b4763526b9ca5d5da216d82146..41334ea13d58d7e01a2eba4ce11685fe423a281e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/wxWidgets/src/html/htmlctrl/webkit/webkit.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/wxWidgets/src/html/htmlctrl/webkit/webkit.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,8 +21,10 @@
</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;'>-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:#ffe0e0;'>-index f818b090f52b0529251ce56d79fb7abdbde86f48..381d0f333002a875dcf0902c8b6334824d3bfa91 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/wxWidgets/src/osx/webview_webkit.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/wxWidgets/src/osx/webview_webkit.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,8 +29,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "wx/filesys.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;'>--#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;'>-+#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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Foundation/NSURLError.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From b8fbecc261d267c1b9c56675e176810914c4e54e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Vadim Zeitlin <vadim@wxwidgets.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 8 Oct 2019 15:06:01 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/2] Remove configure tests for WebView headers under Mac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-They shouldn't be necessary, as these headers should be always available
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-on all supported macOS versions, and they fail when using 10.15 SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-which doesn't include Carbon headers at all any more.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-[Homebrew edit] 4e5095e5a5090dd025efd9f8818e69e50ea68f67 is squashed into
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-this diff.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ext/wxWidgets/configure | 48 +++---------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ext/wxWidgets/configure.in | 39 +++++----------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 8 insertions(+), 79 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/ext/wxWidgets/configure b/ext/wxWidgets/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3dea582d757f1d2f2726a921d434259fde651fee..0426df54c9a8103d7f90cea2784bec3de3aace79 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/wxWidgets/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/wxWidgets/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36394,34 +36394,11 @@ if test "$wxUSE_HTML" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#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_fn_c_check_header_compile "$LINENO" "WebKit/HIWebView.h" "ac_cv_header_WebKit_HIWebView_h" "
</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;'>--"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "x$ac_cv_header_WebKit_HIWebView_h" = xyes; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $as_echo "#define wxUSE_WEBKIT 1" >>confdefs.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</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;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: WebKit headers not found; disabling wxWebKit" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo "$as_me: WARNING: WebKit headers not found; disabling wxWebKit" >&2;}
</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;'>--fi
</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;'>-- CPPFLAGS="$old_CPPFLAGS"
</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;'>- $as_echo "#define wxUSE_WEBKIT 1" >>confdefs.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ WEBKIT_LINK="-framework WebKit"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxUSE_WEBKIT=no
</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;'>-@@ -36753,27 +36728,8 @@ $as_echo "yes" >&6; }
</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;'>- elif 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_fn_c_check_header_compile "$LINENO" "WebKit/HIWebView.h" "ac_cv_header_WebKit_HIWebView_h" "
</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;'>--"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "x$ac_cv_header_WebKit_HIWebView_h" = xyes; then :
</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;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: WebKit headers not found" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo "$as_me: WARNING: WebKit headers not found" >&2;}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</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;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;background:#ffe0e0;'>-diff --git a/ext/wxWidgets/configure.in b/ext/wxWidgets/configure.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index bd15f7e34427b82de6a4d62da4aa09e58251d3cb..4a05cc5efec972d9cea978002f279ccccb416740 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/wxWidgets/configure.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/wxWidgets/configure.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7150,26 +7150,11 @@ if test "$wxUSE_HTML" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#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;'>-+ dnl This is only supported under Mac.
</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;'>-- 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;'>-+ WEBKIT_LINK="-framework WebKit"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wxUSE_WEBKIT=no
</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;'>-@@ -7296,23 +7279,9 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</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;'>-+ dnl Under Mac we always have the libraries
</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></pre><pre style='margin:0'>
</pre>