qt5: upgrade to v5.15.9-lts-lgpl

Update all available SRCREVs and remove obsolete patches

https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/5.15.8/release-note.md
https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/5.15.9/release-note.md

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Bernhard Hartleb
2023-04-11 16:31:35 +02:00
committed by Martin Jansa
parent 41fefb7cf4
commit abd817d752
41 changed files with 45 additions and 84 deletions

View File

@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
file://LICENSE.QT-LICENSE-AGREEMENT;md5=c8b6dd132d52c6e5a545df07a4e3e283 \
file://LICENSE.QT-LICENSE-AGREEMENT;md5=71469b4021772fca0f18e08b1ef8ac7e \
"
QT_MODULE = "qtbase"
@@ -202,4 +202,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 = "358aebba7280d6d2b59b1f740747a4a3d1b7a54a"
SRCREV = "42e4ae042a4c86e58bcb8b6d2d59ba4a988285b4"

View File

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

View File

@@ -14,4 +14,4 @@ CVE_PRODUCT:append = " qt"
S = "${WORKDIR}/git"
PV = "5.15.7+git${SRCPV}"
PV = "5.15.9+git${SRCPV}"

View File

@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
file://LICENSE.QT-LICENSE-AGREEMENT;md5=c8b6dd132d52c6e5a545df07a4e3e283 \
file://LICENSE.QT-LICENSE-AGREEMENT;md5=71469b4021772fca0f18e08b1ef8ac7e \
"
require qt5-native.inc
@@ -146,4 +146,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 = "358aebba7280d6d2b59b1f740747a4a3d1b7a54a"
SRCREV = "42e4ae042a4c86e58bcb8b6d2d59ba4a988285b4"

View File

@@ -1,37 +0,0 @@
From 4e00087b393183493a0f7115fd41efc867bd3421 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 1 Jan 2023 21:30:23 -0800
Subject: [PATCH] zlib: Do not undefine _FILE_OFFSET_BITS
This is required for 64bit time_t to work with glibc as it needs
_FILE_OFFSET_BITS to be defined as 64 as well.
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/3rdparty/zlib/src/gzguts.h | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/src/3rdparty/zlib/src/gzguts.h b/src/3rdparty/zlib/src/gzguts.h
index 20de7cb4ce..f6ab9357c7 100644
--- a/src/3rdparty/zlib/src/gzguts.h
+++ b/src/3rdparty/zlib/src/gzguts.h
@@ -12,15 +12,6 @@
# endif
#endif
-#ifdef _LARGEFILE64_SOURCE
-# ifndef _LARGEFILE_SOURCE
-# define _LARGEFILE_SOURCE 1
-# endif
-# ifdef _FILE_OFFSET_BITS
-# undef _FILE_OFFSET_BITS
-# endif
-#endif
-
#ifndef QT_BOOTSTRAPPED
# include <qconfig.h>
#endif
--
2.39.0

View File

@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
file://LICENSE.QT-LICENSE-AGREEMENT;md5=c8b6dd132d52c6e5a545df07a4e3e283 \
file://LICENSE.QT-LICENSE-AGREEMENT;md5=71469b4021772fca0f18e08b1ef8ac7e \
"
# common for qtbase-native, qtbase-nativesdk and qtbase
@@ -37,7 +37,6 @@ SRC_URI += "\
file://0019-tst_QPluginLoader-Simplify-creating-a-fake-pointer-i.patch \
file://0021-rcc-Just-dcument-file-name-without-full-path-to-redu.patch \
file://0022-testlib-don-t-track-the-build-or-source-directories.patch \
file://0023-zlib-Do-not-undefine-_FILE_OFFSET_BITS.patch \
"
# Disable LTO for now, QT5 patches are being worked upstream, perhaps revisit with
@@ -310,4 +309,4 @@ sed -i \
$D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
}
SRCREV = "358aebba7280d6d2b59b1f740747a4a3d1b7a54a"
SRCREV = "42e4ae042a4c86e58bcb8b6d2d59ba4a988285b4"

View File

@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtmultimedia"
SRCREV = "df56d9b4e6373b5975b6cf636ffb5ccdebe9e9fc"
SRCREV = "3d4a84eb6d62ce22a47794f309f9268729ac375f"
# 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 = "09e33f25138deceaf810b2ad4936ae8ed9dfe7a8"
SRCREV = "3dcb548bd6fe4aa488ca0bac95e65a7a366c3eca"

