Mercurial > mxe-octave
changeset 5824:c16ae6edfc42
Qt5: Add patch for compilation with gcc 11.
* src/qtbase-2-gcc11.patch: Add missing includes.
* dist-files.mk: Add new file to list.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Mon, 09 Aug 2021 15:15:16 +0200 |
parents | df12908d5548 |
children | a48a92c9af10 |
files | dist-files.mk src/qtbase-2-gcc11.patch |
diffstat | 2 files changed, 40 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Mon Aug 09 08:49:57 2021 +0200 +++ b/dist-files.mk Mon Aug 09 15:15:16 2021 +0200 @@ -625,6 +625,7 @@ qt.mk \ qt5.mk \ qtbase-1-fixes.patch \ + qtbase-2-gcc11.patch \ qtbase.mk \ qtimageformats.mk \ qtsvg.mk \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/qtbase-2-gcc11.patch Mon Aug 09 15:15:16 2021 +0200 @@ -0,0 +1,39 @@ +Description: include <limits> to fix some GCC 11 build issues +Origin: upstream, commits: + https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986 + https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8 +Last-Update: 2021-01-26 + +--- a/src/corelib/global/qendian.h ++++ b/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> +--- a/src/corelib/global/qfloat16.h ++++ b/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__) +--- a/src/corelib/text/qbytearraymatcher.h ++++ b/src/corelib/text/qbytearraymatcher.h +@@ -42,6 +42,8 @@ + + #include <QtCore/qbytearray.h> + ++#include <limits> ++ + QT_BEGIN_NAMESPACE + + +