<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/a5daf33f79df70272e2109552583d5aba42b94bb">https://github.com/macports/macports-ports/commit/a5daf33f79df70272e2109552583d5aba42b94bb</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 a5daf33 qt5*: conflict with qt5-kde if exists
</span>a5daf33 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a5daf33f79df70272e2109552583d5aba42b94bb
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Jan 5 15:08:10 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*: conflict with qt5-kde if exists
</span>---
aqua/qt5/Portfile | 7 +++++--
aqua/qt55/Portfile | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 820541e..e0c7984 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,8 +36,11 @@ conflicts qt3 qt3-mac
</span> # conflict with all other version of qt5
foreach test_qt_name ${available_qt_versions} {
if { ${name} ne ${test_qt_name} } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # module exists in this Qt version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts-append ${test_qt_name}-qtbase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [string range ${test_qt_name} end-3 end] eq "-kde" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-append ${test_qt_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-append ${test_qt_name}-qtbase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/Portfile b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 49364ed..3fe5235 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,8 +35,11 @@ conflicts qt3 qt3-mac
</span> # conflict with all other version of qt5
foreach test_qt_name ${available_qt_versions} {
if { ${name} ne ${test_qt_name} } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # module exists in this Qt version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts-append ${test_qt_name}-qtbase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [string range ${test_qt_name} end-3 end] eq "-kde" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-append ${test_qt_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-append ${test_qt_name}-qtbase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
</pre><pre style='margin:0'>
</pre>