diff options
| author | Kittywhiskers Van Gogh <63189531+kittywhiskers@users.noreply.github.com> | 2021-11-24 14:03:12 +0530 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-02-15 09:22:06 +0000 |
| commit | 801b0f05aaf974ab9b0e3f7b59948564638d593f (patch) | |
| tree | 91dd076c11eb835864c8bf72a526de53f037fcd4 /depends/packages/qt.mk | |
| parent | c768bfa08af034c744402d4294cc323d653b97b8 (diff) | |
| download | bitcoin-801b0f05aaf974ab9b0e3f7b59948564638d593f.tar.xz | |
build: patch qt to explicitly define previously implicit header include
macOS Monterey has refactored some includes such that implicitly defined headers were no longer exposed and that in turns breaks building Qt on macOS 12.
Additional Resources:
- https://bugreports.qt.io/browse/QTBUG-97855
- https://codereview.qt-project.org/c/qt/qtbase/+/378706
- https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/cocoa?id=dece6f5840463ae2ddf927d65eb1b3680e34a547
Github-Pull: #23580
Rebased-From: 8196b0a2bc63c35769eca213cba4a5844a737b90
Diffstat (limited to 'depends/packages/qt.mk')
| -rw-r--r-- | depends/packages/qt.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 0c3ef8c82f..81518780cd 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -13,6 +13,7 @@ $(package)_patches+= fix_android_qmake_conf.patch fix_android_jni_static.patch d $(package)_patches+= no_sdk_version_check.patch $(package)_patches+= fix_lib_paths.patch fix_android_pch.patch $(package)_patches+= qtbase-moc-ignore-gcc-macro.patch fix_limits_header.patch +$(package)_patches+= fix_montery_include.patch $(package)_qttranslations_file_name=qttranslations-$($(package)_suffix) $(package)_qttranslations_sha256_hash=577b0668a777eb2b451c61e8d026d79285371597ce9df06b6dee6c814164b7c3 @@ -232,6 +233,7 @@ define $(package)_preprocess_cmds patch -p1 -i $($(package)_patch_dir)/fix_lib_paths.patch && \ patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \ patch -p1 -i $($(package)_patch_dir)/fix_limits_header.patch && \ + patch -p1 -i $($(package)_patch_dir)/fix_montery_include.patch && \ mkdir -p qtbase/mkspecs/macx-clang-linux &&\ cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\ cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \ |