<pre style='margin:0'>
Mark Moll (mamoll) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5331889c730eb99ec944b4568abe1823bbc51ca9">https://github.com/macports/macports-ports/commit/5331889c730eb99ec944b4568abe1823bbc51ca9</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 5331889 py-pyqt5: Add python2 qstring patch to address seg. faults Closes: https://trac.macports.org/ticket/59358
</span>5331889 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5331889c730eb99ec944b4568abe1823bbc51ca9
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Oct 17 09:56:33 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> py-pyqt5: Add python2 qstring patch to address seg. faults
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/59358
</span>---
python/py-pyqt5/Portfile | 6 +++--
python/py-pyqt5/files/python2_qstring.diff | 36 ++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyqt5/Portfile b/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ba8736..06607c6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyqt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup python 1.0
</span> name py-pyqt5
# we the next bump check --allow-sip-warnings if needed
version 5.12.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories-append devel
platforms darwin
maintainers {mmoll @mamoll} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@ if {${subport} eq "${name}-common"} {
</span> PortGroup qmake5 1.0
version 5.12.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> description PyQt5 Webengine bindings
long_description ${description}
master_sites https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,6 +128,8 @@ if {${subport} eq "${name}-common"} {
</span> # (actually, the insistence appears to be on sip using a private module directory;
# see the online pyqt5 build-from-source instructions).
patchfiles-append patch-use-default-sip.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/59358
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append python2_qstring.diff
</span>
build.cmd make
build.target all
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyqt5/files/python2_qstring.diff b/python/py-pyqt5/files/python2_qstring.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..97851a9
</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-pyqt5/files/python2_qstring.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Dmitry Shachnev <mitya57@debian.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 2 Sep 2019 15:51:37 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Fixes for building against Python v2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Origin: upstream, changesets e5dd514fdba6 and 81b34c9373b6.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qpy/QtCore/qpycore_qstring.cpp | 14 +++++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 13 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git qpy/QtCore/qpycore_qstring.cpp qpy/QtCore/qpycore_qstring.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2d04e3a..4a188ce 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qpy/QtCore/qpycore_qstring.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qpy/QtCore/qpycore_qstring.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -158,9 +158,21 @@ PyObject *qpycore_PyObject_FromQString(const QString &qstr)
</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;'>+-// Convert a Python Unicode object to a QString.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Convert a Python string object to a QString.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString qpycore_PyObject_AsQString(PyObject *obj)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PY_MAJOR_VERSION < 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (PyString_Check(obj))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *obj_s = PyString_AsString(obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!obj_s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return QString();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return QString::fromUtf8(obj_s);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</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;'>+ #if defined(PYQT_PEP_393)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int char_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Py_ssize_t len;
</span></pre><pre style='margin:0'>
</pre>