Some of those files are used to build host-side tools, so those changes are needed to fix the build on a host with GCC11.
Signed-off-by: Lucas Stach <[email protected]> --- ...tbase-include-limits-where-necessary.patch | 69 +++++++++++++++++++ patches/qt-everywhere-src-5.15.2/series | 3 +- 2 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch diff --git a/patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch b/patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch new file mode 100644 index 000000000000..33138cc3623c --- /dev/null +++ b/patches/qt-everywhere-src-5.15.2/0008-qtbase-include-limits-where-necessary.patch @@ -0,0 +1,69 @@ +From: Lucas Stach <[email protected]> +Date: Sat, 1 May 2021 00:57:24 +0200 +Subject: [PATCH] qtbase: include limits where necessary + +Upstream fixes: +https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986 +https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8 + +Fixes build with GCC11, which changed internal includes so that +limits isn't implicitly pulled in some cases. + +Signed-off-by: Lucas Stach <[email protected]> +--- + qtbase/src/corelib/global/qendian.h | 2 ++ + qtbase/src/corelib/global/qfloat16.h | 1 + + qtbase/src/corelib/text/qbytearraymatcher.h | 2 ++ + qtbase/src/corelib/tools/qoffsetstringarray_p.h | 1 + + 4 files changed, 6 insertions(+) + +diff --git a/qtbase/src/corelib/global/qendian.h b/qtbase/src/corelib/global/qendian.h +index 257efbbdbecf..a97776c761b7 100644 +--- a/qtbase/src/corelib/global/qendian.h ++++ b/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> +diff --git a/qtbase/src/corelib/global/qfloat16.h b/qtbase/src/corelib/global/qfloat16.h +index c7a9c87af322..5302be072ed8 100644 +--- a/qtbase/src/corelib/global/qfloat16.h ++++ b/qtbase/src/corelib/global/qfloat16.h +@@ -43,6 +43,7 @@ + + #include <QtCore/qglobal.h> + #include <QtCore/qmetatype.h> ++#include <limits> + #include <string.h> + + #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) +diff --git a/qtbase/src/corelib/text/qbytearraymatcher.h b/qtbase/src/corelib/text/qbytearraymatcher.h +index 0eedfc1d2035..f5f9bef7b87c 100644 +--- a/qtbase/src/corelib/text/qbytearraymatcher.h ++++ b/qtbase/src/corelib/text/qbytearraymatcher.h +@@ -42,6 +42,8 @@ + + #include <QtCore/qbytearray.h> + ++#include <limits> ++ + QT_BEGIN_NAMESPACE + + +diff --git a/qtbase/src/corelib/tools/qoffsetstringarray_p.h b/qtbase/src/corelib/tools/qoffsetstringarray_p.h +index 4dd9e9603bc1..8b3fbfe55985 100644 +--- a/qtbase/src/corelib/tools/qoffsetstringarray_p.h ++++ b/qtbase/src/corelib/tools/qoffsetstringarray_p.h +@@ -53,6 +53,7 @@ + + #include "private/qglobal_p.h" + ++#include <limits> + #include <tuple> + #include <array> + diff --git a/patches/qt-everywhere-src-5.15.2/series b/patches/qt-everywhere-src-5.15.2/series index 68b5075b33b2..226529352040 100644 --- a/patches/qt-everywhere-src-5.15.2/series +++ b/patches/qt-everywhere-src-5.15.2/series @@ -7,4 +7,5 @@ 0005-ptxdist-qtwebengine-allow-building-with-ptxdist.patch 0006-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch 0007-HACK-qtwebengine-workaround-for-too-long-file-names.patch -# 4b456a724e88b1f3c6125e3941898e96 - git-ptx-patches magic +0008-qtbase-include-limits-where-necessary.patch +# 0339a08cc8ad82af4c6542508057d7e7 - git-ptx-patches magic -- 2.29.2 _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
