<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7cae7cfa3337c65154e662ea242bc5496c46b352">https://github.com/macports/macports-ports/commit/7cae7cfa3337c65154e662ea242bc5496c46b352</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 7cae7cfa333 qt4-mac: Tweak OS version handling logic for macOS 11
</span>7cae7cfa333 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7cae7cfa3337c65154e662ea242bc5496c46b352
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Fri Nov 20 14:20:05 2020 +0000
<span style='display:block; white-space:pre;color:#404040;'> qt4-mac: Tweak OS version handling logic for macOS 11
</span>---
aqua/qt4-mac/Portfile | 40 ++++++++++++++++++++++++++--------------
1 file changed, 26 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt4-mac/Portfile b/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6c8a99bd10e..b950e2b739d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt4-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,17 +50,28 @@ depends_lib-append port:zlib \
</span> # value will be X. The type is this variable is integer, so we can
# use "==" and so forth for comparison.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-global MINOR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+global MINOR, MAJOR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set MAJOR ""
</span> set MINOR ""
# hopefully the MACOSX_DEPLOYMENT_TARGET exists and is set by now. if
# not, last resort (which is not desirable) is to use the os.version.
if {${macosx_deployment_target} ne ""} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set MAJOR [lindex [split ${macosx_deployment_target} "."] 0]
</span> set MINOR [lindex [split ${macosx_deployment_target} "."] 1]
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set MINOR [expr [lindex [split ${os.version} "."] 0] - 4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Do we really need this branch still ??
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} < 20 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set MAJOR 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set MINOR [expr [lindex [split ${os.version} "."] 0] - 4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Bit of a guess, and will not work once we have macOS 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set MAJOR 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set MINOR [expr [lindex [split ${os.version} "."] 0] - 20]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ui_debug "Deduced OS MAJOR.MINOR = ${MAJOR}.${MINOR}"
</span>
###############################################
# Patches are used to both fix compiling on various OS versions, and
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -223,7 +234,7 @@ patchfiles-append \
</span> # (20) Under 10.8 and 10.9: Patch to fix corelib linking
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${MINOR} >= 8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${MAJOR} > 10 || ${MINOR} >= 8} {
</span> patchfiles-append patch-src_corelib_corelib.pro.diff
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -270,7 +281,7 @@ patchfiles-append \
</span> # https://trac.macports.org/ticket/52332
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${MINOR} >= 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${MAJOR} > 10 || ${MINOR} >= 12} {
</span> patchfiles-append patch-src_gui_kernel_qmime_mac.cpp.diff
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -376,15 +387,16 @@ post-extract {
</span> ${worksrcpath}/src/3rdparty/javascriptcore/VERSION.txt
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# error out if trying to build on a new OSX version (> 10.15).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# error out if trying to build on a new OSX version (> 11.0).
</span>
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${MINOR} > 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ( ${MAJOR} == 10 && ${MINOR} > 15 ) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ( ${MAJOR} == 11 && ${MINOR} > 0 ) } {
</span> # This project needs to be updated to build with clang++ against libc++
depends_lib
depends_run
pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "$name does not currently build on Mac OS X later than 10.15 'Catalina'."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "$name does not currently build on Mac OS X later than 11.0 'Big Sur'."
</span> error "unsupported platform"
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -405,11 +417,11 @@ set SDK ${configure.sdkroot}
</span> if {${SDK} eq ""} {
# set SDK version depending on OS version
set sdk_version ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${MINOR} == 4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${MAJOR} == 10 && ${MINOR} == 4 } {
</span> # OSX 10.4 requires an additional 'u'
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdk_version "10.4u"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdk_version "${MAJOR}.4u"
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set sdk_version "10.${MINOR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdk_version "${MAJOR}.${MINOR}"
</span> }
if {[vercmp ${xcodeversion} 4.3] < 0} {
set SDK ${developer_dir}/SDKs/MacOSX${sdk_version}.sdk
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -437,7 +449,7 @@ post-patch {
</span> # were all patched in (2) above, and can be easily changed or
# overridden by the user in a project-local qmake .pro script.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set TARGET "10.${MINOR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set TARGET "${MAJOR}.${MINOR}"
</span> foreach fixfile {configure mkspecs/common/g++-macx.conf \
mkspecs/common/mac.conf qmake/qmake.pri \
src/tools/bootstrap/bootstrap.pro } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -663,11 +675,11 @@ pre-configure {
</span>
# for 10.4 or 10.5 32-bit PPC, build as Carbon only, not Cocoa
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${MINOR} == 4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${MAJOR} == 10 && ${MINOR} == 4} {
</span>
configure.args-append -carbon
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${MINOR} == 5 &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${MAJOR} == 10 && ${MINOR} == 5 &&
</span> [llength ${qt_arch_types}] == 1 &&
[lsearch -exact ${qt_arch_types} ppc] == 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -688,7 +700,7 @@ pre-configure {
</span> # not building for native arch: disable optimizing qmake
configure.args-delete -optimized-qmake
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${MINOR} == 6 &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${MAJOR} == 10 && ${MINOR} == 6 &&
</span> [llength ${qt_arch_types}] == 1 &&
[lsearch -exact ${qt_arch_types} x86] == 0} {
</pre><pre style='margin:0'>
</pre>