qt5: upgrade to v5.15.4-lts-lgpl

* update to new SRCREVs where available
* https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/5.15.4/release-note.md

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2022-05-22 08:48:38 +02:00
parent c9b001ff4e
commit 16246d353a
37 changed files with 36 additions and 82 deletions

View File

@@ -201,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 = "c95f96550fc74b00bb0d3a82e7cb6b0e20bc76ac"
SRCREV = "fa9a234c10ad4499fd6b148cd4360be5a1d61ae9"

View File

@@ -38,6 +38,6 @@ do_configure:prepend() {
${S}/src/quick3d/imports/input/importsinput.pro
}
SRCREV = "0559db47fefd7fb474cd795f94815e6e863234c8"
SRCREV = "92853c6e1aa95dfb7d605959ff44ccc124fbd62c"
BBCLASSEXTEND += "native nativesdk"

View File

@@ -145,4 +145,4 @@ do_install() {
echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
}
SRCREV = "c95f96550fc74b00bb0d3a82e7cb6b0e20bc76ac"
SRCREV = "fa9a234c10ad4499fd6b148cd4360be5a1d61ae9"

View File

@@ -308,4 +308,4 @@ sed -i \
$D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
}
SRCREV = "c95f96550fc74b00bb0d3a82e7cb6b0e20bc76ac"
SRCREV = "fa9a234c10ad4499fd6b148cd4360be5a1d61ae9"

View File

@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtmultimedia"
SRCREV = "db9fba7299d904385e25db40c677cc6201d31df0"
SRCREV = "464eeabb4045f6372be3c0425f2c6f9c4d24f54e"
# The same issue as in qtbase:
# http://errors.yoctoproject.org/Errors/Details/152641/

View File

@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5"
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "cb2e0b59c46bfe234b1d43f2fd31f53199f0252c"
SRCREV = "c22a7b05342fc6bba710f9f259cb56f84885b886"

View File

@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
SRCREV = "b83f9933f1fa01eb84d04476f809c588f4d49caa"
SRCREV = "3787f647cba0379594157fd771b3d0713a0e88ff"

View File

@@ -55,6 +55,6 @@ do_install:append:class-nativesdk() {
rm -rf ${D}${OE_QMAKE_PATH_QML}
}
SRCREV = "32b37e20f7d0aebb9f4138229939dd756d4c05ec"
SRCREV = "eca023e1eb19c6d968701595e99f648efcd1c0c7"
BBCLASSEXTEND =+ "native nativesdk"

View File

@@ -16,4 +16,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "549f7a5482f9a2856d6a1ef2434f9ca0b9713b9b"
SRCREV = "6e2c9fe95af305cf7469afd1887dcbc3cb67c1be"

View File

@@ -18,4 +18,4 @@ RDEPENDS:${PN}-dev = ""
# http://errors.yoctoproject.org/Errors/Build/44912/
LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
SRCREV = "2d4168e142c65411b9258ab48bb1164bd6aa011f"
SRCREV = "5b8120bddcc2b3835e726d3f7cf13810f4a9f130"

View File

@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "3f5d4216e52351a76ba9deae18c7f022c0c8b163"
SRCREV = "a9857aa8d00178d6bf7b711a35705c2c7d1441f0"

View File

@@ -35,7 +35,7 @@ SRC_URI += " \
${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
"
SRCREV_qtlocation = "9909253b0fbf825830a5947a883526ee54fe55af"
SRCREV_qtlocation = "8a1d08112386c165167bc5033d1a507d64110460"
SRCREV_qtlocation-mapboxgl = "d3101bbc22edd41c9036ea487d4a71eabd97823d"
SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"

View File

@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "74d5b59155788fff06efa12d3f2de671e2235b5d"
SRCREV = "77137af2aa5468adebfe13f13d87490cf684cffd"

View File

