<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/95f39e4de4cf2a29af5822dd3d3aa8eaa8342de5">https://github.com/macports/macports-ports/commit/95f39e4de4cf2a29af5822dd3d3aa8eaa8342de5</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 95f39e4de4c py-pyside2: update to 5.15.8
</span>95f39e4de4c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 95f39e4de4cf2a29af5822dd3d3aa8eaa8342de5
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Sat Mar 18 20:37:17 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-pyside2: update to 5.15.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Prefer patch with upstream approach
</span><span style='display:block; white-space:pre;color:#404040;'> (which will likely be present in 5.15.11)
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/65412
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use latest LLVM in MacPorts
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Additional cleanup following 8925eed5988a
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span>---
python/py-pyside2/Portfile | 29 ++++++------------
.../files/patch-shiboken2-numpy-1.23.0.diff | 34 ++++++++++++++++++++++
2 files changed, 43 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyside2/Portfile b/python/py-pyside2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ab2c522d8fa..ac065a429d2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyside2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyside2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-pyside2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.15.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.15.8
</span> revision 0
categories-append devel aqua
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,14 +18,14 @@ master_sites https://download.qt.io/official_releases/QtForPython/pys
</span> distname pyside-setup-opensource-src-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e47a57c7d372862a286c7f1fa362896bff2e3b41 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7ff5f1cc4291fffb6d5a3098b3090abe4d415da2adec740b4e901893d95d7137 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3572248
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 49384ee04a5755d42dfaa89b7b11bbdbf58d012e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 23436302c8deb5b4cbc769b205d09604e38ba83b40708efccb7bd8c9af6f6b5d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3582256
</span>
python.versions 37 38 39 310
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set llvm_version 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set llvm_version 15
</span>
if {${name} ne ${subport}} {
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,11 +43,8 @@ if {${name} ne ${subport}} {
</span> # Needed for generating shiboken2 documentation
qt5.depends_build_component sqlite-plugin
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # undeclared identifier NPY_ARRAY_UPDATEIFCOPY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|NPY_ARRAY_UPDATEIFCOPY|NPY_ARRAY_WRITEBACKIFCOPY|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # undeclared identifier NPY_ARRAY_UPDATEIFCOPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-shiboken2-numpy-1.23.0.diff
</span>
depends_build-append \
path:bin/cmake:cmake \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,6 +94,8 @@ if {${name} ne ${subport}} {
</span> qtlocation \
qtmacextras \
qtmultimedia \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtquickcontrols2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qtremoteobjects \
</span> qtscript \
qtscxml \
qtsensors \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,16 +107,6 @@ if {${name} ne ${subport}} {
</span> qtwebengine \
qtwebsockets
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${qt5.version} 5.6] >=0 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.depends_component \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qtquickcontrols2
</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 {[vercmp ${qt5.version} 5.9] >=0 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.depends_component \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qtremoteobjects
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type none
} else {
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyside2/files/patch-shiboken2-numpy-1.23.0.diff b/python/py-pyside2/files/patch-shiboken2-numpy-1.23.0.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e6d79f3c195
</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-pyside2/files/patch-shiboken2-numpy-1.23.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1422cf4a7f277fb13fd209f24a90d6c02641497d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Friedemann Kleint <Friedemann.Kleint@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 23 Jun 2022 10:44:01 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: libshiboken: Fix build with numpy 1.23.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Pick-to: 6.3 6.2 5.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: I885c332d6c948820140946c73ae1926e88834143
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Christian Tismer <tismer@stackless.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp | 5 +++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(limited to 'sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp b/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3048ffba6..c8541adf5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -115,8 +115,13 @@ std::ostream &operator<<(std::ostream &str, PyArrayObject *o)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ str << " NPY_ARRAY_NOTSWAPPED";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((flags & NPY_ARRAY_WRITEABLE) != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ str << " NPY_ARRAY_WRITEABLE";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if NPY_VERSION >= 0x00000010 // NPY_1_23_API_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((flags & NPY_ARRAY_WRITEBACKIFCOPY) != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ str << " NPY_ARRAY_WRITEBACKIFCOPY";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((flags & NPY_ARRAY_UPDATEIFCOPY) != 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ str << " NPY_ARRAY_UPDATEIFCOPY";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ str << '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;'>+cgit v1.2.1
</span></pre><pre style='margin:0'>
</pre>