From 05aca093819be276ac7d648472c6ed5c7d235cc5 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Fri, 10 Nov 2023 23:25:13 +0000
Subject: [PATCH] build: Patch Qt to handle minimum macOS version properly

This change is required to switch to macOS 14 SDK (Xcode 15).
---
 depends/packages/qt.mk                     |  2 ++
 depends/patches/qt/fix-minimum-macos.patch | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 depends/patches/qt/fix-minimum-macos.patch

diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index b6d886438347c..3e3b78987a74b 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -23,6 +23,7 @@ $(package)_patches += guix_cross_lib_path.patch
 $(package)_patches += fix-macos-linker.patch
 $(package)_patches += memory_resource.patch
 $(package)_patches += windows_lto.patch
+$(package)_patches += fix-minimum-macos.patch
 
 $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
 $(package)_qttranslations_sha256_hash=a31785948c640b7c66d9fe2db4993728ca07f64e41c560b3625ad191b276ff20
@@ -239,6 +240,7 @@ endef
 define $(package)_preprocess_cmds
   cp $($(package)_patch_dir)/qt.pro qt.pro && \
   cp $($(package)_patch_dir)/qttools_src.pro qttools/src/src.pro && \
+  patch -p1 -i $($(package)_patch_dir)/fix-minimum-macos.patch && \
   patch -p1 -i $($(package)_patch_dir)/fix-macos-linker.patch && \
   patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch && \
   patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
diff --git a/depends/patches/qt/fix-minimum-macos.patch b/depends/patches/qt/fix-minimum-macos.patch
new file mode 100644
index 0000000000000..ecaa2ca30801c
--- /dev/null
+++ b/depends/patches/qt/fix-minimum-macos.patch
@@ -0,0 +1,18 @@
+Ensure that Qt handles the minimum macOS version properly
+
+This patch can be dropped for LLVM Clang 17+, after commit
+https://github.com/llvm/llvm-project/commit/c8e2dd8c6f490b68e41fe663b44535a8a21dfeab
+
+
+--- a/qtbase/src/corelib/global/qsystemdetection.h
++++ b/qtbase/src/corelib/global/qsystemdetection.h
+@@ -220,6 +220,9 @@
+ #  include <Availability.h>
+ #  include <AvailabilityMacros.h>
+ #
++#  undef __MAC_OS_X_VERSION_MIN_REQUIRED
++#  define __MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_MIN_REQUIRED
++#
+ #  ifdef Q_OS_MACOS
+ #    if !defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_6
+ #       undef __MAC_OS_X_VERSION_MIN_REQUIRED