<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/5c620359d62cc50b3ba2b1892d6bb817bab51ccb">https://github.com/macports/macports-ports/commit/5c620359d62cc50b3ba2b1892d6bb817bab51ccb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5c620359d62cc50b3ba2b1892d6bb817bab51ccb
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Oct 30 01:52:39 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5*: fail in pre-fetch instead of dependency build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> If a Qt5 subport is going to fail because the OS is too new, it is
</span><span style='display:block; white-space:pre;color:#404040;'> better to fail in pre-fetch than to wait until qt5*-qtbase fails
</span><span style='display:block; white-space:pre;color:#404040;'> as a dependency.
</span>---
aqua/qt5/Portfile | 18 +++++++++---------
aqua/qt55/Portfile | 18 +++++++++---------
aqua/qt56/Portfile | 18 +++++++++---------
aqua/qt57/Portfile | 18 +++++++++---------
aqua/qt58/Portfile | 18 +++++++++---------
5 files changed, 45 insertions(+), 45 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 e223427..6262739 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;'>@@ -653,6 +653,15 @@ build.env-append \
</span> PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Qt 5.9 requires LSCopyDefaultApplicationURLForURL, which was introduced in macOS 10.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://developer.apple.com/library/content/documentation/General/Reference/APIDiffsMacOSX10_10SeedDiff/frameworks/CoreServices.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < 14 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${subport} requires OS X 10.10 or later"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible OS version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach {module module_info} [array get modules] {
set revision_string [string trim [lindex ${module_info} 8]]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -732,15 +741,6 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Qt 5.9 requires LSCopyDefaultApplicationURLForURL, which was introduced in macOS 10.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://developer.apple.com/library/content/documentation/General/Reference/APIDiffsMacOSX10_10SeedDiff/frameworks/CoreServices.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 14 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport} requires OS X 10.10 or later"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible OS version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # https://codereview.qt-project.org/#/c/141654/
patchfiles-append patch-add_sdk.diff
<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 ac3aabf..8cdbed2 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;'>@@ -522,6 +522,15 @@ build.env-append \
</span> PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Qt uses CFRunLoopTimerCreateWithHandler, which was not introduced until Mac OS X 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://developer.apple.com/reference/corefoundation/1542555-cfrunlooptimercreatewithhandler?language=objc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${subport} requires OS X 10.7 or later"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible OS version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach {module module_info} [array get modules] {
set revision_string [string trim [lindex ${module_info} 8]]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -601,15 +610,6 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Qt uses CFRunLoopTimerCreateWithHandler, which was not introduced until Mac OS X 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://developer.apple.com/reference/corefoundation/1542555-cfrunlooptimercreatewithhandler?language=objc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport} requires OS X 10.7 or later"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible OS version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Qt uses TLS protocols introduced in OS X 10.8
# see https://developer.apple.com/reference/security/sslprotocol/ktlsprotocol11
# see https://developer.apple.com/reference/security/sslprotocol?language=objc
<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 7a8cccc..5f89820 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;'>@@ -552,6 +552,15 @@ build.env-append \
</span> PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Qt uses CFRunLoopTimerCreateWithHandler, which was not introduced until Mac OS X 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://developer.apple.com/reference/corefoundation/1542555-cfrunlooptimercreatewithhandler?language=objc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${subport} requires OS X 10.7 or later"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible OS version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach {module module_info} [array get modules] {
set revision_string [string trim [lindex ${module_info} 8]]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -636,15 +645,6 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Qt uses CFRunLoopTimerCreateWithHandler, which was not introduced until Mac OS X 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://developer.apple.com/reference/corefoundation/1542555-cfrunlooptimercreatewithhandler?language=objc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport} requires OS X 10.7 or later"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible OS version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Qt uses TLS protocols introduced in OS X 10.8
# see https://developer.apple.com/reference/security/sslprotocol/ktlsprotocol11
# see https://developer.apple.com/reference/security/sslprotocol?language=objc
<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 785e1b8..09b145b 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;'>@@ -624,6 +624,15 @@ build.env-append \
</span> PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# the Qt 5.7 class QUuid requires NSUUID, which was introduced in OS X 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://developer.apple.com/reference/foundation/nsuuid?language=objc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < 12 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${subport} requires OS X 10.8 or later"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible OS version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach {module module_info} [array get modules] {
set revision_string [string trim [lindex ${module_info} 8]]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -703,15 +712,6 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # the Qt 5.7 class QUuid requires NSUUID, which was introduced in OS X 10.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://developer.apple.com/reference/foundation/nsuuid?language=objc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 12 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport} requires OS X 10.8 or later"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible OS version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # https://codereview.qt-project.org/#/c/141654/
patchfiles-append patch-add_sdk.diff
<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 242de8e..079a0b3 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;'>@@ -645,6 +645,15 @@ build.env-append \
</span> PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# the Qt 5.8 requires NSWindowDidChangeOcclusionStateNotification, which was introduced in 10.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://developer.apple.com/library/content/releasenotes/General/APIDiffsMacOSX10_9/AppKit.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < 13 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${subport} requires OS X 10.9 or later"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible OS version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach {module module_info} [array get modules] {
set revision_string [string trim [lindex ${module_info} 8]]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -724,15 +733,6 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # the Qt 5.8 requires NSWindowDidChangeOcclusionStateNotification, which was introduced in 10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://developer.apple.com/library/content/releasenotes/General/APIDiffsMacOSX10_9/AppKit.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 13 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport} requires OS X 10.9 or later"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible OS version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # https://codereview.qt-project.org/#/c/141654/
patchfiles-append patch-add_sdk.diff
</pre><pre style='margin:0'>
</pre>