highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-09-11 21:20:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

depends, qt: Add patch for missing headers

Browse Source 
This fixes the build when using recent clang releases and libc++.
This commit is contained in:
Hennadii Stepanov
2026-08-10 17:43:21 +01:00
parent 1d386c250f
commit e8500cbd19
3 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
depends/packages/native_qt.mk
View File

@@ -10,6 +10,7 @@ $(package)_patches += qtbase_skip_tools.patch
$(package)_patches += rcc_hardcode_timestamp.patch
$(package)_patches += qttools_skip_dependencies.patch
$(package)_patches += fix-macos26-qyield.patch
$(package)_patches += fix_missed_headers.patch
$(package)_qttranslations_file_name=$(qt_details_qttranslations_file_name)
$(package)_qttranslations_sha256_hash=$(qt_details_qttranslations_sha256_hash)
@@ -140,7 +141,8 @@ define $(package)_preprocess_cmds
patch -p1 -i $($(package)_patch_dir)/qtbase_skip_tools.patch && \
patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch && \
patch -p1 -i $($(package)_patch_dir)/qttools_skip_dependencies.patch && \
patch -p1 -i $($(package)_patch_dir)/fix-macos26-qyield.patch
patch -p1 -i $($(package)_patch_dir)/fix-macos26-qyield.patch && \
patch -p1 -i $($(package)_patch_dir)/fix_missed_headers.patch
endef
define $(package)_config_cmds

4
depends/packages/qt.mk
View File

@@ -28,6 +28,7 @@ $(package)_patches += fix-macos26-qyield.patch
$(package)_patches += fix-qbytearray-include.patch
$(package)_patches += fix_openbsd_network_kernel.patch
$(package)_patches += fix_openbsd_plugin_qelfparser.patch
$(package)_patches += fix_missed_headers.patch
$(package)_qttranslations_file_name=$(qt_details_qttranslations_file_name)
$(package)_qttranslations_sha256_hash=$(qt_details_qttranslations_sha256_hash)
@@ -293,7 +294,8 @@ define $(package)_preprocess_cmds
patch -p1 -i $($(package)_patch_dir)/fix-macos26-qyield.patch && \
patch -p1 -i $($(package)_patch_dir)/fix-qbytearray-include.patch && \
patch -p1 -i $($(package)_patch_dir)/fix_openbsd_network_kernel.patch && \
patch -p1 -i $($(package)_patch_dir)/fix_openbsd_plugin_qelfparser.patch
patch -p1 -i $($(package)_patch_dir)/fix_openbsd_plugin_qelfparser.patch && \
patch -p1 -i $($(package)_patch_dir)/fix_missed_headers.patch
endef
ifeq ($(host),$(build))
$(package)_preprocess_cmds += && patch -p1 -i $($(package)_patch_dir)/qttools_skip_dependencies.patch

32
depends/patches/qt/fix_missed_headers.patch Normal file
View File

@@ -0,0 +1,32 @@
QXcbAtom: add missing <cstdlib> #include
Clang 21 complained about free() being an undefined identifier.
See: https://codereview.qt-project.org/c/qt/qtbase/+/686891
--- a/qtbase/src/plugins/platforms/xcb/qxcbatom.cpp
+++ b/qtbase/src/plugins/platforms/xcb/qxcbatom.cpp
@@ -7,6 +7,7 @@
#include <string.h>
#include <algorithm>
+#include <cstdlib>
static const char *xcb_atomnames = {
// window-manager <-> client protocols
syncqt.cpp: Include <algorithm> for std::transform
See: https://codereview.qt-project.org/c/qt/qtbase/+/673183
--- a/qtbase/src/tools/syncqt/main.cpp
+++ b/qtbase/src/tools/syncqt/main.cpp
@@ -15,6 +15,7 @@
* pre-defined list of header files.
*/
+#include <algorithm>
#include <iostream>
#include <fstream>
#include <string>