Mercurial > mxe-octave

annotate src/qtbase-2-gcc11.patch @ 5947:09d3533acacf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/build-cmake.mk, src/cmake.mk: update v3.21.4
author John Donoghue <john.donoghue@ieee.org>
date Thu, 11 Nov 2021 09:49:11 -0500
parents d659f1a97147
children 24e29dcb2e64
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5824
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 Description: include <limits> to fix some GCC 11 build issues
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 Origin: upstream, commits:
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=813a928c7c3cf986
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 https://code.qt.io/cgit/qt/qtbase.git/commit/?id=9c56d4da2ff631a8
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5 Last-Update: 2021-01-26
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 --- a/src/corelib/global/qendian.h
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 +++ b/src/corelib/global/qendian.h
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 @@ -44,6 +44,8 @@
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 #include <QtCore/qfloat16.h>
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 #include <QtCore/qglobal.h>
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 +#include <limits>
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 +
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 #include <stdlib.h>
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17 #include <string.h>
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 --- a/src/corelib/global/qfloat16.h
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19 +++ b/src/corelib/global/qfloat16.h
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 @@ -43,6 +43,7 @@
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 #include <QtCore/qglobal.h>
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 #include <QtCore/qmetatype.h>
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24 +#include <limits>
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 #include <string.h>
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27 #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28 --- a/src/corelib/text/qbytearraymatcher.h
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29 +++ b/src/corelib/text/qbytearraymatcher.h
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30 @@ -42,6 +42,8 @@
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
31
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
32 #include <QtCore/qbytearray.h>
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
33
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
34 +#include <limits>
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
35 +
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
36 QT_BEGIN_NAMESPACE
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
37
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
38
5837
d659f1a97147 Qt5: Add another diff for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5824
diff changeset
39 $ diff -Naup ./src/corelib/tools/qoffsetstringarray_p.h.orig ./src/corelib/tools/qoffsetstringarray_p.h
d659f1a97147 Qt5: Add another diff for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5824
diff changeset
40 --- ./src/corelib/tools/qoffsetstringarray_p.h.orig 2020-10-27 09:02:11.000000000 +0100
d659f1a97147 Qt5: Add another diff for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5824
diff changeset
41 +++ ./src/corelib/tools/qoffsetstringarray_p.h 2021-08-11 18:57:24.580782075 +0200
d659f1a97147 Qt5: Add another diff for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5824
diff changeset
42 @@ -55,6 +55,7 @@
d659f1a97147 Qt5: Add another diff for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5824
diff changeset
43
d659f1a97147 Qt5: Add another diff for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5824
diff changeset
44 #include <tuple>
d659f1a97147 Qt5: Add another diff for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5824
diff changeset
45 #include <array>
d659f1a97147 Qt5: Add another diff for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5824
diff changeset
46 +#include <limits>
d659f1a97147 Qt5: Add another diff for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5824
diff changeset
47
d659f1a97147 Qt5: Add another diff for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5824
diff changeset
48 QT_BEGIN_NAMESPACE
d659f1a97147 Qt5: Add another diff for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5824
diff changeset
49
5824
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
50