diff --git a/overlay/osx/qt5-base/patches/qmake_xcode15.patch b/overlay/osx/qt5-base/patches/qmake_xcode15.patch new file mode 100644 index 00000000000000..c7b5ef3693947a --- /dev/null +++ b/overlay/osx/qt5-base/patches/qmake_xcode15.patch @@ -0,0 +1,28 @@ +diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf +index 0c505fc965..c70f2797c8 100644 +--- a/mkspecs/features/toolchain.prf ++++ b/mkspecs/features/toolchain.prf +@@ -288,9 +288,12 @@ isEmpty($${target_prefix}.INCDIRS) { + } + } + } +- isEmpty(QMAKE_DEFAULT_LIBDIRS)|isEmpty(QMAKE_DEFAULT_INCDIRS): \ ++ isEmpty(QMAKE_DEFAULT_INCDIRS): \ + !integrity: \ +- error("failed to parse default search paths from compiler output") ++ error("failed to parse default include paths from compiler output") ++ isEmpty(QMAKE_DEFAULT_LIBDIRS): \ ++ !integrity:!darwin: \ ++ error("failed to parse default library paths from compiler output") + QMAKE_DEFAULT_LIBDIRS = $$unique(QMAKE_DEFAULT_LIBDIRS) + } else: ghs { + cmd = $$QMAKE_CXX $$QMAKE_CXXFLAGS -$${LITERAL_HASH} -o /tmp/fake_output /tmp/fake_input.cpp +@@ -412,7 +415,7 @@ isEmpty($${target_prefix}.INCDIRS) { + QMAKE_DEFAULT_INCDIRS = $$split(INCLUDE, $$QMAKE_DIRLIST_SEP) + } + +- unix:if(!cross_compile|host_build) { ++ unix:!darwin:if(!cross_compile|host_build) { + isEmpty(QMAKE_DEFAULT_INCDIRS): QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include + isEmpty(QMAKE_DEFAULT_LIBDIRS): QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib + } diff --git a/overlay/osx/qt5-base/portfile.cmake b/overlay/osx/qt5-base/portfile.cmake index 3e0a68b8a041ee..09662ce292a9be 100644 --- a/overlay/osx/qt5-base/portfile.cmake +++ b/overlay/osx/qt5-base/portfile.cmake @@ -39,6 +39,7 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH patches/arm64_send_super_stret.patch # don't use qt_msgSendSuper_stret on arm64 patches/replace_result_of.patch # Replace usage of std::result_of with decltype patches/scrollbars_style.patch # Never handle scrollbars styled with box or border changes as transient + patches/qmake_xcode15.patch # Fix Xcode 15 (macOS 14 Sonoma) build, see https://github.com/Homebrew/homebrew-core/pull/145729 ) # Remove vendored dependencies to ensure they are not picked up by the build