mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-09-16 20:21:56 +02:00
qt5: upgrade to latest revisions in 5.15 branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
@@ -195,4 +195,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 = "0ab53fbdda2fd7f24f45dcd52fbd195e282554da"
|
||||
SRCREV = "291b3cebb905c3924eefa1e5a7c6ac31ca89aacd"
|
||||
|
||||
@@ -36,6 +36,6 @@ do_configure_prepend() {
|
||||
${S}/src/quick3d/imports/input/importsinput.pro
|
||||
}
|
||||
|
||||
SRCREV = "5aedae5aa9251e1216d7bc1652cb1f451dd047c1"
|
||||
SRCREV = "aa7c8a5cb1111d46289e6b370dcd5b1d3f66c80d"
|
||||
|
||||
BBCLASSEXTEND += "native nativesdk"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# Copyright (C) 2013-2020 Martin Jansa <martin.jansa@gmail.com>
|
||||
|
||||
QT_MODULE ?= "${BPN}"
|
||||
QT_MODULE_BRANCH ?= "5.14"
|
||||
QT_MODULE_BRANCH ?= "5.15"
|
||||
QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
|
||||
|
||||
# each module needs to define valid SRCREV
|
||||
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
PV = "5.14.1+git${SRCPV}"
|
||||
PV = "5.14.99+git${SRCPV}"
|
||||
|
||||
@@ -143,4 +143,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 = "0ab53fbdda2fd7f24f45dcd52fbd195e282554da"
|
||||
SRCREV = "291b3cebb905c3924eefa1e5a7c6ac31ca89aacd"
|
||||
|
||||
@@ -297,4 +297,4 @@ sed -i \
|
||||
$D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
|
||||
}
|
||||
|
||||
SRCREV = "0ab53fbdda2fd7f24f45dcd52fbd195e282554da"
|
||||
SRCREV = "291b3cebb905c3924eefa1e5a7c6ac31ca89aacd"
|
||||
|
||||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia"
|
||||
|
||||
SRCREV = "97e9be186913cf1a2857fd34f994fbb74a508c3b"
|
||||
SRCREV = "41bdefce20be3ebbeebaba215402211664a29c79"
|
||||
|
||||
# The same issue as in qtbase:
|
||||
# http://errors.yoctoproject.org/Errors/Details/152641/
|
||||
|
||||
@@ -11,4 +11,4 @@ PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative"
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "7dc2630196197363f1861e23bb8eef6f53074eff"
|
||||
SRCREV = "8d3da74a5828b4c09847342bc45855d0889ede7d"
|
||||
|
||||
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5"
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "a9b5b10ce113db1c1bb3d42d058caa7b8e1a964a"
|
||||
SRCREV = "79702f744e4906155736967dea1af5433355c71a"
|
||||
|
||||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
|
||||
|
||||
SRCREV = "6b15c2bee08a0477e718a407fdf81917a064c1ca"
|
||||
SRCREV = "9ba8b807d002e0b93afe5e08221cf6c38b0055fb"
|
||||
|
||||
@@ -31,6 +31,6 @@ do_install_append_class-nativesdk() {
|
||||
rm -rf ${D}${OE_QMAKE_PATH_QML}
|
||||
}
|
||||
|
||||
SRCREV = "51a158929b55dffbdfb757da8bd6a2cd181906c6"
|
||||
SRCREV = "b3ff342d327dc00d99281dca4fbfe6c4300aa6c6"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "89e9949e720dba11e6f6f05b50c3523a2eca37d7"
|
||||
SRCREV = "3c91ce46a69449a0350b63a17c79cd69090ffcc0"
|
||||
|
||||
@@ -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 = "4d271e84875a8dc9dd582139e7235497816f9f82"
|
||||
SRCREV = "20f436e045bc4636af6acecfa11478f926d4be42"
|
||||
|
||||
@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "bcced9cb1baefe3507338a602fe95be915798661"
|
||||
SRCREV = "d89c6be6f28182111cabe9547d10e31d8a7cd05f"
|
||||
|
||||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "bddcb323228191945c9e3a8644cc4307158d4551"
|
||||
SRCREV = "e4b624f9af5eab253c75a8800e497662b57648c7"
|
||||
|
||||
@@ -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 = "bdd1967a3901432eaa6c152eee547e3d322b4a98"
|
||||
SRCREV_qtlocation = "47391b2d74f65ea3a3a67c0a5359499582d6cfdb"
|
||||
SRCREV_qtlocation-mapboxgl = "d9577fdebe019b19e184b4cac82749ae9ec87afb"
|
||||
|
||||
SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
|
||||
|
||||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "42ec006a0b82ba24eaa13b45e959d85cd9bb0d02"
|
||||
SRCREV = "f5cc3184f30c9fa1b81d931430aaa4f6f23267a3"
|
||||
|
||||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "c27f0d93b6034748d311c233020465554bdab79c"
|
||||
SRCREV = "d8ef5280d7d0773ac0b415994e6978e96fe228cc"
|
||||
|
||||
@@ -38,4 +38,4 @@ 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 = "2091eac697ff6f7be03203d3180633a417c8c58c"
|
||||
SRCREV = "70f5eb4f707ce84cbf153899d33d6bd8656be682"
|
||||
|
||||
@@ -9,4 +9,4 @@ require qt5-git.inc
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "ada2b06b4523ab7c88e4a5e93f7987f1f0677d4e"
|
||||
SRCREV = "3e3f047e59db88e806b3c1fd94c4a996f5317b68"
|
||||
|
||||
@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = ""
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "4a9653f36d528e30989ea4e00a15a6d06a19001f"
|
||||
SRCREV = "7edb958482ddf3670a6a366d186883478aab1441"
|
||||
|
||||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "ad9f777a6e40ee95a9d220dcfadfcd4e513fbf2e"
|
||||
SRCREV = "3ef91292426c4aa56989e843e1c675a7ba6ac1c9"
|
||||
|
||||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtdeclarative qtdeclarative-native"
|
||||
|
||||
SRCREV = "7be5d463e25218a2987d6c1735fd81bc226b29b6"
|
||||
SRCREV = "35afc8d21b2f705463ec56d3e11679efb798b757"
|
||||
|
||||
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
|
||||
${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
|
||||
"
|
||||
|
||||
SRCREV = "c8a2a74b2839d9d6c5f8f6f9034470dafc8bcc40"
|
||||
SRCREV = "7a806347167607172ee38c60d30808b298224a8b"
|
||||
|
||||
@@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "0cb1384479a2ebcbc72a3941462fb3e67aaa884d"
|
||||
SRCREV = "09838389f3b9eaf67ad2e0b02a85a62a63fbfc38"
|
||||
|
||||
BBCLASSEXTEND += "native nativesdk"
|
||||
|
||||
@@ -36,4 +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)}"
|
||||
|
||||
SRCREV = "77b77e351f0faa3376da330d14236087cc7e6b46"
|
||||
SRCREV = "3a358430efe797fe1c0f1aa7f701f9139a642d6f"
|
||||
|
||||
@@ -10,7 +10,7 @@ require qt5-git.inc
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
|
||||
|
||||
SRCREV = "acc2d33514d741cde8f67521b4d60e398171f6a8"
|
||||
SRCREV = "bae669b37d3828eb73e78e7c77f0a5fccf8e3150"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.14
|
||||
# 5.14.meta-qt5.1
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "6beffc03d6a55adc06177a2e5d53811c5ab26bc8"
|
||||
SRCREV = "63c972ad9e15b673779147c4c263ed2ac5312a28"
|
||||
|
||||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtserialport"
|
||||
|
||||
SRCREV = "948edd56ece2f2b5fdcd9fc050efd72e27adcc13"
|
||||
SRCREV = "a3aa54e27094b80feae4e42c5f7e22c3d4022b49"
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "85389370bf5f6c8b560e906c8027713b1858929e"
|
||||
SRCREV = "b30052fa41f6332f20ec440dcdbcd06b41a954f5"
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "3e2823a147b2dca492fece187facfe39f4d33bed"
|
||||
SRCREV = "f48bf0293a682aef90e6e5b16cf5a9a06b7a32d2"
|
||||
|
||||
@@ -49,6 +49,6 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\
|
||||
${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \
|
||||
"
|
||||
|
||||
SRCREV = "3300714730761ac23f5c9753071a46685eb87d0e"
|
||||
SRCREV = "d8a971b8475035f61e1ad3baaef6a8c49556c42d"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \
|
||||
${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
|
||||
"
|
||||
|
||||
SRCREV = "8b7c8801f2317bef8e21e9080ce242cbb7818a98"
|
||||
SRCREV = "9d7437583d7475aa069ec5aa786fa9c5aa36253b"
|
||||
|
||||
@@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
|
||||
|
||||
SRCREV = "e73bd4875d5a07d5357bbcb46d581dd32b3821de"
|
||||
SRCREV = "39a3c50f6f3d3aff52853510543388638a2524d5"
|
||||
|
||||
@@ -41,7 +41,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "c2f216ef211ae8fbe0073c296742f584f5493e9f"
|
||||
SRCREV = "cfc4043626e05649e51607a92ceb87d31e0d1b06"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtdeclarative qtwebsockets"
|
||||
|
||||
SRCREV = "edaf98129a60fda1d017db805b2e5d63902598ea"
|
||||
SRCREV = "facf59c1eae3958b8c2972c167cede215219c814"
|
||||
|
||||
@@ -190,8 +190,8 @@ SRC_URI_append_libc-musl = "\
|
||||
file://chromium/0023-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
|
||||
"
|
||||
|
||||
SRCREV_qtwebengine = "73d457481caff493066d9cce50087b56ee506f6a"
|
||||
SRCREV_chromium = "a9a20127e8adeb3f3cd7921b0bec32083103cc5c"
|
||||
SRCREV_qtwebengine = "d9349a299f66fb154ad24f410451872a7ca253fb"
|
||||
SRCREV_chromium = "5b79320c01316f29510df90f7c6b508b9f72b8a4"
|
||||
SRCREV = "${SRCREV_qtwebengine}"
|
||||
|
||||
SRCREV_FORMAT = "qtwebengine_chromium"
|
||||
|
||||
@@ -18,4 +18,4 @@ do_configure_prepend() {
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
|
||||
|
||||
SRCREV = "11324948c1a68233d08726c13571d394b85f4d13"
|
||||
SRCREV = "ab0d58ef0a2cd21eab7dc612004e416d3d55a78e"
|
||||
|
||||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "ba3acb9d9c7b5234071143d7980576e7eceb6102"
|
||||
SRCREV = "127d475324c2133b8d7e2f4712e71d14fa84c560"
|
||||
|
||||
@@ -19,9 +19,8 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
|
||||
COMPATIBLE_MACHINE_armv7ve = "(.*)"
|
||||
COMPATIBLE_MACHINE_aarch64 = "(.*)"
|
||||
|
||||
SRCREV = "94c697c37945dedb37a55c1a9669d868f8c97f41"
|
||||
|
||||
python() {
|
||||
if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
|
||||
raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
|
||||
}
|
||||
SRCREV = "3de65bf9daf1d0e61300cdfe44d3eca51636d438"
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "ea1ce1167fca96a1663ced0d7d6c2da9c20240b9"
|
||||
SRCREV = "8136ffdfe8ec8fe1b005fc5e72d66e0fd160b583"
|
||||
|
||||
@@ -25,6 +25,6 @@ do_configure_prepend() {
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
|
||||
|
||||
SRCREV = "0fa22b3674db3d48bbd0b091b7710158ae152daa"
|
||||
SRCREV = "2dfdd4f0bdd6647c104470712f0e463021488e43"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
Reference in New Issue
Block a user