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/nativesdk-qtbase_git.bb | |
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/nativesdk-qtbase_git.bb')
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index c106f624..ecba833b 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -25,7 +25,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-shared -# 5.15.meta-qt5-shared.2 +# 5.15.meta-qt5-shared.3 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -38,24 +38,23 @@ SRC_URI += "\ file://0009-Add-OE-specific-specs-for-clang-compiler.patch \ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ - file://0013-Disable-ltcg-for-host_build.patch \ - file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ - file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ - file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0018-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \ - file://0019-Define-__NR_futex-if-it-does-not-exist.patch \ - file://0020-Revert-Fix-workaround-in-pthread-destructor.patch \ - file://0021-qfloat16-Include-limits-header.patch \ - file://0022-fix_timezone_dst.patch \ - file://0023-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \ + file://0012-Disable-ltcg-for-host_build.patch \ + file://0013-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ + file://0014-corelib-Include-sys-types.h-for-uint32_t.patch \ + file://0015-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ + file://0016-tst_qpainter-FE_-macros-are-not-defined-for-every-pl.patch \ + file://0017-Define-__NR_futex-if-it-does-not-exist.patch \ + file://0018-Revert-Fix-workaround-in-pthread-destructor.patch \ + file://0019-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \ + file://0020-qbytearraymatcher-Include-limits-header.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.15-native -# 5.15.meta-qt5-native.2 +# 5.15.meta-qt5-native.3 SRC_URI += " \ - file://0019-Always-build-uic-and-qvkgen.patch \ - file://0020-Avoid-renameeat2-for-native-sdk-builds.patch \ + file://0021-Always-build-uic-and-qvkgen.patch \ + file://0022-Avoid-renameeat2-for-native-sdk-builds.patch \ " # CMake's toolchain configuration of nativesdk-qtbase @@ -202,4 +201,4 @@ fakeroot do_generate_qt_environment_file() { do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package -SRCREV = "40143c189b7c1bf3c2058b77d00ea5c4e3be8b28" +SRCREV = "c95f96550fc74b00bb0d3a82e7cb6b0e20bc76ac" |