Mercurial > mxe-octave

annotate src/qtbase-2-gcc11.patch @ 6113:24e29dcb2e64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Qt5: Update to version 5.15.3. * src/qtbase.mk: Update version and checksum. * src/qtbase-2-gcc11.patch: Remove hunks from patch that have been applied upstream. * src/qtimageformats.mk, src/qtsvg.mk, src/qttools.mk, src/qttranslationse.mk: Update checksum.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 05 Mar 2022 10:59:53 +0100
parents d659f1a97147
children
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/text/qbytearraymatcher.h
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8 +++ 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
9 @@ -42,6 +42,8 @@
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 #include <QtCore/qbytearray.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 QT_BEGIN_NAMESPACE
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17
5837
d659f1a97147 Qt5: Add another diff for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5824
diff changeset
18 $ 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
19 --- ./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
20 +++ ./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
21 @@ -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
22
d659f1a97147 Qt5: Add another diff for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5824
diff changeset
23 #include <tuple>
d659f1a97147 Qt5: Add another diff for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5824
diff changeset
24 #include <array>
d659f1a97147 Qt5: Add another diff for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5824
diff changeset
25 +#include <limits>
d659f1a97147 Qt5: Add another diff for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5824
diff changeset
26
d659f1a97147 Qt5: Add another diff for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5824
diff changeset
27 QT_BEGIN_NAMESPACE
d659f1a97147 Qt5: Add another diff for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents: 5824
diff changeset
28
5824
c16ae6edfc42 Qt5: Add patch for compilation with gcc 11.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29