<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/47dbd1e3b1f9ffa238f83cda1d067707691403c4">https://github.com/macports/macports-ports/commit/47dbd1e3b1f9ffa238f83cda1d067707691403c4</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 47dbd1e py-pyqt5: do not opportunistically link against qt5-qtwebkit
</span>47dbd1e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 47dbd1e3b1f9ffa238f83cda1d067707691403c4
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Nov 5 22:13:01 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> py-pyqt5: do not opportunistically link against qt5-qtwebkit
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> py-pyqt5 links against any Qt component it can find.
</span><span style='display:block; white-space:pre;color:#404040;'> Variants prevent linking against components not installed by qt5 port.
</span>---
python/py-pyqt5/Portfile | 25 +++++++++++++++++++++++--
1 file changed, 23 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 8c6f4ca..4b1b0f0 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;'>@@ -7,7 +7,7 @@ PortGroup python 1.0
</span>
name py-pyqt5
version 5.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories-append devel
platforms darwin
maintainers mmoll openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,6 @@ python.versions 27 34 35
</span> if {${name} ne ${subport}} {
depends_lib-append port:py${python.version}-sip \
port:qt5 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qt5-qtwebengine \
</span> port:dbus-python${python.version}
use_configure yes
configure.pre_args
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,6 +34,13 @@ if {${name} ne ${subport}} {
</span> configure.args-append -q ${qt_qmake_cmd} --verbose --confirm-license \
--sip=${prefix}/bin/sip-${python.branch}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # modules that are not installed with qt5 port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable=QtWebKit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable=QtWebKitWidgets \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable=QtWebEngineCore \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable=QtWebEngineWidgets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.cmd make
build.target all
destroot.cmd ${build.cmd}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,6 +61,21 @@ if {${name} ne ${subport}} {
</span> configure.cmd-append --debug
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant webengine description conflicts universal {Build QtWebEngine module} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:qt5-qtwebengine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable=QtWebEngineCore
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable=QtWebEngineWidgets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append webengine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant webkit description {Build QtWebKit module} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:qt5-qtwebkit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable=QtWebKit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable=QtWebKitWidgets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { ![variant_isset universal] } {
configure.args-append "--spec=${qt_qmake_spec}"
} else {
</pre><pre style='margin:0'>
</pre>