diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2022-03-07 13:44:09 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2022-03-10 09:27:33 +0100 |
| commit | 74c27fa59b329f1210d39e8cd2904acf30d10838 (patch) | |
| tree | 7db3edd064427d207e72c1ade90fae579e97684b /recipes-qt/qt5/qtbase/0020-qbytearraymatcher-Include-limits-header.patch | |
| parent | 32e6203c8c31ace8eb31e2e8c6de72d5de8cc531 (diff) | |
qt5: upgrade to v5.15.3-lts-lgpl
* https://github.com/meta-qt5/meta-qt5/issues/455
* https://lists.qt-project.org/pipermail/development/2022-March/042262.html
qtbase/0021-qfloat16-Include-limits-header.patch partially resolved in upstream commit:
0afad46bb7 Fix build with GCC 11: include <limits>
qtbase/0022-fix_timezone_dst.patch resolved in upstream commits:
692c7e021f Fix QTzTimeZonePrivate::displayName()'s fallback
5f91ed1493 QTzTimeZonePrivate::init(): fix handling of empty ID
9f74724d84 Fix handling of Sunday in POSIX time-zone rules
qtsvg/CVE-2021-3481.patch: partially resolved in upstream commit:
aceea78 Improve handling of malformed numeric values in svg files
but the 2nd part is still needed.
qtcoap, qtknx, qtmqtt, qtopcua: keep QT_MODULE_BRANCH "5.15.2" as
it still wasn't downmerged to 5.15 branch and there is no
v5.15.3-lts-lgpl tag in these as well
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0020-qbytearraymatcher-Include-limits-header.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0020-qbytearraymatcher-Include-limits-header.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0020-qbytearraymatcher-Include-limits-header.patch b/recipes-qt/qt5/qtbase/0020-qbytearraymatcher-Include-limits-header.patch new file mode 100644 index 00000000..4054f841 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0020-qbytearraymatcher-Include-limits-header.patch @@ -0,0 +1,45 @@ +From 36691306941c8835a5c77d8a7170f04c3e432a08 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 2 Mar 2021 13:18:47 -0800 +Subject: [PATCH] qbytearraymatcher: Include <limits> header + +gcc11 complains + error: 'numeric_limits' is not a class template + | 344 | template<> class numeric_limits<const QT_PREPEND_NAMESPACE(qfloat16)> + +This is because its missing right header which perhaps is included +implicitly in older compilers + +Change-Id: Ic4e697c8a4c1b6b5448ba56f1749ae7293125ccd +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + src/corelib/text/qbytearraymatcher.h | 1 + + src/corelib/tools/qoffsetstringarray_p.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h +index 0eedfc1d20..7b80e2becd 100644 +--- a/src/corelib/text/qbytearraymatcher.h ++++ b/src/corelib/text/qbytearraymatcher.h +@@ -40,6 +40,7 @@ + #ifndef QBYTEARRAYMATCHER_H + #define QBYTEARRAYMATCHER_H + ++#include <limits> + #include <QtCore/qbytearray.h> + + QT_BEGIN_NAMESPACE +diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h +index 4dd9e9603b..e26a57ff43 100644 +--- a/src/corelib/tools/qoffsetstringarray_p.h ++++ b/src/corelib/tools/qoffsetstringarray_p.h +@@ -55,6 +55,7 @@ + + #include <tuple> + #include <array> ++#include <limits> + + QT_BEGIN_NAMESPACE + |