mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 20:42:59 +01:00
1babc5abff
* Fix build of qtbase in contrib for Gcc 11.x
It adds a patch with missing include <limits> in qtbase/src/tools/moc/generator.cpp
* Merge bitcoin/bitcoin#23716: test: replace hashlib.ripemd160 with an own implementation
5b559dc7ecf37ab1604b75ec8ffe8436377a5fb1 Swap out hashlib.ripemd160 for own implementation (Pieter Wuille)
ad3e9e1f214d739e098c6ebbd300da5df1026a44 Add pure Python RIPEMD-160 (Pieter Wuille)
Pull request description:
Closes #23710.
ACKs for top commit:
jamesob:
ACK 5b559dc7ec, pending CI
Tree-SHA512: dcd4ea2027eac572f7ab0da434b081b9a5d6b78675e559258a446b4d254b29d93c4d2cc12da4a28303543d6d99f5f2246fde4052e84af81d18e04399b137b39e
* Updates doc for Unix build: added missing dependency bison
Co-authored-by: MarcoFalke <falke.marco@gmail.com>
44 lines
1020 B
Diff
44 lines
1020 B
Diff
Fix compiling with GCC 11
|
|
|
|
See: https://bugreports.qt.io/browse/QTBUG-90395.
|
|
|
|
Upstream commits:
|
|
- Qt 5.15 -- unavailable as open source
|
|
- Qt 6.0: b2af6332ea37e45ab230a7a5d2d278f86d961b83
|
|
- Qt 6.1: 9c56d4da2ff631a8c1c30475bd792f6c86bda53c
|
|
|
|
--- old/qtbase/src/corelib/global/qendian.h
|
|
+++ new/qtbase/src/corelib/global/qendian.h
|
|
@@ -44,6 +44,8 @@
|
|
#include <QtCore/qfloat16.h>
|
|
#include <QtCore/qglobal.h>
|
|
|
|
+#include <limits>
|
|
+
|
|
// include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
--- old/qtbase/src/corelib/tools/qbytearraymatcher.h
|
|
+++ new/qtbase/src/corelib/tools/qbytearraymatcher.h
|
|
@@ -42,6 +42,8 @@
|
|
|
|
#include <QtCore/qbytearray.h>
|
|
|
|
+#include <limits>
|
|
+
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
|
|
--- old/qtbase/src/tools/moc/generator.cpp
|
|
+++ new/qtbase/src/tools/moc/generator.cpp
|
|
@@ -42,6 +42,7 @@
|
|
|
|
#include <math.h>
|
|
#include <stdio.h>
|
|
+#include <limits>
|
|
|
|
#include <private/qmetaobject_p.h> //for the flags.
|
|
#include <private/qplugin_p.h> //for the flags.
|
|
|