<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bb9e830a96470d80a3410c4809fbb4eafff7827b">https://github.com/macports/macports-ports/commit/bb9e830a96470d80a3410c4809fbb4eafff7827b</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 bb9e830a964 py-wxpython-4.0: update to 4.2.2
</span>bb9e830a964 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit bb9e830a96470d80a3410c4809fbb4eafff7827b
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Tue Dec 3 22:56:06 2024 +0100

<span style='display:block; white-space:pre;color:#404040;'>    py-wxpython-4.0: update to 4.2.2
</span>---
 python/py-wxpython-4.0/Portfile                    | 31 ++++++++++++----------
 .../files/buildtools_config_py.patch               | 18 ++++++++++++-
 python/py-wxpython-4.0/files/cython3.patch         | 16 -----------
 3 files changed, 34 insertions(+), 31 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 82ae2b7f560..b7fd55fadd0 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;'>@@ -6,7 +6,7 @@ PortGroup           python      1.0
</span> name                py-wxpython-4.0
 python.rootname     wxPython
 # check kicad's version before updating
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             4.2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             4.2.2
</span> revision            0
 
 categories-append   graphics devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,21 +23,23 @@ long_description    wxPython is a GUI toolkit for the Python programming \
</span> 
 homepage            https://www.wxpython.org/
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  ff4d6710cfd293d63ffe6baa1255acf6e604a26b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  e48de211a6606bf072ec3fa778771d6b746c00b7f4b970eb58728ddf56d13d5c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    73724359
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  37f6feb94e4aacc7e41a377ce19278a26a39cb4a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  5dbcb0650f67fdc2c5965795a255ffaa3d7b09fb149aa8da2d0d9aa44e38e2ba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    57358880
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard     2011
</span> 
 python.versions     39 310 311 312
 
 if {${name} ne ${subport}} {
     patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    buildtools_config_py.patch \
</span>                     buildtools_build_wxwidgets_py.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    build_py.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    cython3.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    buildtools_config_py.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    build_py.patch
</span> 
     depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${python.version}-setuptools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${python.version}-requests
</span> 
     depends_lib-append \
         port:tiff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,18 +51,19 @@ if {${name} ne ${subport}} {
</span>         port:py${python.version}-sip \
         port:py${python.version}-pathlib2
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    set wxpython_options "--no_magic --release --python ${python.bin} --osx_cocoa --nodoc --prefix=${python.prefix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        system -W ${worksrcpath} "${python.bin} build.py build_wx ${wxpython_options}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        system -W ${worksrcpath} "${python.bin} build.py dox etg sip ${wxpython_options}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        system -W ${worksrcpath} "${python.bin} build.py build_py ${wxpython_options}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span>     build.env-append SIP=${python.prefix}/bin/sip
     build.env-append PATH=${python.prefix}/bin:$env(PATH)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set wxpython_options "--no_magic --release --python ${python.bin} --osx_cocoa --nodoc --prefix=${python.prefix}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    build.cmd ${python.bin} build.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    build.target build ${wxpython_options}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     destroot.cmd ${python.bin} build.py
     destroot.target install
     destroot.destdir --destdir=${destroot} ${wxpython_options}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    compiler.c_standard     2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    compiler.cxx_standard   2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     post-destroot {
         # relink rpaths of wxWidgets' binaries
         foreach wxbin [split [exec find ${destroot}${python.prefix}/bin/ -type f] \n] {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-wxpython-4.0/files/buildtools_config_py.patch b/python/py-wxpython-4.0/files/buildtools_config_py.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index f573b0bbf2f..888b38b3c83 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-wxpython-4.0/files/buildtools_config_py.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-wxpython-4.0/files/buildtools_config_py.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- buildtools/config.py.orig
 +++ buildtools/config.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -826,7 +824,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -840,7 +840,7 @@
</span>                  line = line.strip()
                  endPos = line.rfind(' (')
                  curName = line[:endPos]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,3 +9,19 @@
</span>                  cmd = 'install_name_tool -change %s %s %s' % (curName, newName, filename)
                  os.system(cmd)
  
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1074,13 +1074,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         copy_file(opj(cfg.WXDIR, 'docs', filename), opj('license',filename),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                       update=1, verbose=1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    # Get the sip license too
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    copy_file(opj('sip', 'siplib', 'LICENSE'), opj('license', 'sip-license.txt'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-              update=1, verbose=1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # Combine the relevant files into a single LICENSE.txt file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     text = ''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    for filename in ['preamble.txt', 'licence.txt', 'lgpl.txt', 'sip-license.txt']:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    for filename in ['preamble.txt', 'licence.txt', 'lgpl.txt']:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         with open(opj('license', filename), 'r', encoding='utf-8') as f:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             text += f.read() + '\n\n'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     with open('LICENSE.txt', 'w') as f:
</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/cython3.patch b/python/py-wxpython-4.0/files/cython3.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3e1a2a0377d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-wxpython-4.0/files/cython3.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix compatibility with Cython 3.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Remove unused import which seems to be removed in Cython 3.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/wxWidgets/Phoenix/issues/2439
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/wxWidgets/Phoenix/pull/2441
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/wxWidgets/Phoenix/issues/2514
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/wxWidgets/Phoenix/commit/aeb557d01e7cd37176ebbf0f1ae6d0b53c115378
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- wx/svg/_nanosvg.pyx.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ wx/svg/_nanosvg.pyx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,7 +42,6 @@ for manipulating the SVG shape info in memory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import sys
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--cimport cython.object
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from cpython.buffer cimport (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     Py_buffer, PyObject_CheckBuffer, PyObject_GetBuffer, PyBUF_SIMPLE,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     PyBuffer_Release)
</span></pre><pre style='margin:0'>

</pre>