<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/036a78b2ad3591208919b2bb98262d9b0d9e07ca">https://github.com/macports/macports-ports/commit/036a78b2ad3591208919b2bb98262d9b0d9e07ca</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 036a78b py-pyqt5, py-qt5-webengine: udate to version 5.13.1
</span>036a78b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 036a78b2ad3591208919b2bb98262d9b0d9e07ca
</span>Author: Mark Moll <mmoll@macports.org>
AuthorDate: Sun Nov 10 12:36:49 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> py-pyqt5, py-qt5-webengine: udate to version 5.13.1
</span>---
python/py-pyqt5/Portfile | 22 +++++++++---------
python/py-pyqt5/files/python2_qstring.diff | 36 ------------------------------
2 files changed, 10 insertions(+), 48 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 40ad939..9d36c89 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;'>@@ -5,8 +5,8 @@ PortGroup python 1.0
</span>
name py-pyqt5
# we the next bump check --allow-sip-warnings if needed
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.12.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.13.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories-append devel
platforms darwin
maintainers {mmoll @mamoll} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,9 +17,9 @@ homepage https://www.riverbankcomputing.com/software/pyqt/intro
</span> license GPL-3
master_sites https://www.riverbankcomputing.com/static/Downloads/PyQt5/${version}/
distname PyQt5_gpl-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c6f93825a79000946f37a3724b48d99e35451517 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0db0fa37debab147450f9e052286f7a530404e2aaddc438e97a7dcdf56292110 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3148196
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3b68fe4e6c86e666145e71925e0226f4e2ab672a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 54b7f456341b89eeb3930e786837762ea67f235e886512496c4152ebe106d4af \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3162737
</span>
livecheck.type regex
livecheck.url https://www.riverbankcomputing.com/software/pyqt/download5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,15 +52,15 @@ if {${subport} eq "${name}-common"} {
</span> } elseif {[string first "webengine" ${subport}] != -1} {
PortGroup qmake5 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.12.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 5.13.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> description PyQt5 Webengine bindings
long_description ${description}
master_sites https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${version}
distname PyQtWebEngine_gpl-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 5e0c3cd69448b8dee042ba6565c823e266c22a14 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 860704672ea1b616e1347be1f347bc1c749e64ed378370863fe209e84e9bd473 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 42474
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 88d23dacc583ca028b7444c3233d82901e2ad7da \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8d8c1262005d8465653a848bf67327fb338e0d3c2d26090a6f7eb071dbb42092 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 44883
</span>
livecheck.type regex
livecheck.url https://www.riverbankcomputing.com/software/pyqtwebengine/download
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,8 +128,6 @@ 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:#ffe0e0;'>- # https://trac.macports.org/ticket/59358
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 97851a9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyqt5/files/python2_qstring.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Dmitry Shachnev <mitya57@debian.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 2 Sep 2019 15:51:37 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: Fixes for building against Python v2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Origin: upstream, changesets e5dd514fdba6 and 81b34c9373b6.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qpy/QtCore/qpycore_qstring.cpp | 14 +++++++++++++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 13 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git qpy/QtCore/qpycore_qstring.cpp qpy/QtCore/qpycore_qstring.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2d04e3a..4a188ce 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- qpy/QtCore/qpycore_qstring.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ qpy/QtCore/qpycore_qstring.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -158,9 +158,21 @@ PyObject *qpycore_PyObject_FromQString(const QString &qstr)
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// Convert a Python Unicode object to a QString.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Convert a Python string object to a QString.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QString qpycore_PyObject_AsQString(PyObject *obj)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if PY_MAJOR_VERSION < 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (PyString_Check(obj))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const char *obj_s = PyString_AsString(obj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!obj_s)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return QString();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return QString::fromUtf8(obj_s);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</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;'>- #if defined(PYQT_PEP_393)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int char_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_ssize_t len;
</span></pre><pre style='margin:0'>
</pre>