Skip to content

Commit 9aa1b3e

Browse files
author
barrystyle
committed
patch qt with bitcoin pr#22186
1 parent d2e39c0 commit 9aa1b3e

File tree

2 files changed

+46
-1
lines changed

2 files changed

+46
-1
lines changed

depends/packages/qt.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ $(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_no_printer.patch no
1111
$(package)_patches+= fix_android_qmake_conf.patch fix_android_jni_static.patch dont_hardcode_pwd.patch
1212
$(package)_patches+= drop_lrelease_dependency.patch no_sdk_version_check.patch
1313
$(package)_patches+= fix_lib_paths.patch fix_android_pch.patch
14-
$(package)_patches+= qtbase-moc-ignore-gcc-macro.patch
14+
$(package)_patches+= qtbase-moc-ignore-gcc-macro.patch fix_limits_header.patch
1515

1616
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
1717
$(package)_qttranslations_sha256_hash=577b0668a777eb2b451c61e8d026d79285371597ce9df06b6dee6c814164b7c3
@@ -230,6 +230,7 @@ define $(package)_preprocess_cmds
230230
patch -p1 -i $($(package)_patch_dir)/no_sdk_version_check.patch && \
231231
patch -p1 -i $($(package)_patch_dir)/fix_lib_paths.patch && \
232232
patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
233+
patch -p1 -i $($(package)_patch_dir)/fix_limits_header.patch && \
233234
sed -i.old "s|updateqm.commands = \$$$$\$$$$LRELEASE|updateqm.commands = $($(package)_extract_dir)/qttools/bin/lrelease|" qttranslations/translations/translations.pro && \
234235
mkdir -p qtbase/mkspecs/macx-clang-linux &&\
235236
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
Fix compiling with GCC 11
2+
3+
See: https://bugreports.qt.io/browse/QTBUG-90395.
4+
5+
Upstream commits:
6+
- Qt 5.15 -- unavailable as open source
7+
- Qt 6.0: b2af6332ea37e45ab230a7a5d2d278f86d961b83
8+
- Qt 6.1: 9c56d4da2ff631a8c1c30475bd792f6c86bda53c
9+
10+
--- old/qtbase/src/corelib/global/qendian.h
11+
+++ new/qtbase/src/corelib/global/qendian.h
12+
@@ -44,6 +44,8 @@
13+
#include <QtCore/qfloat16.h>
14+
#include <QtCore/qglobal.h>
15+
16+
+#include <limits>
17+
+
18+
// include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
19+
#include <stdlib.h>
20+
#include <string.h>
21+
22+
--- old/qtbase/src/corelib/tools/qbytearraymatcher.h
23+
+++ new/qtbase/src/corelib/tools/qbytearraymatcher.h
24+
@@ -42,6 +42,8 @@
25+
26+
#include <QtCore/qbytearray.h>
27+
28+
+#include <limits>
29+
+
30+
QT_BEGIN_NAMESPACE
31+
32+
33+
34+
--- old/qtbase/src/tools/moc/generator.cpp
35+
+++ new/qtbase/src/tools/moc/generator.cpp
36+
@@ -40,6 +40,8 @@
37+
#include <QtCore/qplugin.h>
38+
#include <QtCore/qstringview.h>
39+
40+
+#include <limits>
41+
+
42+
#include <math.h>
43+
#include <stdio.h>
44+

0 commit comments

Comments
 (0)