<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/aa2fc824a17ab7d3bd15a1c92d9c814c76d06fa1">https://github.com/macports/macports-ports/commit/aa2fc824a17ab7d3bd15a1c92d9c814c76d06fa1</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 aa2fc824a17 qt4-mac: fix building on macOS 13 (at least on Intel)
</span>aa2fc824a17 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit aa2fc824a17ab7d3bd15a1c92d9c814c76d06fa1
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Oct 31 10:54:31 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> qt4-mac: fix building on macOS 13 (at least on Intel)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/66114
</span>---
aqua/qt4-mac/Portfile | 37 +++++++++++++++++++++++--------------
1 file changed, 23 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 7500aca5d5e..602b3c376eb 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;'>@@ -54,6 +54,13 @@ platform darwin 10 {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# easy solution for deprecated font API; see also
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/66114
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin 22 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macosx_deployment_target 12.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # find a way to specify the OS MINOR version. For OSX 10.X, this
# 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:#e0e0e0;'>@@ -81,6 +88,22 @@ if {${macosx_deployment_target} ne ""} {
</span> }
# ui_debug "Deduced OS MAJOR.MINOR = ${MAJOR}.${MINOR}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# error out if trying to build on a new OSX version (> 13.0). we do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this because this port is so old and thus we want to make sure this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# port works on these newer OSX.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ( ${MAJOR} == 10 && ${MINOR} > 15 ) || ${MAJOR} > 13 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This project needs to be updated to build with clang++ against libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "$name does not currently build on Mac OS X later than 13 'Big Sur'."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "unsupported platform"
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> ###############################################
# Patches are used to both fix compiling on various OS versions, and
# to enhance the functionality of QMake and its build files. Some of
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -413,20 +436,6 @@ 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 (> 11.0).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ( ${MAJOR} == 10 && ${MINOR} > 15 ) || ${MAJOR} > 12 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This project needs to be updated to build with clang++ against libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "$name does not currently build on Mac OS X later than 11 'Big Sur'."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error "unsupported platform"
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> ###############################################
# disable CCACHE for now (ticket #34856)
</pre><pre style='margin:0'>
</pre>