mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-09-09 15:44:44 +02:00
Update to Qt 5.12.12
Signed-off-by: Dan Ackers <dan.ackers@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
@@ -197,4 +197,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 = "4341f6763b8a737ebc07bb78ead22bc05a1a515b"
|
||||
SRCREV = "01272c0948be9f1c6b8a3eff328b931f47d38649"
|
||||
|
||||
@@ -36,6 +36,6 @@ do_configure_prepend() {
|
||||
${S}/src/quick3d/imports/input/importsinput.pro
|
||||
}
|
||||
|
||||
SRCREV = "6704dfddcb6630809abc55b420dd125aa292922e"
|
||||
SRCREV = "e04a70eb3b6e11a2eddc1ac912f3aecfb23ac6c0"
|
||||
|
||||
BBCLASSEXTEND += "native nativesdk"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# Copyright (C) 2013-2019 Martin Jansa <martin.jansa@gmail.com>
|
||||
|
||||
QT_MODULE ?= "${BPN}"
|
||||
QT_MODULE_BRANCH ?= "5.12.11"
|
||||
QT_MODULE_BRANCH ?= "5.12.12"
|
||||
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.12.11+git${SRCPV}"
|
||||
PV = "5.12.12+git${SRCPV}"
|
||||
|
||||
@@ -144,4 +144,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 = "4341f6763b8a737ebc07bb78ead22bc05a1a515b"
|
||||
SRCREV = "01272c0948be9f1c6b8a3eff328b931f47d38649"
|
||||
|
||||
@@ -298,4 +298,4 @@ sed -i \
|
||||
$D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
|
||||
}
|
||||
|
||||
SRCREV = "4341f6763b8a737ebc07bb78ead22bc05a1a515b"
|
||||
SRCREV = "01272c0948be9f1c6b8a3eff328b931f47d38649"
|
||||
|
||||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS = "qtdeclarative"
|
||||
|
||||
SRCREV = "3c642062e896f3c6f300108ece203f89f68e578f"
|
||||
SRCREV = "b7080e5e66f2c799251bc637fd7dcaca7dda24cf"
|
||||
|
||||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia"
|
||||
|
||||
SRCREV = "d8d2057cbfcf190908a9780085726200bcfe5590"
|
||||
SRCREV = "acecb7321c22267d9372d2e23a452592cb5e45e9"
|
||||
|
||||
# The same issue as in qtbase:
|
||||
# http://errors.yoctoproject.org/Errors/Details/152641/
|
||||
|
||||
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5"
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "8618e25e01ca9c6c6b2221041f625ac69f6757b8"
|
||||
SRCREV = "6141231525a64232bfb00960a6d4ad181d5bef2f"
|
||||
|
||||
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
|
||||
|
||||
SRCREV = "e2c93beb40914118861a329889c08ca04fb54577"
|
||||
SRCREV = "7cf388560ac989d19294aed6f6fbca74b761ac7d"
|
||||
|
||||
@@ -24,7 +24,7 @@ do_install_append_class-nativesdk() {
|
||||
rm -rf ${D}${OE_QMAKE_PATH_QML}
|
||||
}
|
||||
|
||||
SRCREV = "ca5d6cccde1f977eedb46f3320fe8384ea41758e"
|
||||
SRCREV = "824570979e211171f158e7fcab15c599c5e7ca4e"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
|
||||
@@ -16,4 +16,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "dd95a7e0c6a8f00cc6f97f3db17eb7abcadef91a"
|
||||
SRCREV = "7977b4ddad8fdd847424d3b517c288bacc21a021"
|
||||
|
||||
@@ -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 = "b2634e344d73154aea459031cf8fa298e668c4fa"
|
||||
SRCREV = "266b575c61ce4e3689d48663a93ef235006613eb"
|
||||
|
||||
@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "25341cf53dfa36c83b74c125c260c72d2477ba5d"
|
||||
SRCREV = "97151e285f51a54bf0025b1ca986bf3d07cc4854"
|
||||
|
||||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "171677eca8e86680d66058d4d42dd2caad8142a3"
|
||||
SRCREV = "6797fc9a75cf308bd39e557c8474c30fb71582c2"
|
||||
|
||||
@@ -36,7 +36,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 = "1467a23cb25779d304e5bcdd6feb1b059c6609e6"
|
||||
SRCREV_qtlocation = "1731750f2907c3498a06c02f9f271b392a9501fb"
|
||||
SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53"
|
||||
|
||||
SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
|
||||
|
||||
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "5cb065944cbdbaa25d9236d7c990b2d683541374"
|
||||
SRCREV = "10b4ea4c141567c33c6646b36e0207f90535b5a0"
|
||||
|
||||
@@ -39,4 +39,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 = "a83b9873c0d2fe6001e3653e7ec8126c368dfd39"
|
||||
SRCREV = "6a7742432e2c1541f65cfcf8a4137dd42f783d3a"
|
||||
|
||||
@@ -9,4 +9,4 @@ require qt5-git.inc
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "c8ee9188de609b4432e70a8b1edbc52d756c348d"
|
||||
SRCREV = "7739b4b995977445695457c57bbd7008f2d39e67"
|
||||
|
||||
@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = ""
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "9e378827c597ed83a52b72545730bd77f97333c9"
|
||||
SRCREV = "c514ea1d1806886664dc46626de7679038564110"
|
||||
|
||||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "e6f9faf8b2e3b8973875913859962946874ce36f"
|
||||
SRCREV = "6d3d2b2b659caa8dd158a1aedd796bed9b2e3a2d"
|
||||
|
||||
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtdeclarative qtdeclarative-native"
|
||||
|
||||
SRCREV = "249469f9ee1ca682e2d2b69da57e4408f6354290"
|
||||
SRCREV = "898091385d34427ec2032bcee15b5ceb4d10286e"
|
||||
|
||||
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
|
||||
${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
|
||||
"
|
||||
|
||||
SRCREV = "8b9258bea9928718827f19e3f2de43ad2e06f863"
|
||||
SRCREV = "3fa3824bdf1eacf00e96fc2f34ce5709acc56663"
|
||||
|
||||
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "287260928b5ca3b8bc4137daeaf9cfd78763a08d"
|
||||
SRCREV = "e984c11fd225bbe807762e105a2b6c701eeb3917"
|
||||
|
||||
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 = "1864a837cb69bd827222a8a7ab738b576f0fe1f2"
|
||||
SRCREV = "337059fe1ce7d3236a6a7cec1c3622fe3e911921"
|
||||
|
||||
@@ -10,7 +10,7 @@ require qt5-git.inc
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
|
||||
|
||||
SRCREV = "585b47f5a171a0c1052fae5b7a575d27893caafd"
|
||||
SRCREV = "a5482507a444dc06774fb0365eddd73e5dac114c"
|
||||
|
||||
# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12
|
||||
# 5.12.meta-qt5.2
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "a24dc8e867bbf97078babec7b752ccaf6638cea3"
|
||||
SRCREV = "6af0f5497c5c550c449036ddbd7a4684faadde8f"
|
||||
|
||||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtserialport"
|
||||
|
||||
SRCREV = "0a751b7ca63b96a2642dea4f2d012099a2f1aebf"
|
||||
SRCREV = "29d038921e929ad4d6a56857de7fef368f4cd7fc"
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "9f839731d9a2dfa7ca022afabda8a2071f55e174"
|
||||
SRCREV = "dbc00fa42ac4779cf2846640c3117c351de04aa5"
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "9311a42677db244cd1c584f27270fa73f69d90d7"
|
||||
SRCREV = "85485845bdf502674edf4d5b840f0194e62da7bb"
|
||||
|
||||
@@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \
|
||||
${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \
|
||||
"
|
||||
|
||||
SRCREV = "cceb7710cf287ea88b72260093de985987d83f56"
|
||||
SRCREV = "9ff3504a4387f87a38e3207fe9c3c5d2a9428d5b"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
|
||||
@@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \
|
||||
${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \
|
||||
"
|
||||
|
||||
SRCREV = "161225fb99099f67ac4a2b41eb051c062e34a91d"
|
||||
SRCREV = "62e14d18353f19b5747275a08f808e962f1f0b57"
|
||||
|
||||
@@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
|
||||
|
||||
SRCREV = "ed820383941b68f1fe244895e73ee61ba87c4377"
|
||||
SRCREV = "e5f70404fd6f9aa64dd6dd2435d6340d46821b47"
|
||||
|
||||
@@ -39,7 +39,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris
|
||||
|
||||
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
|
||||
|
||||
SRCREV = "8fe61d79d6d629958da7e590174a0e0600652bed"
|
||||
SRCREV = "190646bcf0ae20174f32a240a81c9830dedd3c9b"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtdeclarative qtwebsockets"
|
||||
|
||||
SRCREV = "ee94974592b1423b0438f809390a9237cdc8f1e4"
|
||||
SRCREV = "4d43a2fbdb4c43d9ae232dc5d646514fca525e3a"
|
||||
|
||||
@@ -180,8 +180,8 @@ SRC_URI_append_libc-musl = "\
|
||||
file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
|
||||
"
|
||||
|
||||
SRCREV_qtwebengine = "9dfb4348feb612ea6405428c3c64f48328083e94"
|
||||
SRCREV_chromium = "bda00397362bf03ff7b8d88fa54625524f604c7e"
|
||||
SRCREV_qtwebengine = "56e97848125329780566db8164c9753872e65f0f"
|
||||
SRCREV_chromium = "78831e7aca3f82a0c64499706c8017c13389efa3"
|
||||
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 = "b3089f235788650eac329c552393a36b3f65f06a"
|
||||
SRCREV = "1c9f1fef2cc13d63086fdeaa536d4e5465c126d2"
|
||||
|
||||
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "56c4699b432ad2ea9e1de9922ee97ac7c637f2fc"
|
||||
SRCREV = "78c04c8d106339ae78259ccf2c5e03e7a8bce087"
|
||||
|
||||
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
|
||||
COMPATIBLE_MACHINE_armv7ve = "(.*)"
|
||||
COMPATIBLE_MACHINE_aarch64 = "(.*)"
|
||||
|
||||
SRCREV = "fa3d166d96c958d62c5f02c1f6475ce1fb3f08b5"
|
||||
SRCREV = "a62f0e2ddf4c884a0d535df91edb4dfe21e8dfca"
|
||||
|
||||
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
|
||||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "2f7e2243c613677efe386d8e1ca0699a4050b0d2"
|
||||
SRCREV = "d1f806ed5eed226b35e94f91381e2533cdd6a5ff"
|
||||
|
||||
@@ -25,7 +25,7 @@ do_configure_prepend() {
|
||||
|
||||
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
|
||||
|
||||
SRCREV = "bac4d2eb31cc7d2df246fe069376dad0ed531dc8"
|
||||
SRCREV = "6d445812a9c584c8483511023acb25e17f20ca25"
|
||||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user