<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6ceed0275625c55fe14feba8bf6f00a423932e7f">https://github.com/macports/macports-ports/commit/6ceed0275625c55fe14feba8bf6f00a423932e7f</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 6ceed027562 py-pyqt5: update to 5.15.1
</span>6ceed027562 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6ceed0275625c55fe14feba8bf6f00a423932e7f
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Fri Sep 25 00:57:32 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-pyqt5: update to 5.15.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Pin to 5.14.2 for Qt5 < 5.11
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/61006
</span>---
python/py-pyqt5/Portfile | 45 ++++++++++++++--------
python/py-pyqt5/files/patch-dbus_includes.diff | 6 +--
.../files/patch-qtwebengine-with-qt-5.14.diff | 30 ---------------
python/py-pyqt5/files/patch-use-default-sip.diff | 6 +--
4 files changed, 34 insertions(+), 53 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 31d76e674ce..aaf10238e1e 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,9 +5,6 @@ PortGroup python 1.0
</span>
name py-pyqt5
python.rootname PyQt5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# we the next bump check --allow-sip-warnings if needed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.15.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span> categories-append devel
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,9 +13,26 @@ 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 065cebf73a5ee6fd3dfcaeec022cdea4264e6dd7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c6f75488ffd5365a65893bc64ea82a6957db126fbfe33654bcd43ae1c30c52f9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3262004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set just_want_qt5_version_info yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+unset just_want_qt5_version_info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${qt5.version} 5.11] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/61006
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 5.14.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 9f4672ff0a2165a7557216ac3a14fadbb9db9375 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bd230c6fd699eabf1ceb51e13a8b79b74c00a80272c622427b80141a22269eb0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3246557
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we the next bump check --allow-sip-warnings if needed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 5.15.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 0c60076e79906a8db28316430fef7d7d6e5e4495 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d9a76b850246d08da9863189ecb98f6c2aa9b4d97a3e85e29330a264aed0f9a1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3264559
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
python.versions 27 35 36 37 38
subport "${name}-common" {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,28 +82,25 @@ 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.15.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 5.15.1
</span> revision 0
description PyQt5 Webengine bindings
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 4ae8b330e6e1f78f5df78de6830eef5d2d9ded85 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 670812688e40bf75f70ddf01eadd897d231300318d3856b275bf8e7e0085bf75 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 48308
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this upstream patch can be removed with the next update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qtwebengine-with-qt-5.14.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 083a0bf28d92a31508d4dd395f8b13c2f09cea85 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f0ca7915ee206ba5d703168c6ca40b0aad62c67360328fae4af5359cdbcee439 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 48520
</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.15.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 5.15.1
</span> revision 0
description PyQt5 Charts bindings
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 76d3fd824ef730218f655032b44753f7cf2ca3a0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 796b1a966759c78859d019bbac6b88b8e1c72ffebf65acf2be3cd9f45c756661 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 68423
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 6a0e86a2c116d00a253a1afd096ff025770e8c96 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8d976b3dbfb233fb0123129323c68adb9d3693c945bba1e227e004208f0747bc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 68651
</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 9e76fd0889d..480f0c78ad6 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 2020-05-31 08:10:54.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.py 2020-06-11 19:35:08.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2330,7 +2330,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.py.orig 2020-09-12 00:00:00.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.py 2020-09-14 19:28:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2333,7 +2333,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-qtwebengine-with-qt-5.14.diff b/python/py-pyqt5/files/patch-qtwebengine-with-qt-5.14.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2a3b50a8247..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyqt5/files/patch-qtwebengine-with-qt-5.14.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-see: https://www.riverbankcomputing.com/pipermail/pyqt/2020-June/042985.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- sip/QtWebEngineWidgets/qwebenginecertificateerror.sip.orig 2020-06-12 21:11:16.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ sip/QtWebEngineWidgets/qwebenginecertificateerror.sip 2020-06-12 21:12:02.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %If (QtWebEngine_5_8_0 -)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CertificateTransparencyRequired,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %End
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--%If (QtWebEngine_5_14_0 -)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%If (QtWebEngine_5_15_0 -)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CertificateKnownInterceptionBlocked,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %End
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- sip/QtWebEngineWidgets/qwebenginepage.sip.orig 2020-06-12 21:12:11.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ sip/QtWebEngineWidgets/qwebenginepage.sip 2020-06-12 21:12:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -663,10 +663,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %End
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--%If (QtWebEngine_5_14_0 -)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%If (QtWebEngine_5_15_0 -)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qint64 renderProcessPid() const;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %End
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--%If (QtWebEngine_5_14_0 -)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+signals:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%If (QtWebEngine_5_15_0 -)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void renderProcessPidChanged(qint64 pid);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %End
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</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 9cf0e01b59d..d3dce9ebe8e 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;'>---- configure.py.orig 2020-06-11 19:40:15.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.py 2020-06-11 19:41:02.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2506,7 +2506,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.py.orig 2020-09-12 00:00:00.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.py 2020-09-14 19:31:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2509,7 +2509,7 @@
</span> the target configuration.
"""
</pre><pre style='margin:0'>
</pre>