View File

@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
SRCREV = "15a66695ccc64f8b276f01b10fde427e3b889745"
SRCREV = "7636478bb30f0af8afe9af429eb8512d6fbcc11b"

View File

@@ -53,6 +53,6 @@ do_install:append:class-nativesdk() {
rm -rf ${D}${OE_QMAKE_PATH_QML}
}
SRCREV = "0d60f81bf61a69bc859a269ae562b2610d224e02"
SRCREV = "19ed7973a311a8d42d3a558bb551230e902ce9b9"
BBCLASSEXTEND =+ "native nativesdk"

View File

@@ -16,4 +16,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "674f21205720610eda7ad1ae1e4a8692fc959f69"
SRCREV = "7c05744e38d44afac687df3349d548c8790837db"

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 = "dfacc1706eaf9ec306e2f660be393ecffe9637fb"
SRCREV = "06cfcbb6940d2729f5a6575e264873ce65ac99c3"

View File

@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "078bc3fa18ea102525bcd831c3b4ed4cca7dc74e"
SRCREV = "1f67161fea6beb2ed4c09849abe446c6a880af8a"

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 = "e0d60def8e32fb255ee003742f165f2033d25e1d"
SRCREV_qtlocation = "e3e9f9bf42c22565f226b3431cb8c17502cc2e7a"
SRCREV_qtlocation-mapboxgl = "d3101bbc22edd41c9036ea487d4a71eabd97823d"
SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"

View File

@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "0dcf0bb9cf72254d77cea7558b3c04c40a48f029"
SRCREV = "f9f123a97989638c36b5c2b03f4ff6261ddaed9a"

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 = "eeb34aae03b9395c9b3b45ab7c4f3055d086e894"
SRCREV = "9dbea27ea43206c2d210e4b4cc48af169ada3847"
# 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 = "361be878e4a3d098a119dd7f648ae8fc29e14674"
SRCREV = "59311ee7d78a8b19d3dbe61cf49d42c5bd7c934a"

View File

@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "267f179714eff834f95ce79346d7f1215e94b24f"
SRCREV = "5737c10128c6eeb28c10df569c8492bb2e8f4230"

View File

@@ -21,7 +21,7 @@ FILES:${PN}-qmlplugins += " \
${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \
"
SRCREV_qtquick3d = "cb8f82eeeb230c3ef38ac6e7f5ca393ccb8e6e1f"
SRCREV_qtquick3d = "a78f1c57dfb3459be43c856d6bda16f3dfdc3b15"
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 = "8b7daceeb829b4dbf52c95510d4934d1c6df380d"
SRCREV = "5e31cdc9dda940aee38cf8de4ddbbeb2c0cebfc7"

View File

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

View File

@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS = "qtbase qtdeclarative"
SRCREV = "fca37ec8141012818a0518205da11f5f6b3d414c"
SRCREV = "dd5d4af65890baad8baa85a445a752a877a4f7e3"

View File

@@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "62bf1183d12abe98df45139ccf15848b989b2e36"
SRCREV = "27b496d5aff650e4cf9a3148857c723dce10ef25"
BBCLASSEXTEND += "native nativesdk"

View File

@@ -36,5 +36,4 @@ DEPENDS += "qtbase"
# http://errors.yoctoproject.org/Errors/Build/44915/
LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
# v5.15.8-lts
SRCREV = "4d8e4bd20b7100b0b7192547b19c3c239aaf7034"
SRCREV = "4f8c35a528586541ea55bb8b3361eaa6749e52b1"

View File

@@ -10,7 +10,7 @@ require qt5-git.inc
DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
SRCREV = "c0e5685aab498d443b17250dddef6cdf6fdec108"
SRCREV = "d30a77111835395828fdcaa89a88110c5d9f6857"
# 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 = "d9574231fd48a2961457f74ce6620550cff45847"
SRCREV = "391c710b88865a3e0311b61d93fcdbbfd6996d46"

View File

@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtserialport"
SRCREV = "6a0cd4b02964100ef3e71457a5b5396c88a22660"
SRCREV = "f8684ae6b0c12b6b21f1547fabe38b60c39f8893"

