<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6cad28c5f05d86b9c1afdd7c4a398a2590f1c548">https://github.com/macports/macports-ports/commit/6cad28c5f05d86b9c1afdd7c4a398a2590f1c548</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6cad28c5f05d86b9c1afdd7c4a398a2590f1c548
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Mon Aug 14 05:31:23 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-pyside2: update to 5.15.10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Drop patch in favor of upstream approach
</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>---
.../qtbase-5.15.9-work-around-pyside2-brokenness.patch | 2 +-
python/py-pyside2/Portfile | 14 +++++---------
python/py-pyside2/files/patch-py-mangle.diff | 18 ------------------
3 files changed, 6 insertions(+), 28 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/qtbase-5.15.9-work-around-pyside2-brokenness.patch b/aqua/qt5/files/qtbase-5.15.9-work-around-pyside2-brokenness.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 96c6c8c0547..924ebf7d6f3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/qtbase-5.15.9-work-around-pyside2-brokenness.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/qtbase-5.15.9-work-around-pyside2-brokenness.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,4 +133,4 @@ diff -up qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneeve
</span> + explicit QGraphicsSceneDragDropEvent(QEvent::Type type = QEvent::None);
~QGraphicsSceneDragDropEvent();
<span style='display:block; white-space:pre;background:#ffe0e0;'>- QPointF pos() const;
</span>\ No newline at end of file
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ QPointF pos() const;
</span><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 ac065a429d2..1b12fbe3433 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.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.15.10
</span> revision 0
categories-append devel aqua
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,22 +18,18 @@ 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 49384ee04a5755d42dfaa89b7b11bbdbf58d012e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 23436302c8deb5b4cbc769b205d09604e38ba83b40708efccb7bd8c9af6f6b5d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3582256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 492396a82a4140e86a81e4235cafa6a781766714 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2af691d3613a41f83a60439b46568fc2c696dbfae42f7cd7b07152d115ead33a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3583764
</span>
python.versions 37 38 39 310
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set llvm_version 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set llvm_version 16
</span>
if {${name} ne ${subport}} {
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix error related to _Py_Mangle, which was half-patched in this version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see: https://bugzilla.redhat.com/show_bug.cgi?id=1990768#c9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-py-mangle.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # fix error with shiboken2 doc building
patchfiles-append patch-shiboken2-docs.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyside2/files/patch-py-mangle.diff b/python/py-pyside2/files/patch-py-mangle.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e05d533ac83..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyside2/files/patch-py-mangle.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- sources/shiboken2/libshiboken/pep384impl.cpp 2022-03-16 09:18:06.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ sources/shiboken2/libshiboken/pep384impl.cpp.patched 2022-03-16 09:17:41.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -751,9 +751,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif // IS_PY2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Shiboken::AutoDecRef privateobj(PyObject_GetAttr(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinterpret_cast<PyObject *>(Py_TYPE(self)), Shiboken::PyMagicName::name()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef Py_LIMITED_API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return _Py_Mangle(privateobj, name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // PYSIDE-1436: _Py_Mangle is no longer exposed; implement it always.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // The rest of this function is our own implementation of _Py_Mangle.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Please compare the original function in compile.c .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -789,7 +786,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (amount > big_stack)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free(resbuf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return result;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif // else Py_LIMITED_API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span></pre><pre style='margin:0'>
</pre>