<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6dd43b8c1559762b94bdc15be32735b56097a826">https://github.com/macports/macports-ports/commit/6dd43b8c1559762b94bdc15be32735b56097a826</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6dd43b8c1559762b94bdc15be32735b56097a826
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Thu Jul 21 13:31:37 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt(59|511|513): fix to allow building on macOS 11/12
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/62190
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/63154
</span>---
aqua/qt511/Portfile | 13 +------------
aqua/qt513/Portfile | 17 +++++------------
aqua/qt513/files/patch-qiosurfacegraphicsbuffer.h.diff | 17 +++++++++++++++++
aqua/qt59/Portfile | 13 +------------
4 files changed, 24 insertions(+), 36 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt511/Portfile b/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 96dab6f3936..0263b2dbd3a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ if { ${subport} eq "${name}-qtwebkit" ||
</span> }
# https://trac.macports.org/ticket/63154
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${xcodeversion} ne "none" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${xcodeversion} ne "none" || ${os.major} >= 20 } {
</span> use_xcode yes
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -843,17 +843,6 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} >= 20 && (${module} eq "qtbase" || "qtbase" in [lindex ${module_info} 3])} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fails to find a working compiler and SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build
</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} currently does not build on macOS 11 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> description Tools and Module(s) for Qt Tool Kit ${qt_major}
set modules_provided_list [lindex ${module_info} 4]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/Portfile b/aqua/qt513/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2cb87ea5264..fdb8e2d38b8 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt513/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ if { ${subport} eq "${name}-qtwebkit" ||
</span> }
# https://trac.macports.org/ticket/63154
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${xcodeversion} ne "none" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${xcodeversion} ne "none" || ${os.major} >= 20 } {
</span> use_xcode yes
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -843,17 +843,6 @@ foreach {module module_info} [array get modules] {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} >= 20 && (${module} eq "qtbase" || "qtbase" in [lindex ${module_info} 3])} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fails to find a working compiler and SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build
</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} currently does not build on macOS 11 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> description Tools and Module(s) for Qt Tool Kit ${qt_major}
set modules_provided_list [lindex ${module_info} 4]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -898,6 +887,10 @@ foreach {module module_info} [array get modules] {
</span> # see https://trac.macports.org/ticket/63805#comment:13
patchfiles-append patch-sdk-no-stderr.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Backported upstream patch to build with the macOS 12 SDK.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/qt/qtbase/commit/dece6f5840463ae2ddf927d65eb1b3680e34a547
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qiosurfacegraphicsbuffer.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # find the Rez program
patchfiles-append patch-find_rez.diff
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-qiosurfacegraphicsbuffer.h.diff b/aqua/qt513/files/patch-qiosurfacegraphicsbuffer.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fa2ad91d008
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-qiosurfacegraphicsbuffer.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e070ba977d55..cc7193d8b71b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,6 +43,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <qpa/qplatformgraphicsbuffer.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <private/qcore_mac_p.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <CoreGraphics/CGColorSpace.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <IOSurface/IOSurface.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QT_BEGIN_NAMESPACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class QIOSurfaceGraphicsBuffer : public QPlatformGraphicsBuffer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.33.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt59/Portfile b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fc10c8be9ae..f97a32423d8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,7 @@ if { ${subport} eq "${name}-qtwebkit" ||
</span> }
# https://trac.macports.org/ticket/63154
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${xcodeversion} ne "none" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${xcodeversion} ne "none" || ${os.major} >= 21 } {
</span> use_xcode yes
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -785,13 +785,6 @@ if { ${os.major} < 14 } {
</span> ui_error "${subport} requires OS X 10.10 or later"
return -code error "incompatible OS version"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${os.major} >= 21} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Failed to resolve SDK path for 'macosx12'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</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} does not build on macOS 12 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> }
foreach {module module_info} [array get modules] {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1383,10 +1376,6 @@ foreach {module module_info} [array get modules] {
</span>
# avoid unnecessary dependency on OpenSSL
configure.args-append "QMAKE_LIBS_OPENSSL="
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # avoid:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Project ERROR: Could not resolve SDK --show-sdk-path for 'macosx'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xcode yes
</span> }
# special case
</pre><pre style='margin:0'>
</pre>