View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "cf4e7a066f7ce2a17dbe961cd50366a4eb3e2672"
SRCREV = "7fb308ec721f034a0d673784d951577d764a8e67"

View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "a5d2402512775c78bde93a800ec833dae9e2ffbe"
SRCREV = "78ec450b81c403d3b4e6a2c178e300cef3637cca"

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 = "7fda805bf006e10648606ddd8482cc9aae7476cb"
SRCREV = "1e7d50937f4b94c37a16f6370c0fd4ccb4329190"
BBCLASSEXTEND = "native nativesdk"

View File

@@ -98,4 +98,4 @@ FILES:${PN}-qthelp = " \
${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
"
SRCREV = "1ec28c4aa6b0f9772e99bd8d556bb4552aafcf72"
SRCREV = "2b802231af3eb21c3c781753aba804217f855e86"

View File

@@ -73,4 +73,4 @@ FILES:${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
SRCREV = "d8b87cbb28561654121d44b5d7dedb361e6f773c"
SRCREV = "4191fd9098ae25ffd5917370427460842e73f0cb"

View File

@@ -49,7 +49,7 @@ PACKAGECONFIG[wayland-vulkan-server-buffer] = "-feature-wayland-vulkan-server-bu
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
SRCREV = "533fff12f7c4beb177b56b766c71b1c7384e6229"
SRCREV = "8f56244ea77a54da7593a7d65a4e5470d34e905e"
BBCLASSEXTEND =+ "native nativesdk"

View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtdeclarative qtwebsockets"
SRCREV = "a4b41a45a0f583ee7fd887cfb6bf4a5b1cf53aa0"
SRCREV = "c23cff71f1b8f69b3ca2e08cfe11d9673de87366"

View File

@@ -1,13 +1,13 @@
From 8031326dbf1252f76f6aac9dcef5611fd7be5fa4 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Fri, 12 Mar 2021 15:47:50 +0100
Subject: [PATCH] qmake.conf: lower MODULE_VERSION to 5.15.7
Subject: [PATCH] qmake.conf: lower MODULE_VERSION to 5.15.9
* to avoid incompatibility when searching for qtwebchannel:
CMake Error at /OE/build/luneos-hardknott/webos-ports/tmp-glibc/work/core2-64-webos-linux/org.webosports.app.browser/0.5.0-14+gitAUTOINC+4b5398142b-r0/recipe-sysroot/usr/lib/cmake/Qt5WebEngineCore/Qt5WebEngineCoreConfig.cmake:116 (find_package):
Could not find a configuration file for package "Qt5WebChannel" that is
compatible with requested version "5.15.7".
compatible with requested version "5.15.9".
The following configuration files were considered but not accepted:
@@ -32,4 +32,4 @@ index 83823ceee..d5e64505d 100644
CONFIG += warning_clean
-MODULE_VERSION = 5.15.10
+MODULE_VERSION = 5.15.7
+MODULE_VERSION = 5.15.9

View File

@@ -200,7 +200,7 @@ SRC_URI:append:libc-musl = "\
file://chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \
"
SRCREV_qtwebengine = "c7e716ef1ffd63a8ab1f4dbf879230849eb3b505"
SRCREV_qtwebengine = "4f570bd7add21725d66ac8396dcf21917c3a603f"
# this is 3 commits ahead of what submodule in 5.15.10 uses (caba2fcb0fe8a8d213c4c79d26da3bb88eee61c7), but contains useful fix:
SRCREV_chromium = "ecc2bb74f1f7140fc52650042299be18e826b27b"
SRCREV = "${SRCREV_qtwebengine}"

View File

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

View File

@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
SRCREV = "4fe33a26f24770069b264771e89361eeecc646f3"
SRCREV = "7d09b6961496f6cc33668ef494d0b58f75004fcb"

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 = "575089ad2fd15568ab73aded0b7ef3bb92e72e88"
SRCREV = "23d67d0de3301dbed5d8c5880b6cf60bfa9eeb2a"

View File

@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "93d090c6d3f9e16683ef86028cf1e72a852929f5"
SRCREV = "8bba77a558049727d1bc88736dd03d1b5c41cead"

View File

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