From dea1b13ebfc7a8fed8644712fc6c3bc12281bf25 Mon Sep 17 00:00:00 2001 From: Charles Ballard <charles.ballard@stfc.ac.uk> Date: Mon, 23 Oct 2023 20:38:00 +0100 Subject: [PATCH] missing patch --- patches/qt5-qtbase-gcc11.patch | 205 +++++++++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) create mode 100644 patches/qt5-qtbase-gcc11.patch diff --git a/patches/qt5-qtbase-gcc11.patch b/patches/qt5-qtbase-gcc11.patch new file mode 100644 index 00000000..722472e1 --- /dev/null +++ b/patches/qt5-qtbase-gcc11.patch @@ -0,0 +1,205 @@ +diff --git qtbase/src/corelib/codecs/qtextcodec.cpp qtbase/src/corelib/codecs/qtextcodec.cpp +index 06fd88da..dbff3239 100644 +--- qtbase/src/corelib/codecs/qtextcodec.cpp ++++ qtbase/src/corelib/codecs/qtextcodec.cpp +@@ -38,6 +38,7 @@ + ** + ****************************************************************************/ + ++#include <limits> + #include "qplatformdefs.h" + + #include "qtextcodec.h" +diff --git qtbase/src/corelib/codecs/qutfcodec.cpp qtbase/src/corelib/codecs/qutfcodec.cpp +index 8561f908..8128d3cf 100644 +--- qtbase/src/corelib/codecs/qutfcodec.cpp ++++ qtbase/src/corelib/codecs/qutfcodec.cpp +@@ -38,6 +38,8 @@ + ** + ****************************************************************************/ + ++#include <limits> ++ + #include "qutfcodec_p.h" + #include "qlist.h" + #include "qendian.h" +diff --git qtbase/src/corelib/global/qendian.cpp qtbase/src/corelib/global/qendian.cpp +index eb08b2f8..6b41b3dd 100644 +--- qtbase/src/corelib/global/qendian.cpp ++++ qtbase/src/corelib/global/qendian.cpp +@@ -38,6 +38,7 @@ + ** + ****************************************************************************/ + ++#include <limits> + #include "qendian.h" + + #include "qalgorithms.h" +diff --git qtbase/src/corelib/global/qfloat16.cpp qtbase/src/corelib/global/qfloat16.cpp +index c9733174..c62a1972 100644 +--- qtbase/src/corelib/global/qfloat16.cpp ++++ qtbase/src/corelib/global/qfloat16.cpp +@@ -38,6 +38,7 @@ + ** + ****************************************************************************/ + ++#include <limits> + #include "qfloat16.h" + #include "private/qsimd_p.h" + #include <cmath> // for fpclassify()'s return values +diff --git qtbase/src/corelib/global/qrandom.cpp qtbase/src/corelib/global/qrandom.cpp +index 10672c1f..6d5fd63e 100644 +--- qtbase/src/corelib/global/qrandom.cpp ++++ qtbase/src/corelib/global/qrandom.cpp +@@ -40,6 +40,7 @@ + // for rand_s + #define _CRT_RAND_S + ++#include <limits> + #include "qrandom.h" + #include "qrandom_p.h" + #include <qobjectdefs.h> +diff --git qtbase/src/corelib/plugin/qelfparser_p.cpp qtbase/src/corelib/plugin/qelfparser_p.cpp +index 13eee353..9e7a7a41 100644 +--- qtbase/src/corelib/plugin/qelfparser_p.cpp ++++ qtbase/src/corelib/plugin/qelfparser_p.cpp +@@ -37,6 +37,7 @@ + ** + ****************************************************************************/ + ++#include <limits> + #include "qelfparser_p.h" + + #if defined (Q_OF_ELF) && defined(Q_CC_GNU) +diff --git qtbase/src/corelib/plugin/qmachparser.cpp qtbase/src/corelib/plugin/qmachparser.cpp +index 11670caf..39f5596b 100644 +--- qtbase/src/corelib/plugin/qmachparser.cpp ++++ qtbase/src/corelib/plugin/qmachparser.cpp +@@ -37,6 +37,8 @@ + ** + ****************************************************************************/ + ++#include <limits> ++ + #include "qmachparser_p.h" + + #if defined(Q_OF_MACH_O) +diff --git qtbase/src/corelib/plugin/quuid.cpp qtbase/src/corelib/plugin/quuid.cpp +index 83873edf..5aafb4e5 100644 +--- qtbase/src/corelib/plugin/quuid.cpp ++++ qtbase/src/corelib/plugin/quuid.cpp +@@ -38,6 +38,7 @@ + ** + ****************************************************************************/ + ++#include <limits> + #include "quuid.h" + + #include "qcryptographichash.h" +diff --git qtbase/src/corelib/serialization/qdatastream.cpp qtbase/src/corelib/serialization/qdatastream.cpp +index 5082a8cb..7eecfcca 100644 +--- qtbase/src/corelib/serialization/qdatastream.cpp ++++ qtbase/src/corelib/serialization/qdatastream.cpp +@@ -40,6 +40,8 @@ + #include "qdatastream.h" + #include "qdatastream_p.h" + ++#include <limits> ++ + #if !defined(QT_NO_DATASTREAM) || defined(QT_BOOTSTRAPPED) + #include "qbuffer.h" + #include "qfloat16.h" +diff --git qtbase/src/corelib/text/qbytearray.cpp qtbase/src/corelib/text/qbytearray.cpp +index 9a72df58..6651ee98 100644 +--- qtbase/src/corelib/text/qbytearray.cpp ++++ qtbase/src/corelib/text/qbytearray.cpp +@@ -39,6 +39,7 @@ + ** + ****************************************************************************/ + ++#include <limits> + #include "qbytearray.h" + #include "qbytearraymatcher.h" + #include "private/qtools_p.h" +diff --git qtbase/src/corelib/text/qbytearraymatcher.cpp qtbase/src/corelib/text/qbytearraymatcher.cpp +index 72e09226..80511cb5 100644 +--- qtbase/src/corelib/text/qbytearraymatcher.cpp ++++ qtbase/src/corelib/text/qbytearraymatcher.cpp +@@ -37,6 +37,7 @@ + ** + ****************************************************************************/ + ++#include <limits> + #include "qbytearraymatcher.h" + + #include <limits.h> +diff --git qtbase/src/corelib/tools/qbitarray.cpp qtbase/src/corelib/tools/qbitarray.cpp +index ab3054d5..22efb3a0 100644 +--- qtbase/src/corelib/tools/qbitarray.cpp ++++ qtbase/src/corelib/tools/qbitarray.cpp +@@ -38,6 +38,7 @@ + ** + ****************************************************************************/ + ++#include <limits> + #include "qbitarray.h" + #include <qalgorithms.h> + #include <qdatastream.h> +diff --git qtbase/src/corelib/tools/qcryptographichash.cpp qtbase/src/corelib/tools/qcryptographichash.cpp +index fa8d21e0..cd85956d 100644 +--- qtbase/src/corelib/tools/qcryptographichash.cpp ++++ qtbase/src/corelib/tools/qcryptographichash.cpp +@@ -38,6 +38,7 @@ + ** + ****************************************************************************/ + ++#include <limits> + #include <qcryptographichash.h> + #include <qiodevice.h> + +diff --git qtbase/src/gui/text/qfontengine_qpf2.cpp qtbase/src/gui/text/qfontengine_qpf2.cpp +index e00f9d05..917ab5f9 100644 +--- qtbase/src/gui/text/qfontengine_qpf2.cpp ++++ qtbase/src/gui/text/qfontengine_qpf2.cpp +@@ -37,6 +37,7 @@ + ** + ****************************************************************************/ + ++#include <limits> + #include "qfontengine_qpf2_p.h" + + #include <QtCore/QFile> +diff -up qtbase/src/corelib/text/qbytearray.h.foo qtbase/src/corelib/text/qbytearray.h +--- qtbase/src/corelib/text/qbytearray.h.foo 2020-10-27 03:02:11.000000000 -0500 ++++ qtbase/src/corelib/text/qbytearray.h 2021-02-06 17:05:04.879201352 -0600 +@@ -51,6 +49,7 @@ + + #include <string> + #include <iterator> ++#include <limits> + + #ifdef truncate + #error qbytearray.h must be included before any header file that defines truncate +diff -up qtbase/src/corelib/global/qendian.h.QTBUG-90395 qtbase/src/corelib/global/qendian.h +--- qtbase/src/corelib/global/qendian.h.QTBUG-90395 2020-10-27 03:02:11.000000000 -0500 ++++ qtbase/src/corelib/global/qendian.h 2021-02-06 16:36:27.072105717 -0600 +@@ -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 -up qtbase/src/corelib/global/qfloat16.h.QTBUG-90395 qtbase/src/corelib/global/qfloat16.h +--- qtbase/src/corelib/global/qfloat16.h.QTBUG-90395 2021-02-06 16:36:27.074105730 -0600 ++++ qtbase/src/corelib/global/qfloat16.h 2021-02-06 16:37:19.212440114 -0600 +@@ -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__) -- GitLab