@@ -40,7 +40,7 @@ SRC_URI += "\
# http://errors.yoctoproject.org/Errors/Build/44914/
LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
SRCREV = "185f37e68e62548e83d16cad3a6cf8850faf4ee4"
SRCREV = "d07f4385c55e5abe36250c3d7f6b130a1bfb75dc"
# Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory
do_install:append() {

View File

@@ -9,4 +9,4 @@ require qt5-git.inc
DEPENDS += "qtbase"
SRCREV = "43c7f5204fe0a4cc1b3c9e7a34dea4559d2b28b1"
SRCREV = "291f9106a764086f720110895f104c5e9a069d6b"

View File

@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "557dece3865641befabd27ca724e2b6ae59b5a53"
SRCREV = "194024fb2944bbca40fcf072cf95644f5ca439cf"

View File

@@ -21,7 +21,7 @@ FILES:${PN}-qmlplugins += " \
${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
"
SRCREV_qtquick3d = "9753b6eaf48ae39d528153f08dd9330813a91723"
SRCREV_qtquick3d = "7a8bdd666c8653f80cdee804e679783a461d5f43"
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
SRCREV_FORMAT = "qtquick3d_assimp"

View File

@@ -12,4 +12,4 @@ DEPENDS += "qtdeclarative qtdeclarative-native"
SRC_URI += "file://0001-Revert-Get-the-scale-of-the-popup-item-when-setting-.patch"
SRCREV = "30cd2468bd94e908a8510e65f982c716f28db52b"
SRCREV = "83cbcc244ac1c1cf65c8b407e0fd905f9d3a41ac"

View File

@@ -17,4 +17,4 @@ FILES:${PN}-qmlplugins += " \
${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
"
SRCREV = "31b940bd0c696a01137a65f58573696a3fb5181b"
SRCREV = "3f0b75ac45c6377093ddec87a869bd1b8fa11857"

View File

@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS = "qtbase qtdeclarative"
SRCREV = "4f06d202d1b6f84b8de2dae4f69295172bb49446"
SRCREV = "06c4975d21c2b043213eb0412becbed240c9baf3"

View File

@@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "4cc0da8ae4d34d9bc89123cfe483a8931092fcaa"
SRCREV = "d0a3719da2797efd95d90043ad2ba4572a2a8533"
BBCLASSEXTEND += "native nativesdk"

View File

@@ -10,7 +10,7 @@ require qt5-git.inc
DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
SRCREV = "49f49bdb84e91c2fa799a29faf53d5ada97d1da8"
SRCREV = "53beea814535e3f27bb2c952856632fba545b1c3"
# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.15
# 5.15.meta-qt5.1

View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "25a92014e7fa1bd9118379105cfb2dd6ca24c123"
SRCREV = "819dc6dc360b90889b6bf9cc961659803589b2df"

View File

@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtserialport"
SRCREV = "792909313f7cc056d0538945500069876cd3c2ee"
SRCREV = "d3394c81f10e5d5c40663e88e185335549e4bc12"

View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "84ccf4dd454fadd15d20919be3c24fd519947e27"
SRCREV = "a90c9fc5ebce3f7d7120563c12103c605aeb8eea"

View File

@@ -1,44 +0,0 @@
From 861999c07eca77807bb000939406d07bfec8e419 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Thu, 4 Mar 2021 14:28:48 +0100
Subject: [PATCH] Clamp parsed doubles to float representable values
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Parts of our rendering assumes incoming doubles can still be sane
floats.
Pick-to: 6.1 6.0 5.15 5.12
Fixes: QTBUG-91507
Change-Id: I7086a121e1b5ed47695a1251ea90e774dd8f148d
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
src/svg/qsvghandler.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp
index b3d9aaf..9dac05c 100644
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
@@ -673,7 +673,8 @@ static qreal toDouble(const QChar *&str)
val = -val;
} else {
val = QByteArray::fromRawData(temp, pos).toDouble();
- if (qFpClassify(val) != FP_NORMAL)
+ // Do not tolerate values too wild to be represented normally by floats
+ if (qFpClassify(float(val)) != FP_NORMAL)
val = 0;
}
return val;
@@ -3046,6 +3047,8 @@ static QSvgStyleProperty *createRadialGradientNode(QSvgNode *node,
ncy = toDouble(cy);
if (!r.isEmpty())
nr = toDouble(r);
+ if (nr < 0.5)
+ nr = 0.5;
qreal nfx = ncx;
if (!fx.isEmpty())

View File

@@ -12,6 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRC_URI:append = " file://0001-Clamp-parsed-doubles-to-float-representable-values.patch"
SRCREV = "da19a7140dfd23a42792274ca4f497f20ffd29f4"
SRCREV = "b13c2d7fe8810af13a3f9400ecff4ff7c4c7ab51"

View File

@@ -39,7 +39,7 @@ EXTRA_QMAKEVARS_PRE += " \
${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath CONFIG+=assistant', 'CONFIG+=noqdoc', d)} \
"
SRCREV = "d488fd08333d53636880c9b2198ef38ef17cf56c"
SRCREV = "7e2102f2ebb2b42e9249bab3327f939204053100"
BBCLASSEXTEND = "native nativesdk"

View File

@@ -98,4 +98,4 @@ FILES:${PN}-qthelp = " \
${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
"
SRCREV = "726e47301f7e0e0a85534e7686f00521de15f1f6"
SRCREV = "8f0756f2c29cc7bb7e9a016612f15779193109ad"

View File

@@ -71,4 +71,4 @@ FILES:${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
SRCREV = "5ab286d42421f387d8f2d23b33225ec2469958d7"
SRCREV = "436e9407c5dd2e2aa26d7c277f0f0e614d73b8cc"

View File

@@ -48,7 +48,7 @@ PACKAGECONFIG[wayland-vulkan-server-buffer] = "-feature-wayland-vulkan-server-bu
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "f9dfeb6e7236711cba303858005693d40e90be90"
SRCREV = "f1e6c8764d187e9c1c642f6b11020ea513822cd1"
BBCLASSEXTEND =+ "native nativesdk"

View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtdeclarative qtwebsockets"
SRCREV = "30faac50ff3feb0def83a84126d4c0725fdb5953"
SRCREV = "fe29fe07daf7e43fcd6f5fd135b8567d83260fb4"

View File

@@ -18,4 +18,4 @@ do_configure:prepend() {
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
SRCREV = "4eb3929a15d42efd855d8af3fec1abebc79634c5"
SRCREV = "37f4fdd9aa3315467a6c893059a9ef7270fc2388"

View File

@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "428f9cb79dc3b649122c63e763a213afb2d9e60f"
SRCREV = "d57f4a2226153848bd2fd0ee6d10f5146b1e8554"

View File

@@ -23,4 +23,4 @@ python() {
if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
}
SRCREV = "00745be5c1d9c6cbe62cfdf4172c3720155a5c43"
SRCREV = "d7f28171b291e6a3d660b847b40cac3c55295471"

View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "e2146e32f300c854a669dd7e4e05b8606a4e62bf"
SRCREV = "069b45405667c30fa746541d5e3cb328163cfd15"

View File

@@ -25,6 +25,6 @@ do_configure:prepend() {
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
SRCREV = "4d471ba94cfee1e27efe011ed0c2d4313136412c"
SRCREV = "82a7136a7caece13767c3b2808b2aad9d3d79dd3"
BBCLASSEXTEND =+ "native nativesdk"