Mercurial > mxe-octave

view src/qtbase-2-gcc11.patch @ 5837:d659f1a97147

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Qt5: Add another diff for compilation with gcc 11. * src/qtbase-2-gcc11.patch: Add another diff for a missing header.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 11 Aug 2021 19:15:06 +0200
parents c16ae6edfc42
children 24e29dcb2e64
line wrap: on
line source

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
 
 
$ diff -Naup ./src/corelib/tools/qoffsetstringarray_p.h.orig ./src/corelib/tools/qoffsetstringarray_p.h
--- ./src/corelib/tools/qoffsetstringarray_p.h.orig	2020-10-27 09:02:11.000000000 +0100
+++ ./src/corelib/tools/qoffsetstringarray_p.h	2021-08-11 18:57:24.580782075 +0200
@@ -55,6 +55,7 @@
 
 #include <tuple>
 #include <array>
+#include <limits>
 
 QT_BEGIN_NAMESPACE