<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/97fc762b8199b60456d1b12f0fcba1b651558e03">https://github.com/macports/macports-ports/commit/97fc762b8199b60456d1b12f0fcba1b651558e03</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 97fc762 py*-pyqt5: update to 5.7.1; add support for Python 3.6; addresses ticket https://trac.macports.org/ticket/53197 .
</span>97fc762 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 97fc762b8199b60456d1b12f0fcba1b651558e03
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Jan 4 10:41:46 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> py*-pyqt5: update to 5.7.1; add support for Python 3.6; addresses ticket https://trac.macports.org/ticket/53197 .
</span>---
python/py-pyqt5/Portfile | 15 ++++++++-------
python/py-pyqt5/files/patch-dbus_includes.diff | 18 +++++++++---------
2 files changed, 17 insertions(+), 16 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 f18fd41..c2734c7 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;'>@@ -4,8 +4,7 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-pyqt5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.7.1
</span> categories-append devel
platforms darwin
maintainers mmoll openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,10 +15,10 @@ homepage http://www.riverbankcomputing.co.uk/software/pyqt/intro
</span> license GPL-3
master_sites sourceforge:pyqt
distname PyQt5_gpl-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 498905b678fc2641c8ff6521b5c2126ac6ddf347 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2e481a6c4c41b96ed3b33449e5f9599987c63a5c8db93313bd57a6acbf20f0e1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d103fd1e27b8591893b55f56eb0d306767569e2b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 be849f212a074049b9ebc10b6c07dddefb86e6d30e8df8a5c715cbb2cf7fad14
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 34 35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 34 35 36
</span>
if {${name} ne ${subport}} {
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +41,10 @@ if {${name} ne ${subport}} {
</span> global qt5_dependency
depends_lib-append ${qt5_dependency}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${qt5main}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # pull in the port:qt5 meta-port, plus 2 components qt5-kde provides by default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${qt5main} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${qt5main}-qtscript \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${qt5main}-qt3d
</span> }
} else {
set portname "${qt5main}-${comp}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +57,6 @@ if {${name} ne ${subport}} {
</span> # pull in the Qt5 meta-port
qt5.depends_component \
qt5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:py${python.version}-sip \
port:dbus-python${python.version}
<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 aea645d..f47eea2 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,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.py.orig 2016-04-24 03:55:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.py 2016-12-18 09:15:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2140,7 +2140,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dlist = target_config.dbus_inc_dirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2147,7 +2147,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Instead we look where DBus itself is installed - which in most cases will
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # be where dbus-python is also installed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if target_config.pydbus_inc_dir != '':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_config.dbus_inc_dirs = [target_config.pydbus_inc_dir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_config.dbus_inc_dirs.append(target_config.pydbus_inc_dir)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- target_config.dbus_inc_dirs = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #target_config.dbus_inc_dirs = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for d in dlist:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for d in target_config.dbus_inc_dirs:
</span> if os.access(os.path.join(d, 'dbus', 'dbus-python.h'), os.F_OK):
</pre><pre style='margin:0'>
</pre>