diff options
| author | fanquake <fanquake@gmail.com> | 2024-05-02 16:45:03 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-05-30 12:00:05 +0100 |
| commit | 0a3631fc352eda849290db940844e5ef723436df (patch) | |
| tree | 69acaabf989eeafcf887190de3e157c522c026b6 /depends/packages | |
| parent | b018bd779dd9b2d46c10254a1cf5b819ae8e027c (diff) | |
| download | bitcoin-0a3631fc352eda849290db940844e5ef723436df.tar.xz | |
depends: fix Qt macOS build with Clang 18
Patch Qts internal libpng to resolve the failure.
I would like to have this patched, so we can continue working on the
removal of `FORCE_USE_SYSTEM_CLANG`. Otherwise builds will be broken using
the default clang (18) on the current Ubuntu LTS (24.04).
Diffstat (limited to 'depends/packages')
| -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 2dba1b41ae..d35139dd2d 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -20,6 +20,7 @@ $(package)_patches += duplicate_lcqpafonts.patch $(package)_patches += guix_cross_lib_path.patch $(package)_patches += fix-macos-linker.patch $(package)_patches += memory_resource.patch +$(package)_patches += clang_18_libpng.patch $(package)_patches += utc_from_string_no_optimize.patch $(package)_patches += windows_lto.patch $(package)_patches += zlib-timebits64.patch @@ -229,6 +230,7 @@ define $(package)_preprocess_cmds patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \ patch -p1 -i $($(package)_patch_dir)/memory_resource.patch && \ patch -p1 -i $($(package)_patch_dir)/no_warnings_for_symbols.patch && \ + patch -p1 -i $($(package)_patch_dir)/clang_18_libpng.patch && \ patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch && \ patch -p1 -i $($(package)_patch_dir)/duplicate_lcqpafonts.patch && \ patch -p1 -i $($(package)_patch_dir)/utc_from_string_no_optimize.patch && \ |