<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/86506150615ad6c6adcee1bf03de3882ba0ee459">https://github.com/macports/macports-ports/commit/86506150615ad6c6adcee1bf03de3882ba0ee459</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 8650615 qt5*: completely restore default mkspecs values
</span>8650615 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 86506150615ad6c6adcee1bf03de3882ba0ee459
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Feb 18 21:34:19 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*: completely restore default mkspecs values
</span>---
aqua/qt5/Portfile | 4 +++-
aqua/qt55/Portfile | 4 +++-
2 files changed, 6 insertions(+), 2 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 b8db1f3..9c46963 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;'>@@ -138,7 +138,7 @@ array set modules {
</span> {"Qt Gui" "Qt Widgets" "Qt Print Support" "Qt OpenGL" "Qt Core" "Qt XML" "Qt SQL" "Qt Network" "Qt Test" "Qt D-Bus" "Qt Concurrent" "Qt Platform Headers"}
""
"variant overrides: ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 4"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -752,6 +752,7 @@ foreach {module module_info} [array get modules] {
</span> if { [variant_exists universal] && [variant_isset universal] } {
foreach arch ${universal_archs_to_use} {
move -force ${worksrcpath}-${arch}/mkspecs-save/common/clang-mac.conf ${worksrcpath}-${arch}/mkspecs/common/clang-mac.conf
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ move -force ${worksrcpath}-${arch}/mkspecs-save/common/macx.conf ${worksrcpath}-${arch}/mkspecs/common/macx.conf
</span>
foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
move -force ${worksrcpath}-${arch}/mkspecs-save/${spec}/qmake.conf ${worksrcpath}-${arch}/mkspecs/${spec}/qmake.conf
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -759,6 +760,7 @@ foreach {module module_info} [array get modules] {
</span> }
} else {
move -force ${worksrcpath}/mkspecs-save/common/clang-mac.conf ${worksrcpath}/mkspecs/common/clang-mac.conf
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ move -force ${worksrcpath}/mkspecs-save/common/macx.conf ${worksrcpath}/mkspecs/common/macx.conf
</span>
foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
move -force ${worksrcpath}/mkspecs-save/${spec}/qmake.conf ${worksrcpath}/mkspecs/${spec}/qmake.conf
<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 eacd0bc..c4f7cc1 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;'>@@ -137,7 +137,7 @@ array set modules {
</span> {"Qt Gui" "Qt Widgets" "Qt Print Support" "Qt OpenGL" "Qt Core" "Qt XML" "Qt SQL" "Qt Network" "Qt Test" "Qt D-Bus" "Qt Concurrent" "Qt Platform Headers"}
""
"variant overrides: ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 4"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -746,6 +746,7 @@ foreach {module module_info} [array get modules] {
</span> if { [variant_exists universal] && [variant_isset universal] } {
foreach arch ${universal_archs_to_use} {
move -force ${worksrcpath}-${arch}/mkspecs-save/common/clang-mac.conf ${worksrcpath}-${arch}/mkspecs/common/clang-mac.conf
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ move -force ${worksrcpath}-${arch}/mkspecs-save/common/macx.conf ${worksrcpath}-${arch}/mkspecs/common/macx.conf
</span>
foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
move -force ${worksrcpath}-${arch}/mkspecs-save/${spec}/qmake.conf ${worksrcpath}-${arch}/mkspecs/${spec}/qmake.conf
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -753,6 +754,7 @@ foreach {module module_info} [array get modules] {
</span> }
} else {
move -force ${worksrcpath}/mkspecs-save/common/clang-mac.conf ${worksrcpath}/mkspecs/common/clang-mac.conf
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ move -force ${worksrcpath}/mkspecs-save/common/macx.conf ${worksrcpath}/mkspecs/common/macx.conf
</span>
foreach spec {macx-clang macx-clang-32 macx-g++ macx-g++-32 macx-g++40 macx-g++42 macx-icc macx-llvm} {
move -force ${worksrcpath}/mkspecs-save/${spec}/qmake.conf ${worksrcpath}/mkspecs/${spec}/qmake.conf
</pre><pre style='margin:0'>
</pre>