<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/7fa9969863632abbcc242635ac9cec0bb48a864b">https://github.com/macports/macports-ports/commit/7fa9969863632abbcc242635ac9cec0bb48a864b</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 7fa99698636 py-pyqt5-[webengine|chart]: update to 5.15.0
</span>7fa99698636 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7fa9969863632abbcc242635ac9cec0bb48a864b
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Thu Jun 11 19:29:31 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-pyqt5-[webengine|chart]: update to 5.15.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - refresh patches
</span><span style='display:block; white-space:pre;color:#404040;'> - add patch to allow building of QtWebEngine with Qt 5.14
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60627
</span>---
python/py-pyqt5/Portfile | 27 ++++++++++---------
python/py-pyqt5/files/patch-dbus_includes.diff | 6 ++---
.../files/patch-no-abort-on-python-errors.diff | 16 ++++++------
.../files/patch-qtwebengine-with-qt-5.14.diff | 30 ++++++++++++++++++++++
python/py-pyqt5/files/patch-use-default-sip.diff | 14 +++++-----
5 files changed, 63 insertions(+), 30 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 fd1c9d26c47..31d76e674ce 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
python.rootname PyQt5
# we the next bump check --allow-sip-warnings if needed
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.14.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.15.0
</span> revision 0
categories-append devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,9 +16,9 @@ long_description ${description}. The bindings \
</span> are implemented as a set of Python modules and contain over 620 classes.
homepage https://www.riverbankcomputing.com/software/pyqt/intro
license GPL-3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9f4672ff0a2165a7557216ac3a14fadbb9db9375 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bd230c6fd699eabf1ceb51e13a8b79b74c00a80272c622427b80141a22269eb0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3246557
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 065cebf73a5ee6fd3dfcaeec022cdea4264e6dd7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c6f75488ffd5365a65893bc64ea82a6957db126fbfe33654bcd43ae1c30c52f9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3262004
</span>
python.versions 27 35 36 37 38
subport "${name}-common" {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,25 +68,28 @@ if {${subport} eq "${name}-common"} {
</span>
if {[string first "webengine" ${subport}] != -1} {
python.rootname PyQtWebEngine
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.14.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 5.15.0
</span> revision 0
description PyQt5 Webengine bindings
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 00981c8d95d1fb76208c0c089eda7ffb5746c586 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e11595051f8bfbfa49175d899b2c8c2eea3a3deac4141edf4db68c3555221c92 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 47794
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 4ae8b330e6e1f78f5df78de6830eef5d2d9ded85 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 670812688e40bf75f70ddf01eadd897d231300318d3856b275bf8e7e0085bf75 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 48308
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this upstream patch can be removed with the next update
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebengine-with-qt-5.14.diff
</span>
qt5.depends_component \
qtwebengine
} elseif {[string first "chart" ${subport}] != -1} {
python.rootname PyQtChart
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.14.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 5.15.0
</span> revision 0
description PyQt5 Charts bindings
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 d415605d1680bc7b276754f3d281a3c2b958b94a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f9004861441becab7a4a48e834da14c3976e4c03e5513c93e005d5df36085046 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 68193
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 76d3fd824ef730218f655032b44753f7cf2ca3a0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 796b1a966759c78859d019bbac6b88b8e1c72ffebf65acf2be3cd9f45c756661 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 68423
</span>
qt5.depends_component \
qtcharts
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyqt5/files/patch-dbus_includes.diff b/python/py-pyqt5/files/patch-dbus_includes.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f47eea25b4c..9e76fd0889d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyqt5/files/patch-dbus_includes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyqt5/files/patch-dbus_includes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2147,7 +2147,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.py.orig 2020-05-31 08:10:54.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.py 2020-06-11 19:35:08.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2330,7 +2330,7 @@
</span> # Instead we look where DBus itself is installed - which in most cases will
# be where dbus-python is also installed.
if target_config.pydbus_inc_dir != '':
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyqt5/files/patch-no-abort-on-python-errors.diff b/python/py-pyqt5/files/patch-no-abort-on-python-errors.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f481d8ef199..e20f6322b7b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyqt5/files/patch-no-abort-on-python-errors.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyqt5/files/patch-no-abort-on-python-errors.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- qpy/QtCore/orig.qpycore_public_api.cpp 2016-04-24 12:55:17.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ qpy/QtCore/qpycore_public_api.cpp 2016-06-15 21:44:57.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,7 +29,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "qpycore_types.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qpy/QtCore/qpycore_public_api.cpp.orig 2020-05-31 08:10:54.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qpy/QtCore/qpycore_public_api.cpp 2020-06-11 19:43:03.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,7 +79,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
-// A replacement for PyErr_Print() that passes the exception to qFatal().
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> void pyqt5_err_print()
{
#if PY_MAJOR_VERSION >= 3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -113,7 +113,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,7 +175,7 @@
</span> PyErr_Restore(exception, value, traceback);
PyErr_Print();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span> QByteArray message("Unhandled Python exception");
// Extract the detailed text if it was redirected.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -128,7 +128,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -191,7 +191,7 @@
</span>
if (text)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@
</span> PyObject *stripped = PyObject_CallMethod(text,
CONST_CAST("strip"), NULL);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -186,9 +186,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -249,9 +249,9 @@
</span> Py_DECREF(new_stderr);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,4 +38,4 @@
</span> + qCritical("%s", message.data());
Py_END_ALLOW_THREADS
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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-pyqt5/files/patch-qtwebengine-with-qt-5.14.diff b/python/py-pyqt5/files/patch-qtwebengine-with-qt-5.14.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2a3b50a8247
</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/patch-qtwebengine-with-qt-5.14.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+see: https://www.riverbankcomputing.com/pipermail/pyqt/2020-June/042985.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- sip/QtWebEngineWidgets/qwebenginecertificateerror.sip.orig 2020-06-12 21:11:16.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ sip/QtWebEngineWidgets/qwebenginecertificateerror.sip 2020-06-12 21:12:02.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %If (QtWebEngine_5_8_0 -)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CertificateTransparencyRequired,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %End
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-%If (QtWebEngine_5_14_0 -)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++%If (QtWebEngine_5_15_0 -)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CertificateKnownInterceptionBlocked,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %End
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- sip/QtWebEngineWidgets/qwebenginepage.sip.orig 2020-06-12 21:12:11.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ sip/QtWebEngineWidgets/qwebenginepage.sip 2020-06-12 21:12:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -663,10 +663,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %End
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-%If (QtWebEngine_5_14_0 -)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++%If (QtWebEngine_5_15_0 -)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qint64 renderProcessPid() const;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %End
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-%If (QtWebEngine_5_14_0 -)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++signals:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++%If (QtWebEngine_5_15_0 -)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void renderProcessPidChanged(qint64 pid);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ %End
</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-pyqt5/files/patch-use-default-sip.diff b/python/py-pyqt5/files/patch-use-default-sip.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 14db625c7fb..9cf0e01b59d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyqt5/files/patch-use-default-sip.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyqt5/files/patch-use-default-sip.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- orig.configure.py 2018-12-15 17:42:37.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.py 2018-12-15 17:50:21.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2440,7 +2440,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.py.orig 2020-06-11 19:40:15.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.py 2020-06-11 19:41:02.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2506,7 +2506,7 @@
</span> the target configuration.
"""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,8 +9,8 @@
</span>
# If we don't check for signed interpreters, we exclude the 'VendorID'
# feature
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- designer/orig.pluginloader.cpp 2018-10-01 15:38:22.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ designer/pluginloader.cpp 2018-12-15 17:50:50.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- designer/pluginloader.cpp.orig 2020-06-11 19:40:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ designer/pluginloader.cpp 2020-06-11 19:41:02.000000000 -0400
</span> @@ -167,7 +167,7 @@
// Make sure we have sip.unwrapinstance.
if (!sip_unwrapinstance)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,8 +20,8 @@
</span>
if (!sip_unwrapinstance)
return true;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- qmlscene/orig.pluginloader.cpp 2018-10-01 15:38:22.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ qmlscene/pluginloader.cpp 2018-12-15 17:51:32.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- qmlscene/pluginloader.cpp.orig 2020-06-11 19:40:51.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ qmlscene/pluginloader.cpp 2020-06-11 19:41:02.000000000 -0400
</span> @@ -412,9 +412,9 @@
void PyQt5QmlPlugin::getSipAPI()
{
</pre><pre style='margin:0'>
</pre>