diff options
| author | fanquake <fanquake@gmail.com> | 2023-12-01 20:35:28 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-12-21 09:37:33 +0000 |
| commit | b0c290340c1e1398dc9eb51b3e48a040de3f47d6 (patch) | |
| tree | c00bafdd7114697cdada6a043405bdf2339495bf /depends | |
| parent | 558250dec15e43b66c7b5a96543dd184925b6209 (diff) | |
| download | bitcoin-b0c290340c1e1398dc9eb51b3e48a040de3f47d6.tar.xz | |
Revert "build: Patch Qt to handle minimum macOS version properly"
This reverts commit 05aca093819be276ac7d648472c6ed5c7d235cc5.
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/packages/qt.mk | 2 | ||||
| -rw-r--r-- | depends/patches/qt/fix-minimum-macos.patch | 18 |
2 files changed, 0 insertions, 20 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index ecf3334aa5..284b664091 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -23,7 +23,6 @@ $(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 @@ -240,7 +239,6 @@ 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 deleted file mode 100644 index ecaa2ca308..0000000000 --- a/depends/patches/qt/fix-minimum-macos.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 |