<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/adf50839857db7865896f10a46e9f24d5b95f699">https://github.com/macports/macports-ports/commit/adf50839857db7865896f10a46e9f24d5b95f699</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit adf50839857db7865896f10a46e9f24d5b95f699
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Oct 30 02:12:49 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*: do not record SDK version in config file
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Upgrading Xcode sometimes removes SDKs.
</span><span style='display:block; white-space:pre;color:#404040;'> If the SDK used to build Qt disappears, Qt still looks for
</span><span style='display:block; white-space:pre;color:#404040;'> the old, nonexistent, SDK.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/54044
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/55195
</span>---
aqua/qt5/Portfile | 9 +++++++--
aqua/qt55/Portfile | 9 +++++++--
aqua/qt56/Portfile | 9 +++++++--
aqua/qt57/Portfile | 9 +++++++--
aqua/qt58/Portfile | 9 +++++++--
5 files changed, 35 insertions(+), 10 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 6262739..782ea40 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;'>@@ -145,7 +145,7 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1022,8 +1022,13 @@ foreach {module module_info} [array get modules] {
</span> -framework \
-securetransport
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # do not use ${configure.sdk_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SDK is recorded in ${qt_mkspecs_dir}/qdevice.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SDK may then be removed if Xcode is updated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/54044
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/55195
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -sdk macosx${configure.sdk_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -sdk macosx
</span>
# configure options that don't show up in configure --help
configure.args-append \
<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 8cdbed2..010c80c 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;'>@@ -143,7 +143,7 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 10"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 11"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -915,8 +915,13 @@ foreach {module module_info} [array get modules] {
</span> -framework \
-securetransport
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # do not use ${configure.sdk_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SDK is recorded in ${qt_mkspecs_dir}/qdevice.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SDK may then be removed if Xcode is updated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/54044
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/55195
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -sdk macosx${configure.sdk_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -sdk macosx
</span>
# configure options that don't show up in configure --help
configure.args-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/Portfile b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f89820..655e2ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,7 +149,7 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"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;'>@@ -956,8 +956,13 @@ foreach {module module_info} [array get modules] {
</span> -framework \
-securetransport
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # do not use ${configure.sdk_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SDK is recorded in ${qt_mkspecs_dir}/qdevice.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SDK may then be removed if Xcode is updated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/54044
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/55195
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -sdk macosx${configure.sdk_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -sdk macosx
</span>
# configure options that don't show up in configure --help
configure.args-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/Portfile b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 09b145b..63f36fe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,7 +149,7 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"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;'>@@ -1007,8 +1007,13 @@ foreach {module module_info} [array get modules] {
</span> -framework \
-securetransport
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # do not use ${configure.sdk_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SDK is recorded in ${qt_mkspecs_dir}/qdevice.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SDK may then be removed if Xcode is updated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/54044
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/55195
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -sdk macosx${configure.sdk_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -sdk macosx
</span>
# configure options that don't show up in configure --help
configure.args-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt58/Portfile b/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 079a0b3..2000601 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,7 +149,7 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: ~docs"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 3"
</span> "License: "
}
qtcanvas3d {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1016,8 +1016,13 @@ foreach {module module_info} [array get modules] {
</span> -framework \
-securetransport
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # do not use ${configure.sdk_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SDK is recorded in ${qt_mkspecs_dir}/qdevice.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SDK may then be removed if Xcode is updated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/54044
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/55195
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -sdk macosx${configure.sdk_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -sdk macosx
</span>
# configure options that don't show up in configure --help
configure.args-append \
</pre><pre style='margin:0'>
</pre>