File tree Expand file tree Collapse file tree 2 files changed +20
-0
lines changed Expand file tree Collapse file tree 2 files changed +20
-0
lines changed Original file line number Diff line number Diff line change @@ -23,6 +23,7 @@ $(package)_patches += guix_cross_lib_path.patch
23
23
$(package)_patches += fix-macos-linker.patch
24
24
$(package)_patches += memory_resource.patch
25
25
$(package)_patches += windows_lto.patch
26
+ $(package)_patches += fix-minimum-macos.patch
26
27
27
28
$(package)_qttranslations_file_name =qttranslations-$($(package ) _suffix)
28
29
$(package)_qttranslations_sha256_hash =a31785948c640b7c66d9fe2db4993728ca07f64e41c560b3625ad191b276ff20
@@ -239,6 +240,7 @@ endef
239
240
define $(package)_preprocess_cmds
240
241
cp $($(package ) _patch_dir) /qt.pro qt.pro && \
241
242
cp $($(package ) _patch_dir) /qttools_src.pro qttools/src/src.pro && \
243
+ patch -p1 -i $($(package ) _patch_dir) /fix-minimum-macos.patch && \
242
244
patch -p1 -i $($(package ) _patch_dir) /fix-macos-linker.patch && \
243
245
patch -p1 -i $($(package ) _patch_dir) /dont_hardcode_pwd.patch && \
244
246
patch -p1 -i $($(package ) _patch_dir) /fix_qt_pkgconfig.patch && \
Original file line number Diff line number Diff line change
1
+ Ensure that Qt handles the minimum macOS version properly
2
+
3
+ This patch can be dropped for LLVM Clang 17+, after commit
4
+ https://github.com/llvm/llvm-project/commit/c8e2dd8c6f490b68e41fe663b44535a8a21dfeab
5
+
6
+
7
+ --- a/qtbase/src/corelib/global/qsystemdetection.h
8
+ +++ b/qtbase/src/corelib/global/qsystemdetection.h
9
+ @@ -220,6 +220,9 @@
10
+ # include <Availability.h>
11
+ # include <AvailabilityMacros.h>
12
+ #
13
+ + # undef __MAC_OS_X_VERSION_MIN_REQUIRED
14
+ + # define __MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_MIN_REQUIRED
15
+ + #
16
+ # ifdef Q_OS_MACOS
17
+ # if !defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_6
18
+ # undef __MAC_OS_X_VERSION_MIN_REQUIRED
You can’t perform that action at this time.
0 commit comments