<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/41deec9ddcde7760842d3b4e06597d3417d7fdbe">https://github.com/macports/macports-ports/commit/41deec9ddcde7760842d3b4e06597d3417d7fdbe</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 41deec9ddcd qt(5|6)-qtbase: backport Xcode 15 fixes
</span>41deec9ddcd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 41deec9ddcde7760842d3b4e06597d3417d7fdbe
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Thu Sep 21 17:04:20 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt(5|6)-qtbase: backport Xcode 15 fixes
</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/68219
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/68204
</span>---
aqua/qt5/Portfile | 8 ++-
aqua/qt5/files/patch-qtbase-memory_resource.diff | 76 ++++++++++++++++++++++++
aqua/qt5/files/qtbase-qmake-xcode-15.patch | 59 ++++++++++++++++++
aqua/qt6/Portfile | 5 +-
aqua/qt6/files/qtbase-qmake-xcode-15.patch | 59 ++++++++++++++++++
5 files changed, 205 insertions(+), 2 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 552152aa296..3e33ef78831 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;'>@@ -214,7 +214,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: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 2"
</span> "License: "
}
qtcharts {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1103,6 +1103,12 @@ foreach {module module_info} [array get modules] {
</span> # see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270715
patchfiles-append qtbase-5.15.9-work-around-pyside2-brokenness.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/68219
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtbase-memory_resource.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/68204
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append qtbase-qmake-xcode-15.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Neither "pkg-config --cflags Qt5Core" nor "pkg-config --cflags-only-I Qt5Core" will allow
# a configure script to find CPPFLAGS since the include mechanism relies on
# -F and -framework BOTH being set
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtbase-memory_resource.diff b/aqua/qt5/files/patch-qtbase-memory_resource.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..acdd9e843d0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtbase-memory_resource.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,76 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Note: also partially backports 44a74127954d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+("Remove checks for C++ standard versions C++17 and below")
</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;'>+From f7c8ff511c30dc4310a72b3da4b4a345efe1fba0 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 7 Jun 2023 02:31:42 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Opt out of standard library memory_resource on macOS < 14 and iOS < 17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Although the header is available, and the compiler reports that the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+standard library supports memory_resource, the feature is only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+available on macOS 14 and iOS 17, as reported by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://developer.apple.com/xcode/cpp/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+As long as our deployment target is lower we can't unconditionally
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use this feature. It's not clear whether the expectation is that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+consumers of the standard library on these platforms will have to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+runtime check their uses of these APIs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Includes e84c0df50f51c61aa49b47823582b0f8de406e3d for fixing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+missing line continuations.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Task-number: QTBUG-114316
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: I50c1425334b9b9842b253442e2b3aade637783ea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/corelib/global/qcompilerdetection.h | 20 +++++++++++++-------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/corelib/tools/qduplicatetracker_p.h | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 14 insertions(+), 8 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/global/qcompilerdetection.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/global/qcompilerdetection.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1050,16 +1050,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif // !_HAS_CONSTEXPR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif // !__GLIBCXX__ && !_LIBCPP_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif // Q_OS_QNX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if defined(Q_CC_CLANG) && defined(Q_OS_DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if defined(__GNUC_LIBSTD__) && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Apple has not updated libstdc++ since 2007, which means it does not have
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // <initializer_list> or std::move. Let's disable these features
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# undef Q_COMPILER_INITIALIZER_LISTS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# undef Q_COMPILER_RVALUE_REFS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# undef Q_COMPILER_REF_QUALIFIERS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# undef Q_COMPILER_INITIALIZER_LISTS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# undef Q_COMPILER_RVALUE_REFS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# undef Q_COMPILER_REF_QUALIFIERS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Also disable <atomic>, since it's clearly not there
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# undef Q_COMPILER_ATOMICS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# undef Q_COMPILER_ATOMICS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# if defined(__cpp_lib_memory_resource) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 140000) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 170000))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# undef __cpp_lib_memory_resource // Only supported on macOS 14 and iOS 17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif // defined(Q_CC_CLANG) && defined(Q_OS_DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if defined(Q_CC_CLANG) && defined(Q_CC_INTEL) && Q_CC_INTEL >= 1500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // ICC 15.x and 16.0 have their own implementation of std::atomic, which is activated when in Clang mode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // (probably because libc++'s <atomic> on OS X failed to compile), but they're missing some
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/corelib/tools/qduplicatetracker_p.h b/src/corelib/tools/qduplicatetracker_p.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/corelib/tools/qduplicatetracker_p.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/corelib/tools/qduplicatetracker_p.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,7 +52,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <qglobal.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if QT_HAS_INCLUDE(<memory_resource>) && __cplusplus > 201402L
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __cpp_lib_memory_resource
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <unordered_set>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <memory_resource>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/qtbase-qmake-xcode-15.patch b/aqua/qt5/files/qtbase-qmake-xcode-15.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f479e4a46ec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/qtbase-qmake-xcode-15.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,59 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From cdf64b0e47115cc473e1afd1472b4b09e130b2a5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 11 Sep 2023 17:01:52 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] qmake: Don't error out if QMAKE_DEFAULT_LIBDIRS is empty on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The new linker in Xcode 15 doesn't provide any default linker or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+framework paths when requested via -v, but still seems to use the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default paths documented in the ld man page.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+We trust that linker will do the right thing, even if we don't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+know of its default linker paths.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+We also need to opt out of the default fallback logic to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set the libdirs to /lib and /usr/lib.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This may result in UnixMakefileGenerator::findLibraries finding
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+different libraries than expected, if additional paths are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+passed with -L, which will then take precedence for qmake,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+even if the linker itself will use the library from the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+SDK's default paths. This should hopefully not be an issue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in practice, as we don't turn -lFoo into absolute paths in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+qmake, so the only risk is that we're picking up the wrong
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+prl files and adding additional dependencies that the lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in the SDK doesn't have.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: I2347b26e2df0828471373b0e15b8c9089274c65d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkspecs/features/toolchain.prf | 9 ++++++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 6 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0040b6c4b9f..bfad10d35bc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/toolchain.prf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/toolchain.prf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -288,9 +288,12 @@ isEmpty($${target_prefix}.INCDIRS) {
</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;'>+- isEmpty(QMAKE_DEFAULT_LIBDIRS)|isEmpty(QMAKE_DEFAULT_INCDIRS): \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(QMAKE_DEFAULT_INCDIRS): \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !integrity: \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- error("failed to parse default search paths from compiler output")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ error("failed to parse default include paths from compiler output")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(QMAKE_DEFAULT_LIBDIRS): \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ !integrity:!darwin: \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ error("failed to parse default library paths from compiler output")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_DEFAULT_LIBDIRS = $$unique(QMAKE_DEFAULT_LIBDIRS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else: ghs {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmd = $$QMAKE_CXX $$QMAKE_CXXFLAGS -$${LITERAL_HASH} -o /tmp/fake_output /tmp/fake_input.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -411,7 +414,7 @@ isEmpty($${target_prefix}.INCDIRS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_DEFAULT_INCDIRS = $$split(INCLUDE, $$QMAKE_DIRLIST_SEP)
</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;'>+- unix:if(!cross_compile|host_build) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unix:!darwin:if(!cross_compile|host_build) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(QMAKE_DEFAULT_INCDIRS): QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(QMAKE_DEFAULT_LIBDIRS): QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/Portfile b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 303fdf95a04..eb1cfd2b249 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,7 +106,7 @@ array set modules {
</span> "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: "
<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: "
}
qtsvg {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1019,6 +1019,9 @@ if { ${subport} eq "${name}-qtbase" || ${subport} eq "${name}-qtbase-docs" } {
</span> # see https://trac.macports.org/ticket/67802
patchfiles-append patch-qtbase-intel_intrinsics.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/68204
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append qtbase-qmake-xcode-15.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # see https://trac.macports.org/ticket/67980
patchfiles-append patch-qtbase-memory_resource.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/files/qtbase-qmake-xcode-15.patch b/aqua/qt6/files/qtbase-qmake-xcode-15.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f479e4a46ec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/files/qtbase-qmake-xcode-15.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,59 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From cdf64b0e47115cc473e1afd1472b4b09e130b2a5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 11 Sep 2023 17:01:52 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] qmake: Don't error out if QMAKE_DEFAULT_LIBDIRS is empty on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The new linker in Xcode 15 doesn't provide any default linker or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+framework paths when requested via -v, but still seems to use the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default paths documented in the ld man page.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+We trust that linker will do the right thing, even if we don't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+know of its default linker paths.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+We also need to opt out of the default fallback logic to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set the libdirs to /lib and /usr/lib.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This may result in UnixMakefileGenerator::findLibraries finding
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+different libraries than expected, if additional paths are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+passed with -L, which will then take precedence for qmake,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+even if the linker itself will use the library from the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+SDK's default paths. This should hopefully not be an issue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in practice, as we don't turn -lFoo into absolute paths in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+qmake, so the only risk is that we're picking up the wrong
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+prl files and adding additional dependencies that the lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in the SDK doesn't have.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change-Id: I2347b26e2df0828471373b0e15b8c9089274c65d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkspecs/features/toolchain.prf | 9 ++++++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 6 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0040b6c4b9f..bfad10d35bc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mkspecs/features/toolchain.prf.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mkspecs/features/toolchain.prf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -288,9 +288,12 @@ isEmpty($${target_prefix}.INCDIRS) {
</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;'>+- isEmpty(QMAKE_DEFAULT_LIBDIRS)|isEmpty(QMAKE_DEFAULT_INCDIRS): \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(QMAKE_DEFAULT_INCDIRS): \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ !integrity: \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- error("failed to parse default search paths from compiler output")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ error("failed to parse default include paths from compiler output")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isEmpty(QMAKE_DEFAULT_LIBDIRS): \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ !integrity:!darwin: \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ error("failed to parse default library paths from compiler output")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_DEFAULT_LIBDIRS = $$unique(QMAKE_DEFAULT_LIBDIRS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else: ghs {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmd = $$QMAKE_CXX $$QMAKE_CXXFLAGS -$${LITERAL_HASH} -o /tmp/fake_output /tmp/fake_input.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -411,7 +414,7 @@ isEmpty($${target_prefix}.INCDIRS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_DEFAULT_INCDIRS = $$split(INCLUDE, $$QMAKE_DIRLIST_SEP)
</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;'>+- unix:if(!cross_compile|host_build) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unix:!darwin:if(!cross_compile|host_build) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(QMAKE_DEFAULT_INCDIRS): QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ isEmpty(QMAKE_DEFAULT_LIBDIRS): QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>