From 26205f49f51b5727d75bf8f02a894e04bf7b7942 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 7 Mar 2019 20:53:22 +0200 Subject: qt5: update submodules Update to Qt 5.12.2 (RC2) Task-number: QTBUG-73533 Change-Id: If890d5e95baecd16f3423ffb3c64f0caccaa6fad Reviewed-by: Antti Kokko --- recipes-qt/qt5/qtwebengine_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine_git.bb') diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index fb999c66..d6730cf9 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -174,8 +174,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "b47b28d3cfb8b249cce343031507864de99117a7" -SRCREV_chromium = "493fab1afff5034cb5552455add3af3aaf41f9e9" +SRCREV_qtwebengine = "92b078a534390dba64a0dcebcffdab4ce24581b6" +SRCREV_chromium = "43316b156e65f867a76ed2afd96bf30696c5f4f6" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" -- cgit v1.2.3-54-g00ecf From d4f557ae7c0e82b589ee5282d37360911efd2593 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 25 Mar 2019 09:26:22 +0200 Subject: qt5: update submodules Update to latest content in Qt 5.12(.3) branch Task-number: QTBUG-74623 Change-Id: I58e0d192658129922a463ccbf9e3c0f247c973a0 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qt5-git.inc | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- ...-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch | 10 +++++----- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtcanvas3d_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtgamepad_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtknx_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtmqtt_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtnetworkauth_git.bb | 2 +- recipes-qt/qt5/qtopcua_git.bb | 2 +- recipes-qt/qt5/qtpurchasing_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtremoteobjects_git.bb | 2 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtscxml_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qtsvg_git.bb | 2 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 4 ++-- recipes-qt/qt5/qtwebglplugin_git.bb | 2 +- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtwebview_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 41 files changed, 46 insertions(+), 46 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine_git.bb') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index eedb01e4..7bb02252 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -193,4 +193,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 = "856fb1ab44722f5165fb6b5dec0bd748006acd10" +SRCREV = "2f97a050bc43a7cdbee3219b7cfc4d703ef0a37e" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index a3b62f8d..fdfaed42 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -36,6 +36,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "3de900a10c6fd051ba54727be2fd1fe47ed10481" +SRCREV = "fa12f14b2b97249b68652ed9f5fd0df0c0c27be4" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 8e2863ba..488104e5 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "5.12.2+git${SRCPV}" +PV = "5.12.3+git${SRCPV}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 45b8f7b1..b1243fbb 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -139,4 +139,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 = "856fb1ab44722f5165fb6b5dec0bd748006acd10" +SRCREV = "2f97a050bc43a7cdbee3219b7cfc4d703ef0a37e" diff --git a/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch index b4e98a3f..68cca92a 100644 --- a/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch +++ b/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch @@ -1,4 +1,4 @@ -From 852a06e11ece7b1a74785bdea2235583d0275007 Mon Sep 17 00:00:00 2001 +From f39cf06f1242fc8391561bbbfb0741fbd58194f1 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 27 Oct 2018 12:29:31 +0000 Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to @@ -19,7 +19,7 @@ Signed-off-by: Max Krummenacher 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 07869efd7d..671aa82167 100644 +index 84dbbfe..ad6956d 100644 --- a/src/gui/Qt5GuiConfigExtras.cmake.in +++ b/src/gui/Qt5GuiConfigExtras.cmake.in @@ -75,21 +75,15 @@ unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE) @@ -48,9 +48,9 @@ index 07869efd7d..671aa82167 100644 -!!ENDIF + foreach(_lib ${Libs}) - string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _cmake_lib_name ${_lib}) - if (NOT TARGET Qt5::Gui_${_cmake_lib_name} AND NOT _Qt5Gui_${_cmake_lib_name}_LIBRARY_DONE) -@@ -158,11 +152,11 @@ endmacro() + if (IS_ABSOLUTE ${_lib}) + get_filename_component(_libFile ${_lib} NAME_WE) +@@ -171,11 +165,11 @@ endmacro() !!IF !isEmpty(CMAKE_EGL_LIBS) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 836f57fa..5b875588 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -284,4 +284,4 @@ sed -i \ $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri } -SRCREV = "856fb1ab44722f5165fb6b5dec0bd748006acd10" +SRCREV = "2f97a050bc43a7cdbee3219b7cfc4d703ef0a37e" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index f92db8bb..0fc93555 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtdeclarative" -SRCREV = "f9b7e894b3d91bf760d71d7d784e2d162da0569e" +SRCREV = "ad4ac1b1493cc637ab7280196a948fac9bef091e" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index d69124bc..dcb5c2e6 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "c9bc2672b513a414708026f4271d247feaa26471" +SRCREV = "c0f0d22a1ae85c7efafb4cee6d0e59effb68262c" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 2d9298db..1901c226 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -21,4 +21,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "eec8fed760a572eb9187f79b43d87986f2b4f404" +SRCREV = "c488aedb42cda76085cfc0ed2602c34c3b5353a6" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 7e7237bd..9f6e600c 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "428195cb2b1dc0c48eb348abb856cdaabf79dc0d" +SRCREV = "c71ab9ebe8cad26169466a7bfd0c7a239d43ea3c" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 3cac4441..b6099d62 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -24,6 +24,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "cd7ce85ff0b8f9a5163c7dc276dc7751c3f51f0f" +SRCREV = "42ed40cf0abd0155d6e6d1ef01faf9bded065588" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 70ac2cbe..5892435f 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "744e13b37bf1061814d7e2e1d60f8e3ce4ac6e0b" +SRCREV = "cd571466dc25674b25f34a3e2476c6a0b53dd25f" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 599f5ce9..4adb0267 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -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 = "41ab3587cf0847e3442da6d14253e4bec4e87837" +SRCREV = "e7ab193d855806d7333577ad7d9d15165d1b5cf8" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 0d75655d..084d056b 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "1b8478f86f15dc1dd125a2a0d8331bc3600a79c1" +SRCREV = "4b0d658f47ec80e3d7a5b66c060efe9a9ef5289a" diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index 52882aad..84102fa4 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "e807632b21caefa1ed6ebf1b626d8f5c596c2952" +SRCREV = "ae6c0fe18fff0bedced9800b11940f396b66596d" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 8cac62ef..2db973b7 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -31,7 +31,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 = "a00c5e40a2df03713d29da83a5692f2d7c15326d" +SRCREV_qtlocation = "6e02f895a8f3a74503971dd8df02cfafd46281f8" SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index 71f895ce..46b22a01 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "a4d673f9a75c7dbbcedcaa076542a71acc832fc4" +SRCREV = "cf41d84738f0ed0c779f75db94d413ad938fb901" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 469529d1..30f1b204 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -37,4 +37,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 = "9caf4812e073829fc961eb466f1325106f041841" +SRCREV = "d665520e8bd23121160d82cada34ff625e0d0cfe" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 477258d6..3308c612 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "bd9c083ba099a46d101ca64369f46ba7fba2a943" +SRCREV = "88fa9ac94241a182f8ad92a692eccabbc0caa9cc" diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 04e13f20..4cc658a8 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "72c2ee600f214fccc147a9fb3809087e7064b56b" +SRCREV = "9d61cbee4131a8b6774ba242fe6e3f2b2f5e853c" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 2cf778c3..dfd3e0ec 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "2234141c0ec838dd537bec909c87e8a184125f68" +SRCREV = "634f8e549291b96434941b1dc29d665fdf29f980" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 5d18f977..e55e2bf5 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtdeclarative-native" -SRCREV = "ca799283a2266b023923286b4928fdf6e7211569" +SRCREV = "5135bec50762955b3a1138ecda10214a9d0bf62a" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index d4ea6186..3ebc8527 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "c231395eec3494619f4977b4c5cd845b9d7341ae" +SRCREV = "c901f6d2ee7f73f58881424b05d57360720fa7d9" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index ff934bde..ca4332bf 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "1c19349a28a75eec386b84af142fc571e492a3c3" +SRCREV = "119b222dd5ee8f4410f87c5854e6e9ee65436309" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 67d17b28..550d03a3 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -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 = "6c0edaf30c5bdfc2739ca646da73dcb697ab1361" +SRCREV = "6522303cb94a9ba5583d68f8c68e4fadf3fb6d7b" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 91b2cde2..20cb4028 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "4bb7aa3f3002b9ba85494e5cf4808f68e0edc502" +SRCREV = "554ac4551c154f39de2917877b189b74e4464d3b" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 # 5.12.meta-qt5.1 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 7ef368cf..349484dd 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "73d5160ab8219015a25e59c62669b2926156b807" +SRCREV = "f528104474dd74e34ea6a01da096e7c31730c01a" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 3345f7df..357bb195 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "745120ddca5fa67f1a87741e0a5c016acbd53deb" +SRCREV = "4a52df0a7d5e0bc825a39d8f1f3764f45908fe75" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 1f05b6c6..0c59d313 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "624f175492660301af5eb321d2b8d6af7aa7fbc3" +SRCREV = "0ab5636aee10d8578307beb90c69e27f7f69574b" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index bb62e2e8..bfcd10b7 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "2430c9ed20f3f10da7bc3e7fdb5328d8501f5776" +SRCREV = "d477ec8f40b28caf3a216d9e8550d8871d5131fb" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index be967149..9528b674 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ " -SRCREV = "b0147a5d79ce7a7e77a24f36aaddfacb1a1517c8" +SRCREV = "9c7502b0e5056da021ace0195e53d5b7b410120b" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 4158fb00..368dece5 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -SRCREV = "c8a0da51adcc015447fc26e5a2b3d1de12479f75" +SRCREV = "7baf16d13b463ed86879e8a109ff3b4ba4ae8e46" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index bd339428..e5c0636c 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "277aad92fb5d5612c2b952f05063518d877a5138" +SRCREV = "21558bcead96716607e670840c63213d6eb4d8c9" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index a63c49cd..a5c39b57 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "0d717b0cc9aa3b87821450a2bce0d0bf0f1a6bfb" +SRCREV = "7a0956a89a559e5a73a659fcc08001cefa01d9bd" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index b039ba38..e39170bd 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "45da510a0a87593a2ae6f98e41bb01b9d39ace58" +SRCREV = "05327921fd125a6e33cb32344ac54a7b023f8c62" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index d6730cf9..aeaab374 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -174,8 +174,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "92b078a534390dba64a0dcebcffdab4ce24581b6" -SRCREV_chromium = "43316b156e65f867a76ed2afd96bf30696c5f4f6" +SRCREV_qtwebengine = "1fe5566c5d494a9a6cea8282c7387b36ef0e4c0b" +SRCREV_chromium = "69388ae5e24df85a68354c3b330514756129d871" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 7faa3795..51cdfdb5 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb @@ -18,4 +18,4 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "b1662da58d05dd53b5d4c84a3518c65f417cefd8" +SRCREV = "10a64558ce927e2df0f2dfe7ff3d786d4737c06e" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 4ed72dc7..1564f5ae 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "b4bac09b3b2f0c3072d797b22c44e20b661c4723" +SRCREV = "dd00a38e0d65a73d7fa4df4c2fd196252d40d5ff" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index a7a66387..50b464a1 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "0aa43dc555e0a820bf13a6b12671ee6a79161155" +SRCREV = "8df88a17a18c34d143f0aefb9e4e0d63e2f8d56e" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index dfd305d3..f07ec2c9 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "3bfaa26890990d140caba4b9a1050906c2ee546c" +SRCREV = "11ee82ab6c256e50a39758272f1a8ca19dc8d4f3" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 9ec19415..0394e0d4 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -25,7 +25,7 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "e8026ec6a30c5124c2e3162d9a17e9ae11fa4475" +SRCREV = "595e7cf516be4667b41ed358eabafcbf2f23ef5c" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3-54-g00ecf From f2b9b3047d2684a52d525618ef0a326f97e3e37b Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 1 Apr 2019 12:30:54 +0300 Subject: qt5: update submodules Update to latest content in Qt 5.12.3 branch Task-number: QTBUG-74623 Change-Id: I38f29200c051da3d34c768043a1f4d5bd4e5dd6e Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtgamepad_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 4 ++-- 17 files changed, 18 insertions(+), 18 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine_git.bb') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 7bb02252..0c6df454 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -193,4 +193,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 = "2f97a050bc43a7cdbee3219b7cfc4d703ef0a37e" +SRCREV = "18e4cf290048726933bb5cf487e947e65b3550a6" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index fdfaed42..2026a701 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -36,6 +36,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "fa12f14b2b97249b68652ed9f5fd0df0c0c27be4" +SRCREV = "e84d8d2a81eb81f9b1ea9f40d4da36d09a97b246" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index e6c6a462..6830fe88 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -140,4 +140,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 = "2f97a050bc43a7cdbee3219b7cfc4d703ef0a37e" +SRCREV = "18e4cf290048726933bb5cf487e947e65b3550a6" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 5b875588..2214a83e 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -284,4 +284,4 @@ sed -i \ $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri } -SRCREV = "2f97a050bc43a7cdbee3219b7cfc4d703ef0a37e" +SRCREV = "18e4cf290048726933bb5cf487e947e65b3550a6" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 1901c226..17062177 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -21,4 +21,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "c488aedb42cda76085cfc0ed2602c34c3b5353a6" +SRCREV = "d21da7829811d129b96ca0eb2a56cb6bdae4f1a7" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index b6099d62..fd33c199 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -24,6 +24,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "42ed40cf0abd0155d6e6d1ef01faf9bded065588" +SRCREV = "8c1c579405cb4a3b039b171a1fa5d636deed9511" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 5892435f..5f62acf2 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "cd571466dc25674b25f34a3e2476c6a0b53dd25f" +SRCREV = "c6cb03e61ed17c92b316ab0d6af86278c6abd45c" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 084d056b..3eead993 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "4b0d658f47ec80e3d7a5b66c060efe9a9ef5289a" +SRCREV = "434aa248ad5710c7f65283fc3beb7e8adb8b1ad7" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 2db973b7..991e5771 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -31,7 +31,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 = "6e02f895a8f3a74503971dd8df02cfafd46281f8" +SRCREV_qtlocation = "5c3e3464c2ccf960ef3aaee4286f3d5b4cde12ac" SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 30f1b204..7fc7ca14 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -37,4 +37,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 = "d665520e8bd23121160d82cada34ff625e0d0cfe" +SRCREV = "f41819387531a5ddfbad2e80ceec7b57a5ebb7c6" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index e55e2bf5..2416815c 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtdeclarative-native" -SRCREV = "5135bec50762955b3a1138ecda10214a9d0bf62a" +SRCREV = "1bb25edd6c30e163976afa43065671ffcb56d6f4" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 3ebc8527..0b9acfd4 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "c901f6d2ee7f73f58881424b05d57360720fa7d9" +SRCREV = "1edf84eff083eb5412b4c5c7cd3bd8166f15f61f" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 550d03a3..a458cce9 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -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 = "6522303cb94a9ba5583d68f8c68e4fadf3fb6d7b" +SRCREV = "2379c9b93792feb97d6cb871082aed0f7cbcbad8" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 357bb195..9e1f80a2 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "4a52df0a7d5e0bc825a39d8f1f3764f45908fe75" +SRCREV = "d5b3a2b6e6462f4ad46fce8f52539333b131dcad" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 9528b674..99fbd90f 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ " -SRCREV = "9c7502b0e5056da021ace0195e53d5b7b410120b" +SRCREV = "50335cb26bb88930f5e2a204642439cc9a4d2282" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 368dece5..f06ca308 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -SRCREV = "7baf16d13b463ed86879e8a109ff3b4ba4ae8e46" +SRCREV = "0987e6cb7f415be17d1240c8cd71719f94a98f76" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index aeaab374..3f94afa3 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -174,8 +174,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "1fe5566c5d494a9a6cea8282c7387b36ef0e4c0b" -SRCREV_chromium = "69388ae5e24df85a68354c3b330514756129d871" +SRCREV_qtwebengine = "1110b9b50e61bf2663e2037ce9e28e74a8943919" +SRCREV_chromium = "e8bb1f1a6b2877c86519749ffab34f94bb6a1028" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" -- cgit v1.2.3-54-g00ecf From 28d4bfdf74ba9d66ad749fc7208ca8dc147a3927 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 18 Mar 2019 15:02:05 +0200 Subject: Upgrade to 5.12.2 Signed-off-by: Mikko Gronoff --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 6 +- .../qt5/qt3d/0001-Allow-a-tools-only-build.patch | 14 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qt5-git.inc | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 6 +- .../qtbase/0018-Fix-compile-issue-with-gcc-9.patch | 28 -- ...tion-of-qendian-s-qswap-specializations-o.patch | 59 --- ...0-Fix-qbswap-calls-for-Big-Endian-targets.patch | 28 -- .../qt5/qtbase/0023-build-failure-with-clang.patch | 48 -- recipes-qt/qt5/qtbase_git.bb | 11 +- recipes-qt/qt5/qtcanvas3d_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtgamepad_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtknx_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtmqtt_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtnetworkauth_git.bb | 2 +- recipes-qt/qt5/qtopcua_git.bb | 9 +- recipes-qt/qt5/qtpurchasing_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtremoteobjects_git.bb | 2 +- .../qt5/qtscript/0002-Fix-build-with-GCC-8.3.patch | 235 --------- recipes-qt/qt5/qtscript_git.bb | 3 +- recipes-qt/qt5/qtscxml_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qtsvg_git.bb | 2 +- recipes-qt/qt5/qtsystems_git.bb | 2 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- ...new-feature-name-xkbcommon_evdev-xkbcommo.patch | 560 --------------------- recipes-qt/qt5/qtwayland_git.bb | 20 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- ...new-feature-name-xkbcommon_evdev-xkbcommo.patch | 31 -- recipes-qt/qt5/qtwebengine_git.bb | 5 +- recipes-qt/qt5/qtwebglplugin_git.bb | 2 +- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtwebview_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 49 files changed, 58 insertions(+), 1073 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch delete mode 100644 recipes-qt/qt5/qtbase/0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch delete mode 100644 recipes-qt/qt5/qtbase/0020-Fix-qbswap-calls-for-Big-Endian-targets.patch delete mode 100644 recipes-qt/qt5/qtbase/0023-build-failure-with-clang.patch delete mode 100644 recipes-qt/qt5/qtscript/0002-Fix-build-with-GCC-8.3.patch delete mode 100644 recipes-qt/qt5/qtwayland/0001-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch (limited to 'recipes-qt/qt5/qtwebengine_git.bb') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index f4d60bc7..eedb01e4 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -42,10 +42,6 @@ SRC_URI += "\ file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0018-Fix-compile-issue-with-gcc-9.patch \ - file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ - file://0020-Fix-qbswap-calls-for-Big-Endian-targets.patch \ - file://0023-build-failure-with-clang.patch \ " # common for qtbase-native and nativesdk-qtbase @@ -197,4 +193,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 = "13ed06640c6cf32ea8c784c896c6bf017053edb3" +SRCREV = "856fb1ab44722f5165fb6b5dec0bd748006acd10" diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch index 144c9a78..901a47fd 100644 --- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch @@ -1,25 +1,27 @@ -From d3053e33c76cdb41eeeec3c853fa88c7c7bfb8a5 Mon Sep 17 00:00:00 2001 +From ee6c6dc4183234a6f092d9e5b8d05eaab8ee5382 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 17 Aug 2018 13:23:58 +0300 Subject: [PATCH] Allow a tools-only build --- - qt3d.pro | 7 ++++++- + qt3d.pro | 9 +++++++-- src/3rdparty/assimp/assimp_dependency.pri | 2 +- tools/tools.pro | 2 +- - 3 files changed, 8 insertions(+), 3 deletions(-) + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/qt3d.pro b/qt3d.pro -index 3fc7d1452..7311eff5b 100644 +index 847507f17..286286dd0 100644 --- a/qt3d.pro +++ b/qt3d.pro -@@ -1,4 +1,4 @@ +@@ -1,5 +1,5 @@ +-requires(qtHaveModule(gui)) -requires(qtConfig(opengl):!wasm) ++!tools-only:requires(qtHaveModule(gui)) +!tools-only:requires(qtConfig(opengl):!wasm) CONFIG += examples_need_tools load(qt_parts) -@@ -14,3 +14,8 @@ load(qt_parts) +@@ -15,3 +15,8 @@ load(qt_parts) OTHER_FILES += \ sync.profile diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index a5588840..a3b62f8d 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -36,6 +36,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "338addb5a79c32d5b7b3013746c6d5250e1581fe" +SRCREV = "3de900a10c6fd051ba54727be2fd1fe47ed10481" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index c92da467..5ff5ccf5 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "5.12.0+git${SRCPV}" +PV = "5.12.2+git${SRCPV}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 51cc6c4a..45b8f7b1 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -37,10 +37,6 @@ SRC_URI += "\ file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0018-Fix-compile-issue-with-gcc-9.patch \ - file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ - file://0020-Fix-qbswap-calls-for-Big-Endian-targets.patch \ - file://0023-build-failure-with-clang.patch \ " # common for qtbase-native and nativesdk-qtbase @@ -143,4 +139,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 = "13ed06640c6cf32ea8c784c896c6bf017053edb3" +SRCREV = "856fb1ab44722f5165fb6b5dec0bd748006acd10" diff --git a/recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch b/recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch deleted file mode 100644 index e5e9813b..00000000 --- a/recipes-qt/qt5/qtbase/0018-Fix-compile-issue-with-gcc-9.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4bc9f80bb0875648a2f3eca5b14e4e9e56cfda4d Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen -Date: Tue, 13 Nov 2018 16:00:23 +0100 -Subject: [PATCH] Fix compile issue with gcc 9 - -It appears messenne_twisters in the latest libstdc++ has one more -requirement before it is willing to construct with our -SystemGenerator struct as an sseq provider. - -Change-Id: If38151d1fa6f40a80274acc26d9ed6b4ac6049fe -Reviewed-by: Giuseppe D'Angelo -Reviewed-by: Thiago Macieira ---- - src/corelib/global/qrandom.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp -index 23e5e499b2..03534cf453 100644 ---- a/src/corelib/global/qrandom.cpp -+++ b/src/corelib/global/qrandom.cpp -@@ -218,6 +218,7 @@ struct QRandomGenerator::SystemGenerator - #endif // Q_OS_WINRT - - static SystemGenerator &self(); -+ typedef quint32 result_type; - void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept); - - // For std::mersenne_twister_engine implementations that use something diff --git a/recipes-qt/qt5/qtbase/0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch b/recipes-qt/qt5/qtbase/0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch deleted file mode 100644 index 21e3207d..00000000 --- a/recipes-qt/qt5/qtbase/0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 4bcd7b1c6e06cfaef1a52795df007f1a9372eeed Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen -Date: Wed, 21 Nov 2018 14:07:18 +0200 -Subject: [PATCH] Fix compilation of qendian's qswap specializations on gcc 4.8 - -Task-number: QTBUG-71945 -Change-Id: Icf2b75c72946f57ebffc880c9238531dea13ab5b -Reviewed-by: Ivan Komissarov -Reviewed-by: Simon Hausmann ---- - src/corelib/global/qendian.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index 0e67a1ab8e..f2e5833468 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -162,17 +162,17 @@ Float qbswapFloatHelper(Float source) - return qFromUnaligned(&temp); - } - --template <> inline qfloat16 qbswap(qfloat16 source) -+inline qfloat16 qbswap(qfloat16 source) - { - return qbswapFloatHelper(source); - } - --template <> inline float qbswap(float source) -+inline float qbswap(float source) - { - return qbswapFloatHelper(source); - } - --template <> inline double qbswap(double source) -+inline double qbswap(double source) - { - return qbswapFloatHelper(source); - } -@@ -185,7 +185,7 @@ template <> inline double qbswap(double source) - */ - template inline void qbswap(const T src, void *dest) - { -- qToUnaligned(qbswap(src), dest); -+ qToUnaligned(qbswap(src), dest); - } - - template void *qbswap(const void *source, qsizetype count, void *dest) noexcept; -@@ -223,9 +223,9 @@ template inline void qFromLittleEndian(const void *source, qsizetyp - #else // Q_LITTLE_ENDIAN - - template inline Q_DECL_CONSTEXPR T qToBigEndian(T source) --{ return qbswap(source); } -+{ return qbswap(source); } - template inline Q_DECL_CONSTEXPR T qFromBigEndian(T source) --{ return qbswap(source); } -+{ return qbswap(source); } - template inline Q_DECL_CONSTEXPR T qToLittleEndian(T source) - { return source; } - template inline Q_DECL_CONSTEXPR T qFromLittleEndian(T source) diff --git a/recipes-qt/qt5/qtbase/0020-Fix-qbswap-calls-for-Big-Endian-targets.patch b/recipes-qt/qt5/qtbase/0020-Fix-qbswap-calls-for-Big-Endian-targets.patch deleted file mode 100644 index 4169fb76..00000000 --- a/recipes-qt/qt5/qtbase/0020-Fix-qbswap-calls-for-Big-Endian-targets.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c94a6510ae983e46f60e0cfb1b0f20229c990d93 Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen -Date: Fri, 4 Jan 2019 09:35:40 +0200 -Subject: [PATCH] Fix qbswap calls for Big Endian targets - -Upstream-Status: Backport -Task-number: QTBUG-71945 -Change-Id: I5356f8e32d00ea591b1f65cdd4111276fcf876ac ---- - src/corelib/global/qendian.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h -index f2e5833468..615f523888 100644 ---- a/src/corelib/global/qendian.h -+++ b/src/corelib/global/qendian.h -@@ -204,9 +204,9 @@ template inline Q_DECL_CONSTEXPR T qToBigEndian(T source) - template inline Q_DECL_CONSTEXPR T qFromBigEndian(T source) - { return source; } - template inline Q_DECL_CONSTEXPR T qToLittleEndian(T source) --{ return qbswap(source); } -+{ return qbswap(source); } - template inline Q_DECL_CONSTEXPR T qFromLittleEndian(T source) --{ return qbswap(source); } -+{ return qbswap(source); } - template inline void qToBigEndian(T src, void *dest) - { qToUnaligned(src, dest); } - template inline void qToLittleEndian(T src, void *dest) diff --git a/recipes-qt/qt5/qtbase/0023-build-failure-with-clang.patch b/recipes-qt/qt5/qtbase/0023-build-failure-with-clang.patch deleted file mode 100644 index 0576a22c..00000000 --- a/recipes-qt/qt5/qtbase/0023-build-failure-with-clang.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f958dccc8c7c777aaca1f110ed48c71b28fdea92 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 1 Mar 2019 15:11:19 -0800 -Subject: [PATCH] Fix build failure with clang - -Complement below commit - -commit 1555894dec537cbc422f43fe959b0d0ee0000881 -Author: Thiago Macieira -Date: Wed Jul 25 19:04:20 2018 -0700 - - QCborValue: Disable support for spaceship operator - - __has_include() is not the correct way to detect this feature, - since that's a library header and may be provided by an implementation - (libc++) before the compiler supports the syntax. - - Change-Id: I80aae0d068974d83b6c0fffd1544c8e558e2446b - Reviewed-by: Edward Welbourne - -Fixes -tst_qcborvalue.cpp:336:17: error: invalid operands to binary expression ('QCborValue' and 'QCborValue') - QVERIFY(!(v > other)); - ~ ^ ~~~~~ - -Upstream-Status: Pending - -Signed-off-by: Khem Raj ---- - tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp -index 38b26e7de4..4b753eab6b 100644 ---- a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp -+++ b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp -@@ -330,7 +330,7 @@ void tst_QCborValue::copyCompare() - QCOMPARE(v, other); - QVERIFY(!(v != other)); - QVERIFY(!(v < other)); --#if QT_HAS_INCLUDE() -+#if 0 && QT_HAS_INCLUDE() - QVERIFY(v <= other); - QVERIFY(v >= other); - QVERIFY(!(v > other)); --- -2.21.0 - diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 821eb95c..c023e4fc 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -33,13 +33,8 @@ SRC_URI += "\ file://0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0016-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ - file://0018-Fix-compile-issue-with-gcc-9.patch \ - file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ - file://0020-Fix-qbswap-calls-for-Big-Endian-targets.patch \ - file://0023-build-failure-with-clang.patch \ " - # for syncqt RDEPENDS_${PN}-tools += "perl" @@ -68,7 +63,7 @@ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -f # separate some parts of PACKAGECONFIG which are often changed PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" -PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xcb-xinput glib xkb xkbcommon-evdev', '', d)}" +PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xcb-xinput glib xkb xkbcommon', '', d)}" PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups fontconfig kms gbm libinput sql-sqlite accessibility openssl', '', d)}" PACKAGECONFIG_FONTS ?= "" PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" @@ -144,7 +139,7 @@ PACKAGECONFIG[sql-sqlite] = "-sql-sqlite -system-sqlite,-no-sql-sqlite,sqlite3" PACKAGECONFIG[xcb-xinput] = "-xcb-xinput,-no-xcb-xinput,libxcb" PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv" PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon" -PACKAGECONFIG[xkbcommon-evdev] = "-xkbcommon-evdev,-no-xkbcommon-evdev,libxkbcommon,xkeyboard-config" +PACKAGECONFIG[xkbcommon] = "-xkbcommon,-no-xkbcommon,libxkbcommon,xkeyboard-config" PACKAGECONFIG[evdev] = "-evdev,-no-evdev" PACKAGECONFIG[mtdev] = "-mtdev,-no-mtdev,mtdev" # depends on glib @@ -294,4 +289,4 @@ sed -i \ $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri } -SRCREV = "13ed06640c6cf32ea8c784c896c6bf017053edb3" +SRCREV = "856fb1ab44722f5165fb6b5dec0bd748006acd10" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index b11e355f..f92db8bb 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtdeclarative" -SRCREV = "f0552b1eb14568fa6802191d13a1123effdbb636" +SRCREV = "f9b7e894b3d91bf760d71d7d784e2d162da0569e" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index db91b59f..d69124bc 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "b36af85eac67c2e92b35849b34d913ee0290cd2b" +SRCREV = "c9bc2672b513a414708026f4271d247feaa26471" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 4d98b95a..2d9298db 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -21,4 +21,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "e9967647ffe20df0473a1fa9eb10957b4e32fbf3" +SRCREV = "eec8fed760a572eb9187f79b43d87986f2b4f404" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 140be8a1..7e7237bd 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "20f42d4c87162992fc2322e65aee1a1e2b1f28a2" +SRCREV = "428195cb2b1dc0c48eb348abb856cdaabf79dc0d" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 56a98eaa..3cac4441 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -24,6 +24,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "c401ae278b4bb91c70c6d7df974a241d7c68855b" +SRCREV = "cd7ce85ff0b8f9a5163c7dc276dc7751c3f51f0f" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index b9b7c1cf..70ac2cbe 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "2d532f3d84654e75273af4a5a34310413555e00f" +SRCREV = "744e13b37bf1061814d7e2e1d60f8e3ce4ac6e0b" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 75056d98..599f5ce9 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -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 = "5b24291329cdbd19b795b4c3d8aafc4ffd916a2d" +SRCREV = "41ab3587cf0847e3442da6d14253e4bec4e87837" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index f466b75d..0d75655d 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "178b8572d71a34975ffd7ada87227e1b8ed7296e" +SRCREV = "1b8478f86f15dc1dd125a2a0d8331bc3600a79c1" diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index 94a991dc..52882aad 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "3c6e84d7b39014d5df6750f096bc31a5b24e164b" +SRCREV = "e807632b21caefa1ed6ebf1b626d8f5c596c2952" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 88dfa67c..8cac62ef 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -31,7 +31,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 = "a4442abdc034de7984e003c821939ce1b1976593" +SRCREV_qtlocation = "a00c5e40a2df03713d29da83a5692f2d7c15326d" SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index 6f05ac37..71f895ce 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "bf30507ef17445b464abe230f4bf349d732fbfd1" +SRCREV = "a4d673f9a75c7dbbcedcaa076542a71acc832fc4" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 11de21f9..469529d1 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -37,4 +37,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 = "7b0b5bb0b9e15ad54b061ee39712ce86235535d5" +SRCREV = "9caf4812e073829fc961eb466f1325106f041841" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 258fe10e..477258d6 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "71318ed079ddf7c0c3af9d70f64b9519e23b7499" +SRCREV = "bd9c083ba099a46d101ca64369f46ba7fba2a943" diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index b99c485b..754da541 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb @@ -8,6 +8,11 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ " -DEPENDS += "qtbase" +# src/3rdparty/open62541.pri adds -Wno-format, causing following error +# because -Wformat-security cannot be used together with -Wno-format +# cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security] +SECURITY_STRINGFORMAT = "" -SRCREV = "fd6f1d80aa501d8d003018359ce9c023e70732d5" +DEPENDS += "qtbase qtdeclarative" + +SRCREV = "72c2ee600f214fccc147a9fb3809087e7064b56b" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index b5863bf5..2cf778c3 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "2de8d672b596c6a67afc2a72a293a08d0a3912d8" +SRCREV = "2234141c0ec838dd537bec909c87e8a184125f68" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 6969c6ee..5d18f977 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtdeclarative-native" -SRCREV = "69f02184a9a71f3a5e2dd1ada12367ddccd29787" +SRCREV = "ca799283a2266b023923286b4928fdf6e7211569" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 62efef89..d4ea6186 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "5e2dfd09b3ace43c2f3dc75c56933c7c723b50fb" +SRCREV = "c231395eec3494619f4977b4c5cd845b9d7341ae" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 0b177de1..ff934bde 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "5bc5f04be23237f9d55b2134ae55bd93bed342a0" +SRCREV = "1c19349a28a75eec386b84af142fc571e492a3c3" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript/0002-Fix-build-with-GCC-8.3.patch b/recipes-qt/qt5/qtscript/0002-Fix-build-with-GCC-8.3.patch deleted file mode 100644 index 629cf8e8..00000000 --- a/recipes-qt/qt5/qtscript/0002-Fix-build-with-GCC-8.3.patch +++ /dev/null @@ -1,235 +0,0 @@ -From 03cdaf779e0d8587c6e110f1f834a15e2d3317fd Mon Sep 17 00:00:00 2001 -From: Thiago Macieira -Date: Mon, 28 Jan 2019 14:33:12 -0800 -Subject: [PATCH] Fix build with GCC 8.3 - -Qualifiers in the asm statement are not allowed in the global scope. I -thought they were necessary for LTO, but I the commit to this file that -added them predates my work on setting up LTO for GCC. - -Change-Id: Id98140e1c2f0426cabbefffd157e23e5ece67a49 -Reviewed-by: Allan Sandfeld Jensen ---- - .../JavaScriptCore/jit/JITStubs.cpp | 48 +++++++++---------- - 1 file changed, 24 insertions(+), 24 deletions(-) - -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp -index 1abdf8b..9f60761 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp -@@ -116,7 +116,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x3c, JITStackFrame_s - COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, JITStackFrame_callFrame_offset_matches_ctiTrampoline); - COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x50, JITStackFrame_code_offset_matches_ctiTrampoline); - --asm volatile ( -+asm ( - ".text\n" - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" - HIDE_SYMBOL(ctiTrampoline) "\n" -@@ -138,7 +138,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" - HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" - SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" -@@ -154,7 +154,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" - HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" - SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" -@@ -179,7 +179,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x48, JITStackFrame_s - COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x90, JITStackFrame_callFrame_offset_matches_ctiTrampoline); - COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x80, JITStackFrame_code_offset_matches_ctiTrampoline); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" - HIDE_SYMBOL(ctiTrampoline) "\n" - SYMBOL_STRING(ctiTrampoline) ":" "\n" -@@ -206,7 +206,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" - HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" - SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" -@@ -222,7 +222,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" - HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" - SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" -@@ -242,7 +242,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" - #error "JIT_STUB_ARGUMENT_VA_LIST not supported on ARMv7." - #endif - --asm volatile ( -+asm ( - ".text" "\n" - ".align 2" "\n" - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" -@@ -269,7 +269,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "bx lr" "\n" - ); - --asm volatile ( -+asm ( - ".text" "\n" - ".align 2" "\n" - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" -@@ -287,7 +287,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" - "bx lr" "\n" - ); - --asm volatile ( -+asm ( - ".text" "\n" - ".align 2" "\n" - ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" -@@ -305,7 +305,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" - - #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL) - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" - HIDE_SYMBOL(ctiTrampoline) "\n" - SYMBOL_STRING(ctiTrampoline) ":" "\n" -@@ -323,7 +323,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "mov pc, lr" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" - HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" - SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" -@@ -418,7 +418,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x38, JITStackFrame_ - COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x30, JITStackFrame_code_offset_matches_ctiTrampoline); - COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x1c, JITStackFrame_stub_argument_space_matches_ctiTrampoline); - --asm volatile ( -+asm ( - ".text\n" - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" - HIDE_SYMBOL(ctiTrampoline) "\n" -@@ -440,7 +440,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" - HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" - SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" -@@ -456,7 +456,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" - HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" - SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" -@@ -480,7 +480,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58, JITStackFrame_ - COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x48, JITStackFrame_code_offset_matches_ctiTrampoline); - COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x78, JITStackFrame_stub_argument_space_matches_ctiTrampoline); - --asm volatile ( -+asm ( - ".text\n" - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" - HIDE_SYMBOL(ctiTrampoline) "\n" -@@ -515,7 +515,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" - HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" - SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" -@@ -531,7 +531,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" - "ret" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" - HIDE_SYMBOL(ctiOpThrowNotCaught) "\n" - SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" -@@ -551,7 +551,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" - #error "JIT_STUB_ARGUMENT_VA_LIST not supported on ARMv7." - #endif - --asm volatile ( -+asm ( - ".text" "\n" - ".align 2" "\n" - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" -@@ -578,7 +578,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "bx lr" "\n" - ); - --asm volatile ( -+asm ( - ".text" "\n" - ".align 2" "\n" - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" -@@ -596,7 +596,7 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" - "bx lr" "\n" - ); - --asm volatile ( -+asm ( - ".text" "\n" - ".align 2" "\n" - ".globl " SYMBOL_STRING(ctiOpThrowNotCaught) "\n" -@@ -614,7 +614,7 @@ SYMBOL_STRING(ctiOpThrowNotCaught) ":" "\n" - - #elif COMPILER(GCC) && CPU(ARM_TRADITIONAL) - --asm volatile ( -+asm ( - ".text\n" - ".globl " SYMBOL_STRING(ctiTrampoline) "\n" - HIDE_SYMBOL(ctiTrampoline) "\n" -@@ -632,7 +632,7 @@ SYMBOL_STRING(ctiTrampoline) ":" "\n" - "mov pc, lr" "\n" - ); - --asm volatile ( -+asm ( - ".globl " SYMBOL_STRING(ctiVMThrowTrampoline) "\n" - HIDE_SYMBOL(ctiVMThrowTrampoline) "\n" - SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n" -@@ -1024,7 +1024,7 @@ static NEVER_INLINE void throwStackOverflowError(CallFrame* callFrame, JSGlobalD - extern "C" { \ - rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \ - }; \ -- asm volatile ( \ -+ asm ( \ - ".text" "\n" \ - ".align 2" "\n" \ - ".globl " SYMBOL_STRING(cti_##op) "\n" \ -@@ -1053,7 +1053,7 @@ COMPILE_ASSERT(offsetof(struct JITStackFrame, thunkReturnAddress) == THUNK_RETUR - extern "C" { \ - rtype JITStubThunked_##op(STUB_ARGS_DECLARATION); \ - }; \ -- asm volatile ( \ -+ asm ( \ - ".globl " SYMBOL_STRING(cti_##op) "\n" \ - HIDE_SYMBOL(cti_##op) "\n" \ - SYMBOL_STRING(cti_##op) ":" "\n" \ diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index a6b6429c..67d17b28 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -15,7 +15,6 @@ LIC_FILES_CHKSUM = " \ # 5.12.meta-qt5.2 SRC_URI += " \ file://0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch \ - file://0002-Fix-build-with-GCC-8.3.patch \ " # qemuarm build fails with: @@ -37,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 = "0be84da60090e9d20ec0066bcd3900ca5572df95" +SRCREV = "6c0edaf30c5bdfc2739ca646da73dcb697ab1361" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 2eab9126..91b2cde2 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "1043e8abd566aa92f63acedbe188a51e83b9555c" +SRCREV = "4bb7aa3f3002b9ba85494e5cf4808f68e0edc502" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 # 5.12.meta-qt5.1 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 473dee59..7ef368cf 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "36d12d57b0b291b660b2bdb9e1b3ae855e2fc4c0" +SRCREV = "73d5160ab8219015a25e59c62669b2926156b807" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 054f5bc8..3345f7df 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "ce265ff81223bf7a5978e66dba59fb4b10469b9e" +SRCREV = "745120ddca5fa67f1a87741e0a5c016acbd53deb" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 1b7eb3cd..1f05b6c6 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "a15a7f1362454a575a4420cdd89498f42055fe48" +SRCREV = "624f175492660301af5eb321d2b8d6af7aa7fbc3" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index f663e31d..bb62e2e8 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "aa7431fdabc0434bc30ae8af0753be8c1cb9b576" +SRCREV = "2430c9ed20f3f10da7bc3e7fdb5328d8501f5776" diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb index 0bda2e99..05741de7 100644 --- a/recipes-qt/qt5/qtsystems_git.bb +++ b/recipes-qt/qt5/qtsystems_git.bb @@ -31,4 +31,4 @@ do_install_append() { QT_MODULE_BRANCH = "dev" -SRCREV = "66e45676f5f5c6251ccab36906c6324fd0065e08" +SRCREV = "e3332ee38d27a134cef6621fdaf36687af1b6f4a" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 325535ad..be967149 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ " -SRCREV = "4e823c69ec36b648d6126ae5ec031f58d1372ab4" +SRCREV = "b0147a5d79ce7a7e77a24f36aaddfacb1a1517c8" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index bb6f2ff2..4158fb00 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -SRCREV = "074b73089a4d8e4966ddcab5cdd5e9ec0ac6181a" +SRCREV = "c8a0da51adcc015447fc26e5a2b3d1de12479f75" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 1ea12ee5..bd339428 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "5aaf55adcf3742e05283274ce1b8c721c7da7c8d" +SRCREV = "277aad92fb5d5612c2b952f05063518d877a5138" diff --git a/recipes-qt/qt5/qtwayland/0001-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch b/recipes-qt/qt5/qtwayland/0001-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch deleted file mode 100644 index 2938fb2e..00000000 --- a/recipes-qt/qt5/qtwayland/0001-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch +++ /dev/null @@ -1,560 +0,0 @@ -From 6a3be262635cff2811e6da6799c17980a0f67bef Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 22 Dec 2018 18:03:56 +0000 -Subject: [PATCH] Revert "use new feature name xkbcommon_evdev -> xkbcommon" - -This reverts commit a8fed20181729cae70de43079c4a34ad1780cfd7. - -To be compatible with qtbase 5.12.0, remove this patch when upgrading -qtbase to 5.12.1 ---- - README | 4 ++-- - src/client/client.pro | 4 ++-- - src/client/qwaylandinputdevice.cpp | 22 +++++++++---------- - src/client/qwaylandinputdevice_p.h | 10 ++++----- - .../compositor_api/qwaylandcompositor.cpp | 2 +- - .../compositor_api/qwaylandkeyboard.cpp | 22 +++++++++---------- - .../compositor_api/qwaylandkeyboard_p.h | 8 +++---- - .../wayland_wrapper/wayland_wrapper.pri | 4 ++-- - .../shellintegration/ivi-shell/ivi-shell.pro | 4 ++-- - .../shellintegration/wl-shell/wl-shell.pro | 4 ++-- - .../xdg-shell-v5/xdg-shell-v5.pro | 4 ++-- - .../xdg-shell-v6/xdg-shell-v6.pro | 4 ++-- - .../shellintegration/xdg-shell/xdg-shell.pro | 4 ++-- - src/shared/qwaylandxkb.cpp | 10 ++++----- - src/shared/qwaylandxkb_p.h | 2 +- - .../auto/compositor/compositor/compositor.pro | 4 ++-- - .../compositor/compositor/tst_compositor.cpp | 6 ++--- - 17 files changed, 59 insertions(+), 59 deletions(-) - -diff --git a/README b/README -index bc6569ef..4fd99495 100644 ---- a/README -+++ b/README -@@ -9,8 +9,8 @@ QtWaylandCompositor API: - Enables the creation of Wayland compositors using Qt and QtQuick. - - To build the QtWayland module you need the external dependencies: --xkbcommon - http://xkbcommon.org/ --wayland - http://wayland.freedesktop.org/ -+xkbcommon 0.2.0 - http://xkbcommon.org/ -+wayland 1.6.0 - http://wayland.freedesktop.org/ - - QtWaylandCompositor supports loading client buffer integrations that don't use - the wayland-egl interfaces. These client buffer integrations are picked up by -diff --git a/src/client/client.pro b/src/client/client.pro -index 30f32dd7..45bbb976 100644 ---- a/src/client/client.pro -+++ b/src/client/client.pro -@@ -15,8 +15,8 @@ use_gold_linker: CONFIG += no_linker_version_script - CONFIG -= precompile_header - CONFIG += link_pkgconfig wayland-scanner - --qtConfig(xkbcommon): \ -- QMAKE_USE_PRIVATE += xkbcommon -+qtConfig(xkbcommon-evdev): \ -+ QMAKE_USE_PRIVATE += xkbcommon_evdev - - QMAKE_USE += wayland-client - -diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp -index ba55e6e1..9d675ae2 100644 ---- a/src/client/qwaylandinputdevice.cpp -+++ b/src/client/qwaylandinputdevice.cpp -@@ -70,7 +70,7 @@ - - #include - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - #include - #endif - -@@ -84,7 +84,7 @@ QWaylandInputDevice::Keyboard::Keyboard(QWaylandInputDevice *p) - connect(&mRepeatTimer, SIGNAL(timeout()), this, SLOT(repeatKey())); - } - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - bool QWaylandInputDevice::Keyboard::createDefaultKeyMap() - { - if (mXkbContext && mXkbMap && mXkbState) { -@@ -156,7 +156,7 @@ void QWaylandInputDevice::Keyboard::releaseComposeState() - - QWaylandInputDevice::Keyboard::~Keyboard() - { --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - releaseComposeState(); - releaseKeyMap(); - #endif -@@ -344,7 +344,7 @@ Qt::KeyboardModifiers QWaylandInputDevice::Keyboard::modifiers() const - { - Qt::KeyboardModifiers ret = Qt::NoModifier; - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - if (!mXkbState) - return ret; - -@@ -625,7 +625,7 @@ void QWaylandInputDevice::Pointer::pointer_axis(uint32_t time, uint32_t axis, in - - void QWaylandInputDevice::Keyboard::keyboard_keymap(uint32_t format, int32_t fd, uint32_t size) - { --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - if (format != WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1) { - close(fd); - return; -@@ -728,7 +728,7 @@ void QWaylandInputDevice::Keyboard::keyboard_key(uint32_t serial, uint32_t time, - if (isDown) - mParent->mQDisplay->setLastInputDevice(mParent, serial, window); - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - if (!createDefaultKeyMap()) { - return; - } -@@ -771,7 +771,7 @@ void QWaylandInputDevice::Keyboard::keyboard_key(uint32_t serial, uint32_t time, - #endif - - if (state == WL_KEYBOARD_KEY_STATE_PRESSED --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - && xkb_keymap_key_repeats(mXkbMap, code) - #endif - ) { -@@ -779,7 +779,7 @@ void QWaylandInputDevice::Keyboard::keyboard_key(uint32_t serial, uint32_t time, - mRepeatCode = code; - mRepeatTime = time; - mRepeatText = text; --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - mRepeatSym = sym; - #endif - mRepeatTimer.setInterval(400); -@@ -793,7 +793,7 @@ void QWaylandInputDevice::Keyboard::repeatKey() - { - mRepeatTimer.setInterval(25); - sendKey(mFocus->window(), mRepeatTime, QEvent::KeyRelease, mRepeatKey, modifiers(), mRepeatCode, --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - mRepeatSym, mNativeModifiers, - #else - 0, 0, -@@ -801,7 +801,7 @@ void QWaylandInputDevice::Keyboard::repeatKey() - mRepeatText, true); - - sendKey(mFocus->window(), mRepeatTime, QEvent::KeyPress, mRepeatKey, modifiers(), mRepeatCode, --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - mRepeatSym, mNativeModifiers, - #else - 0, 0, -@@ -816,7 +816,7 @@ void QWaylandInputDevice::Keyboard::keyboard_modifiers(uint32_t serial, - uint32_t group) - { - Q_UNUSED(serial); --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - if (mXkbState) - xkb_state_update_mask(mXkbState, - mods_depressed, mods_latched, mods_locked, -diff --git a/src/client/qwaylandinputdevice_p.h b/src/client/qwaylandinputdevice_p.h -index 7aa86539..4b12cc08 100644 ---- a/src/client/qwaylandinputdevice_p.h -+++ b/src/client/qwaylandinputdevice_p.h -@@ -65,7 +65,7 @@ - - #include - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - #include - #include - #endif -@@ -77,7 +77,7 @@ - struct wl_cursor_image; - #endif - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - struct xkb_compose_state; - struct xkb_compose_table; - #endif -@@ -209,7 +209,7 @@ public: - - QWaylandInputDevice *mParent = nullptr; - QPointer mFocus; --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - xkb_context *mXkbContext = nullptr; - xkb_keymap *mXkbMap = nullptr; - xkb_state *mXkbState = nullptr; -@@ -222,7 +222,7 @@ public: - uint32_t mRepeatCode; - uint32_t mRepeatTime; - QString mRepeatText; --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - xkb_keysym_t mRepeatSym; - #endif - QTimer mRepeatTimer; -@@ -233,7 +233,7 @@ private slots: - void repeatKey(); - - private: --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - bool createDefaultKeyMap(); - void releaseKeyMap(); - void createComposeState(); -diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp -index 173b50ce..c782304e 100644 ---- a/src/compositor/compositor_api/qwaylandcompositor.cpp -+++ b/src/compositor/compositor_api/qwaylandcompositor.cpp -@@ -128,7 +128,7 @@ public: - uint32_t code = ke->nativeScanCode; - bool isDown = ke->keyType == QEvent::KeyPress; - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - QString text; - Qt::KeyboardModifiers modifiers = QWaylandXkb::modifiers(keyb->xkbState()); - -diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp -index 68d855a6..e067eeaf 100644 ---- a/src/compositor/compositor_api/qwaylandkeyboard.cpp -+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp -@@ -51,7 +51,7 @@ - - #include - #include --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - #include - #include - #include -@@ -66,7 +66,7 @@ QWaylandKeyboardPrivate::QWaylandKeyboardPrivate(QWaylandSeat *seat) - - QWaylandKeyboardPrivate::~QWaylandKeyboardPrivate() - { --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - if (xkb_context) { - if (keymap_area) - munmap(keymap_area, keymap_size); -@@ -136,7 +136,7 @@ void QWaylandKeyboardPrivate::keyboard_bind_resource(wl_keyboard::Resource *reso - if (resource->version() >= WL_KEYBOARD_REPEAT_INFO_SINCE_VERSION) - send_repeat_info(resource->handle, repeatRate, repeatDelay); - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - if (xkb_context) { - send_keymap(resource->handle, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1, - keymap_fd, keymap_size); -@@ -164,7 +164,7 @@ void QWaylandKeyboardPrivate::keyboard_release(wl_keyboard::Resource *resource) - - void QWaylandKeyboardPrivate::keyEvent(uint code, uint32_t state) - { --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - uint key = toWaylandXkbV1Key(code); - #else - uint key = code; -@@ -180,7 +180,7 @@ void QWaylandKeyboardPrivate::sendKeyEvent(uint code, uint32_t state) - { - uint32_t time = compositor()->currentTimeMsecs(); - uint32_t serial = compositor()->nextSerial(); --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - uint key = toWaylandXkbV1Key(code); - #else - uint key = code; -@@ -197,7 +197,7 @@ void QWaylandKeyboardPrivate::modifiers(uint32_t serial, uint32_t mods_depressed - } - } - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - void QWaylandKeyboardPrivate::maybeUpdateXkbScanCodeTable() - { - if (!scanCodesByQtKey.isEmpty() || !xkbState()) -@@ -225,7 +225,7 @@ void QWaylandKeyboardPrivate::maybeUpdateXkbScanCodeTable() - - void QWaylandKeyboardPrivate::updateModifierState(uint code, uint32_t state) - { --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - if (!xkb_context) - return; - -@@ -265,7 +265,7 @@ void QWaylandKeyboardPrivate::maybeUpdateKeymap() - return; - - pendingKeymap = false; --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - if (!xkb_context) - return; - -@@ -285,7 +285,7 @@ void QWaylandKeyboardPrivate::maybeUpdateKeymap() - #endif - } - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - static int createAnonymousFile(size_t size) - { - QString path = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation); -@@ -429,7 +429,7 @@ QWaylandKeyboard::QWaylandKeyboard(QWaylandSeat *seat, QObject *parent) - connect(keymap, &QWaylandKeymap::optionsChanged, this, &QWaylandKeyboard::updateKeymap); - connect(keymap, &QWaylandKeymap::rulesChanged, this, &QWaylandKeyboard::updateKeymap); - connect(keymap, &QWaylandKeymap::modelChanged, this, &QWaylandKeyboard::updateKeymap); --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - d->initXKB(); - #endif - } -@@ -592,7 +592,7 @@ void QWaylandKeyboard::addClient(QWaylandClient *client, uint32_t id, uint32_t v - uint QWaylandKeyboard::keyToScanCode(int qtKey) const - { - uint scanCode = 0; --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - Q_D(const QWaylandKeyboard); - const_cast(d)->maybeUpdateXkbScanCodeTable(); - scanCode = d->scanCodesByQtKey.value({d->group, qtKey}, 0); -diff --git a/src/compositor/compositor_api/qwaylandkeyboard_p.h b/src/compositor/compositor_api/qwaylandkeyboard_p.h -index 87e89e85..cd1f2795 100644 ---- a/src/compositor/compositor_api/qwaylandkeyboard_p.h -+++ b/src/compositor/compositor_api/qwaylandkeyboard_p.h -@@ -62,7 +62,7 @@ - - #include - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - #include - #endif - -@@ -86,7 +86,7 @@ public: - void modifiers(uint32_t serial, uint32_t mods_depressed, - uint32_t mods_latched, uint32_t mods_locked, uint32_t group); - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - struct xkb_state *xkbState() const { return xkb_state; } - uint32_t xkbModsMask() const { return modsDepressed | modsLatched | modsLocked; } - void maybeUpdateXkbScanCodeTable(); -@@ -106,7 +106,7 @@ protected: - void keyboard_release(Resource *resource) override; - - private: --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - void initXKB(); - void createXKBKeymap(); - void createXKBState(xkb_keymap *keymap); -@@ -128,7 +128,7 @@ private: - uint32_t group = 0; - - bool pendingKeymap = false; --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - size_t keymap_size; - int keymap_fd = -1; - char *keymap_area = nullptr; -diff --git a/src/compositor/wayland_wrapper/wayland_wrapper.pri b/src/compositor/wayland_wrapper/wayland_wrapper.pri -index 3041d769..e19ea253 100644 ---- a/src/compositor/wayland_wrapper/wayland_wrapper.pri -+++ b/src/compositor/wayland_wrapper/wayland_wrapper.pri -@@ -30,5 +30,5 @@ qtConfig(wayland-datadevice) { - - INCLUDEPATH += wayland_wrapper - --qtConfig(xkbcommon): \ -- QMAKE_USE += xkbcommon -+qtConfig(xkbcommon-evdev): \ -+ QMAKE_USE += xkbcommon_evdev -diff --git a/src/plugins/shellintegration/ivi-shell/ivi-shell.pro b/src/plugins/shellintegration/ivi-shell/ivi-shell.pro -index 67e659ab..ba716c10 100644 ---- a/src/plugins/shellintegration/ivi-shell/ivi-shell.pro -+++ b/src/plugins/shellintegration/ivi-shell/ivi-shell.pro -@@ -3,8 +3,8 @@ CONFIG += wayland-scanner - - QMAKE_USE += wayland-client - --qtConfig(xkbcommon): \ -- QMAKE_USE += xkbcommon -+qtConfig(xkbcommon-evdev): \ -+ QMAKE_USE += xkbcommon_evdev - - WAYLANDCLIENTSOURCES += \ - ../../../3rdparty/protocol/ivi-application.xml \ -diff --git a/src/plugins/shellintegration/wl-shell/wl-shell.pro b/src/plugins/shellintegration/wl-shell/wl-shell.pro -index bb2c1829..fbff63c7 100644 ---- a/src/plugins/shellintegration/wl-shell/wl-shell.pro -+++ b/src/plugins/shellintegration/wl-shell/wl-shell.pro -@@ -2,8 +2,8 @@ QT += gui-private waylandclient-private - CONFIG += wayland-scanner - - QMAKE_USE += wayland-client --qtConfig(xkbcommon): \ -- QMAKE_USE_PRIVATE += xkbcommon -+qtConfig(xkbcommon-evdev): \ -+ QMAKE_USE_PRIVATE += xkbcommon_evdev - - WAYLANDCLIENTSOURCES += \ - ../../../3rdparty/protocol/wayland.xml -diff --git a/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro b/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro -index 4f6dde9b..bf9edba7 100644 ---- a/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro -+++ b/src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro -@@ -3,8 +3,8 @@ CONFIG += wayland-scanner - - QMAKE_USE += wayland-client - --qtConfig(xkbcommon): \ -- QMAKE_USE += xkbcommon -+qtConfig(xkbcommon-evdev): \ -+ QMAKE_USE += xkbcommon_evdev - - HEADERS += \ - qwaylandxdgpopupv5_p.h \ -diff --git a/src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro b/src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro -index 3c1aaee8..5d5046f6 100644 ---- a/src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro -+++ b/src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro -@@ -2,8 +2,8 @@ QT += gui-private waylandclient-private - CONFIG += wayland-scanner - - QMAKE_USE += wayland-client --qtConfig(xkbcommon): \ -- QMAKE_USE_PRIVATE += xkbcommon -+qtConfig(xkbcommon-evdev): \ -+ QMAKE_USE_PRIVATE += xkbcommon_evdev - - WAYLANDCLIENTSOURCES += \ - ../../../3rdparty/protocol/xdg-shell-unstable-v6.xml -diff --git a/src/plugins/shellintegration/xdg-shell/xdg-shell.pro b/src/plugins/shellintegration/xdg-shell/xdg-shell.pro -index 26171584..2b1191af 100644 ---- a/src/plugins/shellintegration/xdg-shell/xdg-shell.pro -+++ b/src/plugins/shellintegration/xdg-shell/xdg-shell.pro -@@ -2,8 +2,8 @@ QT += gui-private waylandclient-private - CONFIG += wayland-scanner - - QMAKE_USE += wayland-client --qtConfig(xkbcommon): \ -- QMAKE_USE_PRIVATE += xkbcommon -+qtConfig(xkbcommon-evdev): \ -+ QMAKE_USE_PRIVATE += xkbcommon_evdev - - WAYLANDCLIENTSOURCES += \ - ../../../3rdparty/protocol/xdg-decoration-unstable-v1.xml \ -diff --git a/src/shared/qwaylandxkb.cpp b/src/shared/qwaylandxkb.cpp -index 3cfc4b07..a0e388a1 100644 ---- a/src/shared/qwaylandxkb.cpp -+++ b/src/shared/qwaylandxkb.cpp -@@ -43,13 +43,13 @@ - #include - #include - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - #include - #endif - - QT_BEGIN_NAMESPACE - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - static const uint32_t KeyTbl[] = { - XKB_KEY_Escape, Qt::Key_Escape, - XKB_KEY_Tab, Qt::Key_Tab, -@@ -297,7 +297,7 @@ static xkb_keysym_t toKeysymFromTable(uint32_t key) - - std::pair QWaylandXkb::keysymToQtKey(xkb_keysym_t keysym, Qt::KeyboardModifiers &modifiers) - { --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - QString text; - uint utf32 = xkb_keysym_to_utf32(keysym); - if (utf32) -@@ -339,7 +339,7 @@ std::pair QWaylandXkb::keysymToQtKey(xkb_keysym_t keysym, Qt::Keyb - - Qt::KeyboardModifiers QWaylandXkb::modifiers(struct xkb_state *state) - { --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - Qt::KeyboardModifiers modifiers = Qt::NoModifier; - - xkb_state_component cstate = static_cast(XKB_STATE_DEPRESSED | XKB_STATE_LATCHED | XKB_STATE_LOCKED); -@@ -367,7 +367,7 @@ QEvent::Type QWaylandXkb::toQtEventType(uint32_t state) - - QVector QWaylandXkb::toKeysym(QKeyEvent *event) - { --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - QVector keysyms; - if (event->key() >= Qt::Key_F1 && event->key() <= Qt::Key_F35) { - keysyms.append(XKB_KEY_F1 + (event->key() - Qt::Key_F1)); -diff --git a/src/shared/qwaylandxkb_p.h b/src/shared/qwaylandxkb_p.h -index 4820d94b..6fa1ea45 100644 ---- a/src/shared/qwaylandxkb_p.h -+++ b/src/shared/qwaylandxkb_p.h -@@ -45,7 +45,7 @@ - #include - #include - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - #include - #else - typedef quint32 xkb_keysym_t; -diff --git a/tests/auto/compositor/compositor/compositor.pro b/tests/auto/compositor/compositor/compositor.pro -index 0ce2c6be..d69db4ca 100644 ---- a/tests/auto/compositor/compositor/compositor.pro -+++ b/tests/auto/compositor/compositor/compositor.pro -@@ -7,8 +7,8 @@ QT += core-private gui-private waylandcompositor waylandcompositor-private - - QMAKE_USE += wayland-client wayland-server - --qtConfig(xkbcommon): \ -- QMAKE_USE += xkbcommon -+qtConfig(xkbcommon-evdev): \ -+ QMAKE_USE += xkbcommon_evdev - - WAYLANDCLIENTSOURCES += \ - ../../../../src/3rdparty/protocol/xdg-shell-unstable-v5.xml \ -diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp -index 97e650d9..a8af4c39 100644 ---- a/tests/auto/compositor/compositor/tst_compositor.cpp -+++ b/tests/auto/compositor/compositor/tst_compositor.cpp -@@ -58,7 +58,7 @@ class tst_WaylandCompositor : public QObject - private slots: - void init(); - void seatCapabilities(); --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - void simpleKeyboard(); - void keyboardKeymaps(); - void keyboardLayoutSwitching(); -@@ -170,7 +170,7 @@ void tst_WaylandCompositor::multipleClients() - QTRY_COMPARE(compositor.surfaces.size(), 0); - } - --#if QT_CONFIG(xkbcommon) -+#if QT_CONFIG(xkbcommon_evdev) - - void tst_WaylandCompositor::simpleKeyboard() - { -@@ -283,7 +283,7 @@ void tst_WaylandCompositor::keyboardLayoutSwitching() - QTRY_COMPARE(mockKeyboard->m_lastKeyCode, 44u); - } - --#endif // QT_CONFIG(xkbcommon) -+#endif // QT_CONFIG(xkbcommon_evdev) - - void tst_WaylandCompositor::keyboardGrab() - { diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 8f901ad7..a63c49cd 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "1dc85b95ab0adc1e805d059e2c35c671ef790011" +SRCREV = "0d717b0cc9aa3b87821450a2bce0d0bf0f1a6bfb" BBCLASSEXTEND =+ "native nativesdk" @@ -45,21 +45,3 @@ BBCLASSEXTEND =+ "native nativesdk" # http://errors.yoctoproject.org/Errors/Details/152641/ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRC_URI += "file://0001-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch" - -# Since version 5.11.2 some private headers are not installed. Work around -# until fixed upstream. See https://bugreports.qt.io/browse/QTBUG-71340 for -# further details -do_install_append() { - if [ -d "${B}/src/client" ]; then - upstream_pv=`echo "${PV}" | sed 's:+git.*::g'` - for header in `find ${B}/src/client -name '*wayland-*.h'`; do - header_base=`basename $header` - dest="${D}${includedir}/QtWaylandClient/$upstream_pv/QtWaylandClient/private/$header_base" - if [ ! -e "$dest" ]; then - echo "Manual install: $header_base to $dest" - install -m 644 "$header" "$dest" - fi - done - fi -} diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index a2922918..b039ba38 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "a7bb269981ad50bd4e8140aa1d9af9e5abd0784d" +SRCREV = "45da510a0a87593a2ae6f98e41bb01b9d39ace58" diff --git a/recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch b/recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch deleted file mode 100644 index 97f82847..00000000 --- a/recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7d8231d53a5e79eaea9fe2566f407faf41b233b4 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 2 Feb 2019 23:23:14 -0800 -Subject: [PATCH] Revert "use new feature name xkbcommon_evdev -> xkbcommon" - -This reverts commit 21112a89e3d742451d6b449fc7075d51266fe709. - -To be compatible with qtbase 5.12.0, remove this patch when upgrading -qtbase to 5.12.1 - -Signed-off-by: Khem Raj ---- - src/core/web_event_factory.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp -index 06dbd7ff..a45f7048 100644 ---- a/src/core/web_event_factory.cpp -+++ b/src/core/web_event_factory.cpp -@@ -101,7 +101,7 @@ static KeyboardDriver keyboardDriverImpl() - if (platformName == QLatin1Literal("xcb") || platformName == QLatin1Literal("wayland")) - return KeyboardDriver::Xkb; - --#if QT_CONFIG(libinput) && QT_CONFIG(xkbcommon) -+#if QT_CONFIG(libinput) && QT_CONFIG(xkbcommon_evdev) - // Based on QEglFSIntegration::createInputHandlers and QLibInputKeyboard::processKey. - if (platformName == QLatin1Literal("eglfs") && !qEnvironmentVariableIntValue("QT_QPA_EGLFS_NO_LIBINPUT")) - return KeyboardDriver::Xkb; --- -2.20.1 - diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index ee87c884..d6730cf9 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -139,7 +139,6 @@ QT_MODULE_BRANCH_CHROMIUM = "69-based" SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ file://0001-Force-host-toolchain-configuration.patch \ - file://0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch \ " SRC_URI_append_libc-musl = "\ file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ @@ -175,8 +174,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "4f1e0003d98116e33a847360e0e95c46daae25fc" -SRCREV_chromium = "323b45aa242e0b4e75689d67418ec124ba1ca815" +SRCREV_qtwebengine = "92b078a534390dba64a0dcebcffdab4ce24581b6" +SRCREV_chromium = "43316b156e65f867a76ed2afd96bf30696c5f4f6" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 7e5a8b2d..7faa3795 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb @@ -18,4 +18,4 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "d0c4de38ddc18792c7a8a90ef2d0091b51736dd3" +SRCREV = "b1662da58d05dd53b5d4c84a3518c65f417cefd8" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index e79ada8c..4ed72dc7 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "a53a28b971e3ae1a4a2baf7320ba60f5077f5596" +SRCREV = "b4bac09b3b2f0c3072d797b22c44e20b661c4723" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index f7f52588..a7a66387 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "a14a1174cdc7ee2142abd33f85ea820eca90c968" +SRCREV = "0aa43dc555e0a820bf13a6b12671ee6a79161155" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 986c1109..dfd305d3 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "12bfa3cb74b0fb3b9e793dbb2f67cac647e7157c" +SRCREV = "3bfaa26890990d140caba4b9a1050906c2ee546c" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index d9a1a9a9..9ec19415 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -25,7 +25,7 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "274f162fd41c4de88df7efda9e6ec16a1ca968bc" +SRCREV = "e8026ec6a30c5124c2e3162d9a17e9ae11fa4475" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3-54-g00ecf From 3c86e3c28f00129fd408f9ad8daddd034bb19161 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 9 Apr 2019 23:12:00 +0300 Subject: qt5; update submodules Update to latest content in Qt 5.12.3 branch Task-number: QTBUG-74623 Change-Id: I2868f80fa7b734729aaeb362e982818dbe760884 Reviewed-by: Kari Oikarinen --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtcanvas3d_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtgamepad_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtnetworkauth_git.bb | 2 +- recipes-qt/qt5/qtpurchasing_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtremoteobjects_git.bb | 2 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtscxml_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qtsvg_git.bb | 2 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 4 ++-- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtwebview_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 34 files changed, 35 insertions(+), 35 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine_git.bb') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 0c6df454..cc4ef23a 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -193,4 +193,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 = "18e4cf290048726933bb5cf487e947e65b3550a6" +SRCREV = "534df5a33bd6a3d0d00194212cf868a9ef57bd53" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 2026a701..e458f271 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -36,6 +36,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "e84d8d2a81eb81f9b1ea9f40d4da36d09a97b246" +SRCREV = "29c20fda753f25bd142e18d511d28da68c6361c2" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 6830fe88..dad1fb5f 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -140,4 +140,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 = "18e4cf290048726933bb5cf487e947e65b3550a6" +SRCREV = "534df5a33bd6a3d0d00194212cf868a9ef57bd53" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 2214a83e..e080f115 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -284,4 +284,4 @@ sed -i \ $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri } -SRCREV = "18e4cf290048726933bb5cf487e947e65b3550a6" +SRCREV = "534df5a33bd6a3d0d00194212cf868a9ef57bd53" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 0fc93555..76b6dc54 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtdeclarative" -SRCREV = "ad4ac1b1493cc637ab7280196a948fac9bef091e" +SRCREV = "912b9b3b1318aac4cef681315ae1588105eaf410" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index dcb5c2e6..84173957 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "c0f0d22a1ae85c7efafb4cee6d0e59effb68262c" +SRCREV = "9755f474a039756b98ce9c2bf0a69809b1396004" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 17062177..7c3a209f 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -21,4 +21,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "d21da7829811d129b96ca0eb2a56cb6bdae4f1a7" +SRCREV = "6a8a8f328d1782319b4dc0e4b3497e6613e0f864" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 9f6e600c..4465660e 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "c71ab9ebe8cad26169466a7bfd0c7a239d43ea3c" +SRCREV = "edabd45add4b440b40e05f742a5a3a8b124cf72e" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index fd33c199..82ae4975 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -24,6 +24,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "8c1c579405cb4a3b039b171a1fa5d636deed9511" +SRCREV = "5ead393eba0fc9d7c05790887c53c3728b023195" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 5f62acf2..cc19abb2 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "c6cb03e61ed17c92b316ab0d6af86278c6abd45c" +SRCREV = "cf48d4694edd6a16cd3bf56922ab20d8bd6b7fe7" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 4adb0267..d7481ff8 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -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 = "e7ab193d855806d7333577ad7d9d15165d1b5cf8" +SRCREV = "8cf6af2c897a822e040015b169fbf13f3db63ebf" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 3eead993..3f57d702 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "434aa248ad5710c7f65283fc3beb7e8adb8b1ad7" +SRCREV = "17ac003f6072e62ba9de7e75f3de8b8509dcd2c3" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 991e5771..442ae146 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -31,7 +31,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 = "5c3e3464c2ccf960ef3aaee4286f3d5b4cde12ac" +SRCREV_qtlocation = "a8ecb45143823912baef2426f8e352159fcb0f9a" SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 7fc7ca14..7feda5e1 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -37,4 +37,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 = "f41819387531a5ddfbad2e80ceec7b57a5ebb7c6" +SRCREV = "c7e735198c6cc01201f90b64c8a6d35fc40584fc" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 3308c612..d0f80291 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "88fa9ac94241a182f8ad92a692eccabbc0caa9cc" +SRCREV = "0da27832617a17788da4fdd6838f8aa6d8c70f65" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index dfd3e0ec..4f19fdd2 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "634f8e549291b96434941b1dc29d665fdf29f980" +SRCREV = "45f2b4a63489c614e0060b511e00245c599fbb70" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 2416815c..c163ef42 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtdeclarative-native" -SRCREV = "1bb25edd6c30e163976afa43065671ffcb56d6f4" +SRCREV = "db38242b288fe3ca8f7461cf344b757a9ca0947d" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 0b9acfd4..d9a027d6 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "1edf84eff083eb5412b4c5c7cd3bd8166f15f61f" +SRCREV = "718afd7c3a78a35e3f4073dc6447e6bf3fda82d4" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index ca4332bf..4956b101 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "119b222dd5ee8f4410f87c5854e6e9ee65436309" +SRCREV = "043f7582bb2f611120a7693fbe75fa866d046fff" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index a458cce9..ac5d5694 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -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 = "2379c9b93792feb97d6cb871082aed0f7cbcbad8" +SRCREV = "038f6305610a80f39d3416b95b5df96fab0c801d" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 20cb4028..9cda16ff 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "554ac4551c154f39de2917877b189b74e4464d3b" +SRCREV = "daad96b2b9a4b503aebbea4f77887973dd8ff8ee" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 # 5.12.meta-qt5.1 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 349484dd..4655b2a7 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "f528104474dd74e34ea6a01da096e7c31730c01a" +SRCREV = "6b7f7f5ceb7a230307c004021a2f16f3dabdf759" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 9e1f80a2..facff866 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "d5b3a2b6e6462f4ad46fce8f52539333b131dcad" +SRCREV = "9102ab868037042cab292dbfaa08f8dfff8ef5a8" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 0c59d313..4b76a4f7 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "0ab5636aee10d8578307beb90c69e27f7f69574b" +SRCREV = "208e76d05719fe2262ff6e162786894ddb3d0fb6" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index bfcd10b7..164de449 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "d477ec8f40b28caf3a216d9e8550d8871d5131fb" +SRCREV = "fd12ae24b4542cf2f0df1a34187c4b8c0a408e01" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 99fbd90f..b1ca14f7 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ " -SRCREV = "50335cb26bb88930f5e2a204642439cc9a4d2282" +SRCREV = "fe5b4f8e7ac984cc4c9698e7d6def9be46b0df7a" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index e5c0636c..f1317c90 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "21558bcead96716607e670840c63213d6eb4d8c9" +SRCREV = "152f6935f050e83363f1b4f40c40af7f64ca5df9" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index a5c39b57..5f668654 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "7a0956a89a559e5a73a659fcc08001cefa01d9bd" +SRCREV = "e70a8070ea1e7903221fb980ddf3c23f3e9b0836" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index e39170bd..f2a15500 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "05327921fd125a6e33cb32344ac54a7b023f8c62" +SRCREV = "c3574f4ec36f3cab71fcb680e889afc8a16c6242" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 3f94afa3..e75d49d0 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -174,8 +174,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "1110b9b50e61bf2663e2037ce9e28e74a8943919" -SRCREV_chromium = "e8bb1f1a6b2877c86519749ffab34f94bb6a1028" +SRCREV_qtwebengine = "7ba379ecfa575f871a52dc94c9f29e2bfdfc9865" +SRCREV_chromium = "4c7ecce30045daf172dceaeeb86351f60cc91990" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 1564f5ae..53dd6b15 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "dd00a38e0d65a73d7fa4df4c2fd196252d40d5ff" +SRCREV = "c8704b3dbcfecd774244300943b1c63e2bf9841f" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 50b464a1..bec8c326 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "8df88a17a18c34d143f0aefb9e4e0d63e2f8d56e" +SRCREV = "05657f1c4744123ff63306a56cb699f2cfbc9f92" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index f07ec2c9..9b999b7b 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "11ee82ab6c256e50a39758272f1a8ca19dc8d4f3" +SRCREV = "719d3c88670203fca21a3433b553bc2c1434a2ac" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 0394e0d4..d1ea2d5c 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -25,7 +25,7 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "595e7cf516be4667b41ed358eabafcbf2f23ef5c" +SRCREV = "6feae569229fa391454b76450138ce83cf326046" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3-54-g00ecf From e2707a016c3475c167a421c9c73d88f81cc61bd1 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 17 Apr 2019 23:32:56 +0000 Subject: qt5: upgrade to 5.12.3 * be aware that in 3 qt* project the v5.12.3 tag wasn't created yet: qtknx_git.bb:# v5.12.3 tag wasn't created yet qtmqtt_git.bb:# v5.12.3 tag wasn't created yet qtopcua_git.bb:# v5.12.3 tag wasn't created yet * and qttools, qt3d, qtremoteobjects v5.12.3 tag isn't in 5.12 branch Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 6 ++-- .../qt5/qt3d/0001-Allow-a-tools-only-build.patch | 2 +- recipes-qt/qt5/qt3d_git.bb | 7 ++-- recipes-qt/qt5/qt5-git.inc | 4 +-- recipes-qt/qt5/qtbase-native_git.bb | 6 ++-- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 2 +- ...make-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch | 2 +- ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 2 +- ...ump-path-length-from-256-to-512-character.patch | 6 ++-- ...-unknown-features-instead-of-erroring-out.patch | 6 ++-- ...-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch | 2 +- .../0007-Delete-qlonglong-and-qulonglong.patch | 2 +- ...08-Replace-pthread_yield-with-sched_yield.patch | 2 +- ...-Add-OE-specific-specs-for-clang-compiler.patch | 2 +- ...-Invert-conditional-for-defining-QT_SOCKL.patch | 2 +- ..._qlocale-Enable-QT_USE_FENV-only-on-glibc.patch | 2 +- ...mon-gcc-base.conf-Use-I-instead-of-isyste.patch | 2 +- .../qtbase/0013-Disable-ltcg-for-host_build.patch | 2 +- ...gExtras.cmake.in-cope-with-variable-path-.patch | 10 +++--- ...-corelib-Include-sys-types.h-for-uint32_t.patch | 2 +- ...KE_CXX.COMPILER_MACROS-for-clang-on-linux.patch | 2 +- .../qtbase/0017-Always-build-uic-and-qvkgen.patch | 2 +- ...18-Avoid-renameeat2-for-native-sdk-builds.patch | 5 +-- .../0019-Bootstrap-without-linkat-feature.patch | 4 +-- recipes-qt/qt5/qtbase_git.bb | 4 +-- recipes-qt/qt5/qtcanvas3d_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- .../0001-Add-missing-header-for-errno.patch | 5 +-- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtgamepad_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtknx_git.bb | 3 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtmqtt_git.bb | 3 +- ...tmultimedia-fix-a-conflicting-declaration.patch | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 4 +-- recipes-qt/qt5/qtnetworkauth_git.bb | 2 +- recipes-qt/qt5/qtopcua_git.bb | 3 +- recipes-qt/qt5/qtpurchasing_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- .../0001-Allow-a-tools-only-build.patch | 4 +-- recipes-qt/qt5/qtremoteobjects_git.bb | 7 ++-- ...nclude-asm-sgidefs.h-on-non-glibc-systems.patch | 4 +-- recipes-qt/qt5/qtscript_git.bb | 4 +-- ...Use-external-host-bin-path-for-cmake-file.patch | 2 +- recipes-qt/qt5/qtscxml_git.bb | 4 +-- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qtsvg_git.bb | 2 +- .../0001-add-noqtwebkit-configuration.patch | 2 +- ...ols-cmake-allow-overriding-the-location-f.patch | 2 +- recipes-qt/qt5/qttools_git.bb | 7 ++-- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- .../0001-Force-host-toolchain-configuration.patch | 20 +++++++----- ...use-pvalloc-as-it-s-not-available-on-musl.patch | 37 ++++++++++++++++++++++ ...use-pvalloc-as-it-s-not-available-on-musl.patch | 37 ---------------------- .../0003-musl-link-against-libexecinfo.patch | 24 ++++++++++++++ .../0004-musl-link-against-libexecinfo.patch | 24 -------------- ...romium-Force-host-toolchain-configuration.patch | 2 +- ...um-workaround-for-too-long-.rps-file-name.patch | 2 +- .../0003-chromium-Fix-build-with-gcc8.patch | 2 +- .../0004-chromium-stack-pointer-clobber.patch | 2 +- ...sl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch | 2 +- ...sl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | 2 +- ...-chromium-musl-include-fcntl.h-for-loff_t.patch | 2 +- ...sl-use-off64_t-instead-of-the-internal-__.patch | 2 +- ...ium-musl-linux-glibc-make-the-distinction.patch | 2 +- ...sl-allocator-Do-not-include-glibc_weak_sy.patch | 2 +- ...sl-Use-correct-member-name-__si_fields-fr.patch | 2 +- ...sl-Define-res_ninit-and-res_nclose-for-no.patch | 2 +- ...hromium-musl-Do-not-define-__sbrk-on-musl.patch | 2 +- ...um-musl-Adjust-default-pthread-stack-size.patch | 2 +- ...sl-include-asm-generic-ioctl.h-for-TCGETS.patch | 2 +- ...sl-Use-_fpstate-instead-of-_libc_fpstate-.patch | 2 +- ...sl-elf_reader.cc-include-sys-reg.h-to-get.patch | 2 +- .../chromium/0018-chromium-musl-pread-pwrite.patch | 2 +- .../0019-chromium-fix-build-with-clang.patch | 7 ++-- ...-Check-for-__ARM_FP-2-before-using-__fp16.patch | 9 ++---- ...0021-chromium-Exclude-CRC32-for-32bit-arm.patch | 8 +++-- recipes-qt/qt5/qtwebengine_git.bb | 12 +++---- recipes-qt/qt5/qtwebglplugin_git.bb | 2 +- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtwebview_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 93 files changed, 208 insertions(+), 202 deletions(-) create mode 100644 recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch create mode 100644 recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch delete mode 100644 recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch (limited to 'recipes-qt/qt5/qtwebengine_git.bb') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index a9bdac4a..82b6da92 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.6 +# 5.12.meta-qt5-shared.7 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -45,7 +45,7 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native -# 5.12.meta-qt5-native.6 +# 5.12.meta-qt5-native.7 SRC_URI += " \ file://0017-Always-build-uic-and-qvkgen.patch \ file://0018-Avoid-renameeat2-for-native-sdk-builds.patch \ @@ -193,4 +193,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 = "856fb1ab44722f5165fb6b5dec0bd748006acd10" +SRCREV = "b527725766df850fcad6b9078fea5e8da8085560" diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch index 901a47fd..b1e662bc 100644 --- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch @@ -1,4 +1,4 @@ -From ee6c6dc4183234a6f092d9e5b8d05eaab8ee5382 Mon Sep 17 00:00:00 2001 +From 98509dbb66b3d93cdb6ca73cb5db537fa8ff8bd3 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 17 Aug 2018 13:23:58 +0300 Subject: [PATCH] Allow a tools-only build diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index a3b62f8d..7c1d7fea 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -12,7 +12,7 @@ DEPENDS += "qtbase" DEPENDS_class-target += "qtdeclarative qt3d-native" # Patches from https://github.com/meta-qt5/qt3d/commits/b5.12 -# 5.12.meta-qt5.1 +# 5.12.meta-qt5.2 SRC_URI += " \ file://0001-Allow-a-tools-only-build.patch \ " @@ -36,6 +36,9 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "3de900a10c6fd051ba54727be2fd1fe47ed10481" +# Use e84d8d2a81eb81f9b1ea9f40d4da36d09a97b246 instead of +# 7da5c4c35a657ea43663b4ed0d65e896b8db5c69 because the v5.12.3 tag wasn't +# merged to 5.12 branch yet +SRCREV = "e84d8d2a81eb81f9b1ea9f40d4da36d09a97b246" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 5ff5ccf5..1866f3e5 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -1,5 +1,5 @@ # Copyright (C) 2012-2016 O.S. Systems Software LTDA. -# Copyright (C) 2013-2018 Martin Jansa +# Copyright (C) 2013-2019 Martin Jansa QT_MODULE ?= "${BPN}" QT_MODULE_BRANCH ?= "5.12" @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "5.12.2+git${SRCPV}" +PV = "5.12.3+git${SRCPV}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 494301c7..91ed4807 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -18,7 +18,7 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.6 +# 5.12.meta-qt5-shared.7 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -40,7 +40,7 @@ SRC_URI += "\ # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native -# 5.12.meta-qt5-native.6 +# 5.12.meta-qt5-native.7 SRC_URI += " \ file://0017-Always-build-uic-and-qvkgen.patch \ file://0018-Avoid-renameeat2-for-native-sdk-builds.patch \ @@ -141,4 +141,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 = "856fb1ab44722f5165fb6b5dec0bd748006acd10" +SRCREV = "b527725766df850fcad6b9078fea5e8da8085560" diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 9d482676..4d90c772 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 393c4e0523a6cb7a7f43c443b5d6ee4c16df808b Mon Sep 17 00:00:00 2001 +From 406ea336ac2a1bc7dac055c378303f27b8a20c2d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform diff --git a/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch index 414e4629..c46d2961 100644 --- a/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch +++ b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch @@ -1,4 +1,4 @@ -From 11a6cce1d4bfcd2d5557679443f01987a895fbb3 Mon Sep 17 00:00:00 2001 +From 643818dd46f6c0bfabdf09608dd12844c65a06c7 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS diff --git a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 41f02bbe..d7db54d3 100644 --- a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,4 +1,4 @@ -From 6e99eddf6822a045a59fb396a0475506a0b3c139 Mon Sep 17 00:00:00 2001 +From df4410ccc0977b089efddd7d0d405e4abee2aab8 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch index f80ec9e9..420a1e3c 100644 --- a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch @@ -1,4 +1,4 @@ -From 2cf1220389b5934c57ce368757f4403ed5c7ba3f Mon Sep 17 00:00:00 2001 +From 7f912753d733d218eb87fd3b3d1d3d39e336f566 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 25 Aug 2015 10:05:15 -0400 Subject: [PATCH] configure: bump path length from 256 to 512 characters @@ -15,10 +15,10 @@ Signed-off-by: Denys Dmytriyenko 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.pri b/configure.pri -index 629ca78ff1..02b5321a62 100644 +index 131aa868c2..294dfd6fd2 100644 --- a/configure.pri +++ b/configure.pri -@@ -840,10 +840,10 @@ defineTest(qtConfOutput_preparePaths) { +@@ -843,10 +843,10 @@ defineTest(qtConfOutput_preparePaths) { "static const char qt_configure_installation [12+11] = \"qt_instdate=2012-12-20\";" \ "" \ "/* Installation Info */" \ diff --git a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch index f00781a0..b54bcf64 100644 --- a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch +++ b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch @@ -1,4 +1,4 @@ -From 85d21579a4c8ad92e776b40043b5f08b3ed0c48d Mon Sep 17 00:00:00 2001 +From 5556bc54942214e84dc5f81b2dcdc05f7713ff6e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 24 Oct 2016 09:45:18 +0300 Subject: [PATCH] Disable all unknown features instead of erroring out @@ -10,10 +10,10 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf -index 7ca65c92b3..5d96071d8b 100644 +index 62ad972796..04690068bc 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf -@@ -1568,7 +1568,8 @@ defineReplace(qtConfEvaluateSingleExpression) { +@@ -1576,7 +1576,8 @@ defineReplace(qtConfEvaluateSingleExpression) { error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") return($$result) } diff --git a/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch index ba22fd30..849ee0ca 100644 --- a/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch +++ b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch @@ -1,4 +1,4 @@ -From 192bc8894921cc903e9232ad6700d7fdeb20a345 Mon Sep 17 00:00:00 2001 +From 265c509a62cc52d9b3a6c9e9995ac26ca278bc1b Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 11 May 2016 15:20:41 +0200 Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS diff --git a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch index 1ce806df..8719d1e3 100644 --- a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch +++ b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch @@ -1,4 +1,4 @@ -From f148f3b0a6ddef1278b707e30793b3255254125e Mon Sep 17 00:00:00 2001 +From a7b47f38399ef145160e201052e5d0871fa6750c Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Wed, 7 Jun 2017 21:00:49 +0900 Subject: [PATCH] Delete qlonglong and qulonglong diff --git a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch index fa986523..84e59e7c 100644 --- a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch +++ b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch @@ -1,4 +1,4 @@ -From 36cc9480f58527cd659674ae0941aa69a20d91dd Mon Sep 17 00:00:00 2001 +From aebff1455c764e9ecc73e6b52a4bac8233c93966 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 27 Jul 2017 08:02:51 -0700 Subject: [PATCH] Replace pthread_yield with sched_yield diff --git a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch index c1ff0948..8498fd6a 100644 --- a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch +++ b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch @@ -1,4 +1,4 @@ -From 30b9199299f44314efaab35008a481526eff0ac1 Mon Sep 17 00:00:00 2001 +From d1198f3f6f3293c46db913d63518f625162b3ce5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Sep 2017 09:11:44 -0700 Subject: [PATCH] Add OE specific specs for clang compiler diff --git a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch index 3908e595..e13858f1 100644 --- a/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch +++ b/recipes-qt/qt5/qtbase/0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch @@ -1,4 +1,4 @@ -From 3c5c40992fc1c6393f61adb3a647c473de85b586 Mon Sep 17 00:00:00 2001 +From e6ce6eaa98985b706151c63ca7b705110927d71b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Sep 2017 09:44:48 -0700 Subject: [PATCH] linux-clang: Invert conditional for defining QT_SOCKLEN_T diff --git a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch index ef23820e..b9cc9d44 100644 --- a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch +++ b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch @@ -1,4 +1,4 @@ -From c0740af73ab6c37de75da487ba49df2f6e0d5060 Mon Sep 17 00:00:00 2001 +From d8eb5531c444bcae2c2067a7f67e5229acc75fac Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Sep 2017 10:11:50 -0700 Subject: [PATCH] tst_qlocale: Enable QT_USE_FENV only on glibc diff --git a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch index f541b3cb..61a5b80f 100644 --- a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch +++ b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch @@ -1,4 +1,4 @@ -From d5edcbb8e75c6aaae34048983d1b7d53a6e33ddf Mon Sep 17 00:00:00 2001 +From 6a97088ee9d0d8b2a4fbd5b13ea44501d9e58995 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 14 Feb 2018 17:08:43 -0800 Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem diff --git a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch index 142db442..e275a80e 100644 --- a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch +++ b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch @@ -1,4 +1,4 @@ -From 9dc5c503d37edb7aea8f401ff3d760a87091da3f Mon Sep 17 00:00:00 2001 +From ffd62d10df5607897ef366330e368069fed1a9b9 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 23 Oct 2018 09:54:57 +0300 Subject: [PATCH] Disable ltcg for host_build diff --git a/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch index 1f990f24..0a641bb2 100644 --- a/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch +++ b/recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch @@ -1,4 +1,4 @@ -From 21bcae84788d1b14a754bc56a1adc43abf888e84 Mon Sep 17 00:00:00 2001 +From f5c88622ac10601e48a14f31d9299692a9ac62e2 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 27 Oct 2018 12:29:31 +0000 Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to @@ -19,7 +19,7 @@ Signed-off-by: Max Krummenacher 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 07869efd7d..671aa82167 100644 +index 84dbbfebd4..ad6956d814 100644 --- a/src/gui/Qt5GuiConfigExtras.cmake.in +++ b/src/gui/Qt5GuiConfigExtras.cmake.in @@ -75,21 +75,15 @@ unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE) @@ -48,9 +48,9 @@ index 07869efd7d..671aa82167 100644 -!!ENDIF + foreach(_lib ${Libs}) - string(REGEX REPLACE "[^_A-Za-z0-9]" "_" _cmake_lib_name ${_lib}) - if (NOT TARGET Qt5::Gui_${_cmake_lib_name} AND NOT _Qt5Gui_${_cmake_lib_name}_LIBRARY_DONE) -@@ -158,11 +152,11 @@ endmacro() + if (IS_ABSOLUTE ${_lib}) + get_filename_component(_libFile ${_lib} NAME_WE) +@@ -171,11 +165,11 @@ endmacro() !!IF !isEmpty(CMAKE_EGL_LIBS) diff --git a/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch b/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch index 660ab051..749594bd 100644 --- a/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch +++ b/recipes-qt/qt5/qtbase/0015-corelib-Include-sys-types.h-for-uint32_t.patch @@ -1,4 +1,4 @@ -From b7fc603ef5eed592cacdb1f4763ba56cca38458f Mon Sep 17 00:00:00 2001 +From a7755c994aa8031e7f4eaa2df1a442a812d7f5bf Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 6 Dec 2018 11:47:52 -0800 Subject: [PATCH] corelib: Include sys/types.h for uint32_t diff --git a/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch b/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch index 69ff9604..e3a92168 100644 --- a/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch +++ b/recipes-qt/qt5/qtbase/0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch @@ -1,4 +1,4 @@ -From 4ef9f792bcee9a64f5f0eae2103d807227b6ab24 Mon Sep 17 00:00:00 2001 +From 59c5c149ad1fa3015f1fee34e87e9f8ab89f5de1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 6 Dec 2018 15:06:20 -0800 Subject: [PATCH] Define QMAKE_CXX.COMPILER_MACROS for clang on linux diff --git a/recipes-qt/qt5/qtbase/0017-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0017-Always-build-uic-and-qvkgen.patch index f85530ea..69410925 100644 --- a/recipes-qt/qt5/qtbase/0017-Always-build-uic-and-qvkgen.patch +++ b/recipes-qt/qt5/qtbase/0017-Always-build-uic-and-qvkgen.patch @@ -1,4 +1,4 @@ -From cd331cf6aca8aef21d202cd0c541757e10f070e4 Mon Sep 17 00:00:00 2001 +From 4b0ca5d85afd944d1e5a3df545ba99566207c184 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH] Always build uic and qvkgen diff --git a/recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch index ea0cb2be..0ca038f5 100644 --- a/recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch +++ b/recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch @@ -1,4 +1,4 @@ -From 6bd6e1b5dea4364c9b4b42fd198b289c095b364b Mon Sep 17 00:00:00 2001 +From 69aeac9c7233e0d76a8a00b1a45c53c1670c9b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 14 Apr 2019 13:27:58 +0200 Subject: [PATCH] Avoid renameeat2 for native(sdk) builds @@ -65,6 +65,3 @@ index b2d81066db..d1783ebdf3 100644 #if defined(Q_OS_DARWIN) && defined(RENAME_EXCL) if (renameatx_np(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_EXCL) == 0) return true; --- -2.20.1 - diff --git a/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch index ea3082cf..a1d08236 100644 --- a/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch @@ -1,4 +1,4 @@ -From 6ec9d48edafffbd91da5adb2dfc9acdf581f573a Mon Sep 17 00:00:00 2001 +From 703f89e35aaaec5ad781c222ae2dcd30f31320e9 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 24 Nov 2017 15:16:31 +0200 Subject: [PATCH] Bootstrap without linkat feature @@ -13,7 +13,7 @@ Upstream-Status: Inappropriate [OE specific] 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index dfcc3c9c7f..1e5bc401b7 100644 +index 30166fe41c..e06f75541b 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h @@ -91,7 +91,7 @@ diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 9985ee20..99adbb6b 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.6 +# 5.12.meta-qt5-shared.7 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -293,4 +293,4 @@ sed -i \ $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri } -SRCREV = "856fb1ab44722f5165fb6b5dec0bd748006acd10" +SRCREV = "b527725766df850fcad6b9078fea5e8da8085560" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index f92db8bb..de5655d3 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtdeclarative" -SRCREV = "f9b7e894b3d91bf760d71d7d784e2d162da0569e" +SRCREV = "e722ccfe62f2745b2da3b8b1202f8d224c3e5a5f" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index d69124bc..bde9f40e 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "c9bc2672b513a414708026f4271d247feaa26471" +SRCREV = "dcc4fd4fe0aff770204272d04749184df133bbb2" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtconnectivity/0001-Add-missing-header-for-errno.patch b/recipes-qt/qt5/qtconnectivity/0001-Add-missing-header-for-errno.patch index 1b75095c..09c92ccb 100644 --- a/recipes-qt/qt5/qtconnectivity/0001-Add-missing-header-for-errno.patch +++ b/recipes-qt/qt5/qtconnectivity/0001-Add-missing-header-for-errno.patch @@ -1,4 +1,4 @@ -From 4c6aa68761d8a85bffe7d545c816522a793e94a9 Mon Sep 17 00:00:00 2001 +From 8f79162cdbf6e9df3aea6762124ba1a6b25f5c0a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 29 Jan 2019 20:29:19 -0800 Subject: [PATCH] Add missing header for errno @@ -21,6 +21,3 @@ index 31d3dc02..75d762e5 100644 #include #include #include --- -2.20.1 - diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 2d9298db..414ce334 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -21,4 +21,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "eec8fed760a572eb9187f79b43d87986f2b4f404" +SRCREV = "9a77336d4984875d95f48b20a521c34f742e0fa7" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 7e7237bd..e9252f33 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "428195cb2b1dc0c48eb348abb856cdaabf79dc0d" +SRCREV = "4672b6d2c725a74d482a76d6624671ae3a2ba2a1" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 3cac4441..41481b4c 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -24,6 +24,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "cd7ce85ff0b8f9a5163c7dc276dc7751c3f51f0f" +SRCREV = "95c938cd67a1f9ccaf5a3a5fd40993f619786ca9" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 70ac2cbe..2a142ece 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "744e13b37bf1061814d7e2e1d60f8e3ce4ac6e0b" +SRCREV = "48eeb8adf8ccf9eef284b7c6406708bf724f3652" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 599f5ce9..8ba59471 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -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 = "41ab3587cf0847e3442da6d14253e4bec4e87837" +SRCREV = "9c70295220c6dc7f8b4ba8d8406084129e317a6f" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 0d75655d..75442663 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "1b8478f86f15dc1dd125a2a0d8331bc3600a79c1" +SRCREV = "5e433bcefaebb8dac20edb96170349f9a0adde5d" diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index 52882aad..aeb48885 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb @@ -9,4 +9,5 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "e807632b21caefa1ed6ebf1b626d8f5c596c2952" +# v5.12.3 tag wasn't created yet +SRCREV = "ae6c0fe18fff0bedced9800b11940f396b66596d" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 8cac62ef..f4fedf14 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -31,7 +31,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 = "a00c5e40a2df03713d29da83a5692f2d7c15326d" +SRCREV_qtlocation = "cbcff2b083df51fb96f38cd64446f4e5afb3b2d1" SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index 71f895ce..05c6c75a 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb @@ -9,4 +9,5 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "a4d673f9a75c7dbbcedcaa076542a71acc832fc4" +# v5.12.3 tag wasn't created yet +SRCREV = "acff2f2611e271b83c9190b060d42c88bb292fa5" diff --git a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch index 5a8ef9f3..838044a1 100644 --- a/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch +++ b/recipes-qt/qt5/qtmultimedia/0001-qtmultimedia-fix-a-conflicting-declaration.patch @@ -1,4 +1,4 @@ -From 207ce5790b1f4fd1755dff0cf5d45a1e8fc29a70 Mon Sep 17 00:00:00 2001 +From dd3b3190fd65ac636afd55c1d2e746c9fe7b6df0 Mon Sep 17 00:00:00 2001 From: Wenlin Kang Date: Thu, 8 Sep 2016 12:18:13 +0800 Subject: [PATCH] qtmultimedia: fix a conflicting declaration diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 9c2cf501..30f9c9e4 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -28,7 +28,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstream CXXFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DMESA_EGL_NO_X11_HEADERS=1', d)}" # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.12 -# 5.12.meta-qt5.2 +# 5.12.meta-qt5.3 SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " @@ -37,4 +37,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 = "9caf4812e073829fc961eb466f1325106f041841" +SRCREV = "64981aee3bbbe2c4f5503b458636a84df822b0ec" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 477258d6..849feeb9 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "bd9c083ba099a46d101ca64369f46ba7fba2a943" +SRCREV = "5c9251aebb487a6c328f2d706002ca2039aff5ac" diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 754da541..a19c3855 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb @@ -15,4 +15,5 @@ SECURITY_STRINGFORMAT = "" DEPENDS += "qtbase qtdeclarative" -SRCREV = "72c2ee600f214fccc147a9fb3809087e7064b56b" +# v5.12.3 tag wasn't created yet +SRCREV = "e42d517e350c18d6e6c5c3081e3005f10a5c20ab" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 2cf778c3..0750fe68 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "2234141c0ec838dd537bec909c87e8a184125f68" +SRCREV = "aa924c0575c54c93a5b95ace4083c34f309a16d0" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 5d18f977..d41c4b3a 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtdeclarative-native" -SRCREV = "ca799283a2266b023923286b4928fdf6e7211569" +SRCREV = "f7ba074ca19f5f3d2d7580616144c65f35b48072" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index d4ea6186..d7d9170f 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "c231395eec3494619f4977b4c5cd845b9d7341ae" +SRCREV = "3a5ac4885b4818489120e9b46c208737ad202fb6" diff --git a/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch index 10ebdac9..c587e2e8 100644 --- a/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch @@ -1,4 +1,4 @@ -From d278498bae51f730e77fee0c96eb2be8041fedda Mon Sep 17 00:00:00 2001 +From fcb448d2e366ca30a18e4cb45181b8832b8884d5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 7 Jun 2017 15:17:12 +0300 Subject: [PATCH] Allow a tools-only build @@ -10,7 +10,7 @@ Change-Id: I3b33fc1c8877fc82568bd386b063e7a0aa57b706 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/repccommon.pri b/mkspecs/features/repccommon.pri -index 5e88bf8..6efd19e 100644 +index fd321e3..e218217 100644 --- a/mkspecs/features/repccommon.pri +++ b/mkspecs/features/repccommon.pri @@ -3,7 +3,7 @@ cmd = $${QT.remoteobjects.bins}/repc diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index ff934bde..d68644db 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -12,7 +12,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" # Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.12 -# 5.12.meta-qt5.1 +# 5.12.meta-qt5.2 SRC_URI += " \ file://0001-Allow-a-tools-only-build.patch \ " @@ -24,6 +24,9 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "1c19349a28a75eec386b84af142fc571e492a3c3" +# Use 119b222dd5ee8f4410f87c5854e6e9ee65436309 instead of +# db1e447c46062946e57d7de9c0e0ea5fddc997f6 because the v5.12.3 tag wasn't +# merged to 5.12 branch yet +SRCREV = "119b222dd5ee8f4410f87c5854e6e9ee65436309" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch b/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch index 287983c6..e789ff58 100644 --- a/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch +++ b/recipes-qt/qt5/qtscript/0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch @@ -1,4 +1,4 @@ -From e60c7bff6556d9c36952de525a85c479a30f0030 Mon Sep 17 00:00:00 2001 +From 9f06841c9ff8e50c604fbd0f100e2e3ea4242309 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 23 Aug 2018 02:58:14 +0000 Subject: [PATCH] Include asm/sgidefs.h on non-glibc systems @@ -19,7 +19,7 @@ Signed-off-by: Khem Raj 1 file changed, 4 insertions(+) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h -index 96942c7..f828f04 100644 +index a4695a2..4b7a45b 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -377,7 +377,11 @@ diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 67d17b28..cebd863d 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = " \ " # Patches from https://github.com/meta-qt5/qtscript/commits/b5.12 -# 5.12.meta-qt5.2 +# 5.12.meta-qt5.3 SRC_URI += " \ file://0001-Include-asm-sgidefs.h-on-non-glibc-systems.patch \ " @@ -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 = "6c0edaf30c5bdfc2739ca646da73dcb697ab1361" +SRCREV = "2f6a1056f10dbe634c58725ad2893c6cee58bf1c" diff --git a/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch b/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch index f04dec06..b6745fa3 100644 --- a/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch +++ b/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch @@ -1,4 +1,4 @@ -From 3b1f1645e82aa1aa109a254f8ccfb789bff23ebf Mon Sep 17 00:00:00 2001 +From 490c1ce97d93e9eed6fe5789e526a8b8c22ed230 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 10 Jan 2017 15:28:26 +0200 Subject: [PATCH] Use external host bin path for cmake file diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 91b2cde2..e71d2828 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,10 +10,10 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "4bb7aa3f3002b9ba85494e5cf4808f68e0edc502" +SRCREV = "755c5a753d77f4c8f53788c870240e60673417a0" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 -# 5.12.meta-qt5.1 +# 5.12.meta-qt5.2 SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" do_install_append_class-nativesdk() { diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 7ef368cf..41c31283 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "73d5160ab8219015a25e59c62669b2926156b807" +SRCREV = "b1cb2782b369413add8aeb4c4e6c1453bbf5e367" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 3345f7df..4b912be4 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "745120ddca5fa67f1a87741e0a5c016acbd53deb" +SRCREV = "64199169df6bd5b1e31d934c0a64c13d57d0f5c4" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 1f05b6c6..1dad6ad1 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "624f175492660301af5eb321d2b8d6af7aa7fbc3" +SRCREV = "6fad8e67d879b1979c48ee615a972571a6426718" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index bb62e2e8..c167f0a7 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "2430c9ed20f3f10da7bc3e7fdb5328d8501f5776" +SRCREV = "a4c2e4de3c8c248a340bef815105371f365a456a" diff --git a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch index de1b645f..2f55a4b7 100644 --- a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch @@ -1,4 +1,4 @@ -From 6bb830c68a7a530f0a18b9ceb4ef65eed0787fa5 Mon Sep 17 00:00:00 2001 +From 49be7a63b155004c612c7e9e0c671502ecba2c70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 4 Jun 2014 11:28:16 +0200 Subject: [PATCH] add noqtwebkit configuration diff --git a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch index 6f8e7f91..24fb9b7b 100644 --- a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch +++ b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch @@ -1,4 +1,4 @@ -From 3f7d07226745370dd6dfc3ffddec5f00ea9b75e1 Mon Sep 17 00:00:00 2001 +From 8bcf6e4204f77ec656310e5ada92c27990107477 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 18 Feb 2019 10:45:03 +0200 Subject: [PATCH] linguist-tools cmake: allow overriding the location for diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index be967149..0ac8a76f 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtxmlpatterns" # Patches from https://github.com/meta-qt5/qttools/commits/b5.12 -# 5.12.meta-qt5.1 +# 5.12.meta-qt5.2 SRC_URI += " \ file://0001-add-noqtwebkit-configuration.patch \ file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \ @@ -32,7 +32,10 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ " -SRCREV = "b0147a5d79ce7a7e77a24f36aaddfacb1a1517c8" +# Use 50335cb26bb88930f5e2a204642439cc9a4d2282 instead of +# 1f8d498752fed0b2b92d6a619aa11524dd771998 because the v5.12.3 tag wasn't +# merged to 5.12 branch yet +SRCREV = "50335cb26bb88930f5e2a204642439cc9a4d2282" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 4158fb00..88948a56 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -SRCREV = "c8a0da51adcc015447fc26e5a2b3d1de12479f75" +SRCREV = "8cd09ac290c75eeeb91c015e7d7791b15c0cac5e" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index bd339428..55f39205 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "277aad92fb5d5612c2b952f05063518d877a5138" +SRCREV = "c7f9640cb883c05e1ba51dac69078782b7eff855" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index a63c49cd..a33c9bba 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "0d717b0cc9aa3b87821450a2bce0d0bf0f1a6bfb" +SRCREV = "bcdc00bcdc67ee478369c04c994c1f576e51cfab" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index b039ba38..cc3c867a 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "45da510a0a87593a2ae6f98e41bb01b9d39ace58" +SRCREV = "5bcd09ac1b670658c77b7712873c75893e4a41a4" diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch index c9266582..7136b475 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From a321d1b96ce0563a08d0bb44c39d24f86608f6ae Mon Sep 17 00:00:00 2001 +From bf92c8a03189d7a559aff7d62c2d9fc6047d2659 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 15 Mar 2017 13:53:28 +0200 Subject: [PATCH] Force host toolchain configuration @@ -17,6 +17,8 @@ Signed-off-by: Samuli Piippo src/core/config/linux.pri | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) +diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro +index dd0d3e32..70161c82 100644 --- a/src/buildtools/configure_host.pro +++ b/src/buildtools/configure_host.pro @@ -4,7 +4,7 @@ TEMPLATE = aux @@ -35,9 +37,9 @@ Signed-off-by: Samuli Piippo -" cc = \"$$which($$QMAKE_CC)\" " \ -" cxx = \"$$which($$QMAKE_CXX)\" " \ -" ld = \"$$which($$QMAKE_LINK)\" " \ -+" cc = \"$$which($$CC_host)\" " \ -+" cxx = \"$$which($$CXX_host)\" " \ -+" ld = \"$$which($$CXX_host)\" " \ ++" cc = \"$$which(gcc)\" " \ ++" cxx = \"$$which(g++)\" " \ ++" ld = \"$$which(g++)\" " \ " ar = \"$$which(ar)\" " \ " nm = \"$$which(nm)\" " \ " extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \ @@ -48,15 +50,17 @@ Signed-off-by: Samuli Piippo -" cc = \"$$which($$QMAKE_CC)\" " \ -" cxx = \"$$which($$QMAKE_CXX)\" " \ -" ld = \"$$which($$QMAKE_LINK)\" " \ -+" cc = \"$$which($$CC_host)\" " \ -+" cxx = \"$$which($$CXX_host)\" " \ -+" ld = \"$$which($$CXX_host)\" " \ ++" cc = \"$$which(gcc)\" " \ ++" cxx = \"$$which(g++)\" " \ ++" ld = \"$$which(g++)\" " \ " ar = \"$$which(ar)\" " \ " nm = \"$$which(nm)\" " \ " toolchain_args = { " \ +diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri +index 9fc8c6e8..f3768585 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri -@@ -112,7 +112,7 @@ contains(QT_ARCH, "mips") { +@@ -113,7 +113,7 @@ contains(QT_ARCH, "mips") { host_build { gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" diff --git a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch new file mode 100644 index 00000000..c244a864 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch @@ -0,0 +1,37 @@ +From 9409b83e634b53eb59cc0935424ea6fca1f50491 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Tue, 12 Dec 2017 16:06:14 +0200 +Subject: [PATCH] musl: don't use pvalloc as it's not available on musl + +Change-Id: I7145463ac7b9560e7459d3384a3db108bd727403 +Signed-off-by: Samuli Piippo +--- + src/core/api/qtbug-61521.cpp | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp +index 002a1af2..8fd2da36 100644 +--- a/src/core/api/qtbug-61521.cpp ++++ b/src/core/api/qtbug-61521.cpp +@@ -74,10 +74,6 @@ SHIM_SYMBOL_VERSION(valloc); + void* __valloc(size_t size) + SHIM_ALIAS_SYMBOL(ShimValloc); + +-SHIM_SYMBOL_VERSION(pvalloc); +-void* __pvalloc(size_t size) +- SHIM_ALIAS_SYMBOL(ShimPvalloc); +- + SHIM_SYMBOL_VERSION(posix_memalign); + int __posix_memalign(void** r, size_t a, size_t s) + SHIM_ALIAS_SYMBOL(ShimPosixMemalign); +@@ -110,10 +106,6 @@ SHIM_HIDDEN void* ShimValloc(size_t size) { + return valloc(size); + } + +-SHIM_HIDDEN void* ShimPvalloc(size_t size) { +- return pvalloc(size); +-} +- + SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) { + return posix_memalign(r,a,s); + } diff --git a/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch deleted file mode 100644 index f39fc0c6..00000000 --- a/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c5aec4fbfa53ba0174c6fe221422dafc036cb303 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Tue, 12 Dec 2017 16:06:14 +0200 -Subject: [PATCH] musl: don't use pvalloc as it's not available on musl - -Change-Id: I7145463ac7b9560e7459d3384a3db108bd727403 -Signed-off-by: Samuli Piippo ---- - src/core/api/qtbug-61521.cpp | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp -index 002a1af2..8fd2da36 100644 ---- a/src/core/api/qtbug-61521.cpp -+++ b/src/core/api/qtbug-61521.cpp -@@ -74,10 +74,6 @@ SHIM_SYMBOL_VERSION(valloc); - void* __valloc(size_t size) - SHIM_ALIAS_SYMBOL(ShimValloc); - --SHIM_SYMBOL_VERSION(pvalloc); --void* __pvalloc(size_t size) -- SHIM_ALIAS_SYMBOL(ShimPvalloc); -- - SHIM_SYMBOL_VERSION(posix_memalign); - int __posix_memalign(void** r, size_t a, size_t s) - SHIM_ALIAS_SYMBOL(ShimPosixMemalign); -@@ -110,10 +106,6 @@ SHIM_HIDDEN void* ShimValloc(size_t size) { - return valloc(size); - } - --SHIM_HIDDEN void* ShimPvalloc(size_t size) { -- return pvalloc(size); --} -- - SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) { - return posix_memalign(r,a,s); - } diff --git a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch new file mode 100644 index 00000000..6b78f4ef --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch @@ -0,0 +1,24 @@ +From a24cb0ef3b7311719ec248f4f1771f192c7cf4a0 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Thu, 14 Dec 2017 11:28:10 +0200 +Subject: [PATCH] musl: link against libexecinfo + +Change-Id: Ifada60f9c72691973612850121f6fb152d70839a +Signed-off-by: Samuli Piippo +--- + src/core/core_module.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/core_module.pro b/src/core/core_module.pro +index 3b5d37f2..0882d5fd 100644 +--- a/src/core/core_module.pro ++++ b/src/core/core_module.pro +@@ -51,7 +51,7 @@ linux { + POST_TARGETDEPS += $$NINJA_TARGETDEPS + + +-LIBS_PRIVATE += -L$$api_library_path ++LIBS_PRIVATE += -L$$api_library_path -lexecinfo + CONFIG *= no_smart_library_merge + osx { + LIBS_PRIVATE += -Wl,-force_load,$${api_library_path}$${QMAKE_DIR_SEP}lib$${api_library_name}.a diff --git a/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch deleted file mode 100644 index 3fe1334d..00000000 --- a/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch +++ /dev/null @@ -1,24 +0,0 @@ -From b2e6e538fc15b69559f764af8aa14c081999e832 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Thu, 14 Dec 2017 11:28:10 +0200 -Subject: [PATCH] musl: link against libexecinfo - -Change-Id: Ifada60f9c72691973612850121f6fb152d70839a -Signed-off-by: Samuli Piippo ---- - src/core/core_module.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/core_module.pro b/src/core/core_module.pro -index 3b5d37f2..0882d5fd 100644 ---- a/src/core/core_module.pro -+++ b/src/core/core_module.pro -@@ -51,7 +51,7 @@ linux { - POST_TARGETDEPS += $$NINJA_TARGETDEPS - - --LIBS_PRIVATE += -L$$api_library_path -+LIBS_PRIVATE += -L$$api_library_path -lexecinfo - CONFIG *= no_smart_library_merge - osx { - LIBS_PRIVATE += -Wl,-force_load,$${api_library_path}$${QMAKE_DIR_SEP}lib$${api_library_name}.a diff --git a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch index d914a862..4e901aa9 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From f430c2c9b3d38f9150588da6dc154aa2285584e6 Mon Sep 17 00:00:00 2001 +From b0e6bada9d4da53204dffa7d9343f925c7d5603e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 15 Mar 2017 13:53:28 +0200 Subject: [PATCH] chromium: Force host toolchain configuration diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch index 9a3affdf..0b4c1a33 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch @@ -1,4 +1,4 @@ -From 350f26fa393353ecbbb85ed1bc990b8072160c7e Mon Sep 17 00:00:00 2001 +From 0bf810937f9340c19d1a085eed04d4a209c17d23 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 30 Mar 2017 11:37:24 +0300 Subject: [PATCH] chromium: workaround for too long .rps file name diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch index ef44aaf6..8281dd71 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch @@ -1,4 +1,4 @@ -From 5945b54c4095cd52eef8ab43c47a5c8c24a1aa0a Mon Sep 17 00:00:00 2001 +From 53b101c4d3d419920d8a9f96d8afe10716c137c5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 5 Jun 2018 13:58:16 +0000 Subject: [PATCH] chromium: Fix build with gcc8 diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-stack-pointer-clobber.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-stack-pointer-clobber.patch index 7716a76f..8490ed7c 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-stack-pointer-clobber.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-stack-pointer-clobber.patch @@ -1,4 +1,4 @@ -From d517836886eee72503aecc3e866fb7f08e6b0c49 Mon Sep 17 00:00:00 2001 +From a355be3c293984932bd6d858b5773e511a18fcf4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 23 Dec 2018 16:58:04 -0800 Subject: [PATCH] chromium: stack pointer clobber diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch index 0340d995..3389d69b 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch @@ -1,4 +1,4 @@ -From 3386b5df27ec6dfd42fa5bc30b5e307b293a0a5f Mon Sep 17 00:00:00 2001 +From 2297089fdb32aca352802b1c7b044d0441f54165 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 14:01:12 -0700 Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch index 3d1c7ff0..45c8c8d0 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch @@ -1,4 +1,4 @@ -From 8a99b4662109d03502baa1578d5484bfdd399caf Mon Sep 17 00:00:00 2001 +From 80cf8eb756140011f358522378d640587600976a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 14:09:06 -0700 Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-include-fcntl.h-for-loff_t.patch index 05a8ac33..557aa1ee 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-include-fcntl.h-for-loff_t.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-musl-include-fcntl.h-for-loff_t.patch @@ -1,4 +1,4 @@ -From f451b8f55b6258a725a2ba470ca8feaa600f621e Mon Sep 17 00:00:00 2001 +From 479ba4a1be5e24b1b2292554d5a9cbc519b41759 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 14:37:49 -0700 Subject: [PATCH] chromium: musl: include fcntl.h for loff_t diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch index 1acfd7be..7fef5e0f 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch @@ -1,4 +1,4 @@ -From 36d8ce0f390678080a670d1c48340c341d33bfad Mon Sep 17 00:00:00 2001 +From d4869cfc2ab0acdd81926346c1aa4fb067063ad3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 14:38:37 -0700 Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-linux-glibc-make-the-distinction.patch index 7a6636fe..ff414d58 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-linux-glibc-make-the-distinction.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-musl-linux-glibc-make-the-distinction.patch @@ -1,4 +1,4 @@ -From 606a0f86fdfb600ab43221e079483d5de5db39bb Mon Sep 17 00:00:00 2001 +From bc9f2d7094ad59da25d0ca58a170ef4a8e448559 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 14:54:38 -0700 Subject: [PATCH] chromium: musl: linux != glibc, make the distinction diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch index 82ac109d..705d0d75 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch @@ -1,4 +1,4 @@ -From 418261c2f6f4c5ec81e390af265aa22b7adba272 Mon Sep 17 00:00:00 2001 +From ea19d6ef223ed875c5db4e71167fc7a5349105aa Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 15:09:02 -0700 Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch index 2916dbd3..be1cbeb9 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch @@ -1,4 +1,4 @@ -From 69d01ff29ba4e338c9d13369a511e90ab0168afa Mon Sep 17 00:00:00 2001 +From 4070d0bee442e479c90f932162c3398c8f9e2328 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 15:12:39 -0700 Subject: [PATCH] chromium: musl: Use correct member name __si_fields from diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch index 6abab3ea..984ceeed 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch @@ -1,4 +1,4 @@ -From ad6c7f73c56dc465b0554437da971adf763c4032 Mon Sep 17 00:00:00 2001 +From 399c5fee7c38d80c43211fc75dc4486527097fa2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 15:27:50 -0700 Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch index 8f3463de..497382cc 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-Do-not-define-__sbrk-on-musl.patch @@ -1,4 +1,4 @@ -From f1060910189ba7760b7285a4b221065c1d677241 Mon Sep 17 00:00:00 2001 +From cb81d0f57b4ceb0f3ff0600fb72f4b53360c11f2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 15:39:57 -0700 Subject: [PATCH] chromium: musl: Do not define __sbrk on musl diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch index a3b34b22..4124f656 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Adjust-default-pthread-stack-size.patch @@ -1,4 +1,4 @@ -From 7f95397de67e00390fd90ed6b2f70dcfde8d7285 Mon Sep 17 00:00:00 2001 +From 51a9cff6d78c2a744b6cbf77678aebb8dde7540c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 16:41:23 -0700 Subject: [PATCH] chromium: musl: Adjust default pthread stack size diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch index 5595c777..c2127809 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch @@ -1,4 +1,4 @@ -From 010cff20ca97bba43ed9d6332bd3e9b0198c97a4 Mon Sep 17 00:00:00 2001 +From 57200f491a8a103fc6c33d1041cc6d12180b0a24 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 17:15:34 -0700 Subject: [PATCH] chromium: musl: include asm-generic/ioctl.h for TCGETS2 diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch index fc9eef80..d84bacab 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-Use-_fpstate-instead-of-_libc_fpstate-.patch @@ -1,4 +1,4 @@ -From 7bc63fb1e62c906db5be40acd1d10095461cd4bd Mon Sep 17 00:00:00 2001 +From 40e96bb47b906ba3bd9a8b554124c8c3c6bebf86 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 25 Sep 2018 12:35:07 -0700 Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate on diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch index 51e852ce..87849bc4 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch @@ -1,4 +1,4 @@ -From 7652de3ab9dbc9eacf73a3fe16559a1651a48b1a Mon Sep 17 00:00:00 2001 +From 1cc81d323479a164f5f64033b284658ef9c49e0b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 25 Sep 2018 12:59:05 -0700 Subject: [PATCH] chromium: musl: elf_reader.cc: include to get diff --git a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-pread-pwrite.patch index fd6ed6ad..4483ab1c 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-pread-pwrite.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-pread-pwrite.patch @@ -1,4 +1,4 @@ -From b8d97e253b4df62b2ab8b313a34d69d29c63b24c Mon Sep 17 00:00:00 2001 +From d32ababfc7cfe3783c7600474487fba1ba4b805e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 23 Dec 2018 16:58:04 -0800 Subject: [PATCH] chromium: musl: pread pwrite diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch index 050fb064..3305c6b4 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch @@ -1,4 +1,4 @@ -From 4ed2bab8183cf8252b52a493665ddf84188f12f6 Mon Sep 17 00:00:00 2001 +From 249b99b4b54468b428a156f33e2a72066c82e9c2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 2 Feb 2019 19:28:59 -0800 Subject: [PATCH] chromium: fix build with clang @@ -10,7 +10,7 @@ Signed-off-by: Khem Raj 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn -index d223a4f6fd..1c42c49ea4 100644 +index d223a4f6fd4..1c42c49ea4a 100644 --- a/chromium/build/config/compiler/BUILD.gn +++ b/chromium/build/config/compiler/BUILD.gn @@ -544,13 +544,6 @@ config("compiler") { @@ -89,6 +89,3 @@ index d223a4f6fd..1c42c49ea4 100644 cflags += [ "-EB", "-mabi=64", --- -2.20.1 - diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch index ef00025c..5988ec7f 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch @@ -1,7 +1,7 @@ -From f304341d4e0a24469575129e2f2a79a969d8ecaf Mon Sep 17 00:00:00 2001 +From 4e99677795977faccd1f28ac8fb8b3cfd72c4dcd Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 2 Feb 2019 22:09:20 -0800 -Subject: [PATCH 1/2] chromium: Check for __ARM_FP & 2 before using __fp16 +Subject: [PATCH] chromium: Check for __ARM_FP & 2 before using __fp16 The __fp16 type denotes half-precision (16-bit) floating-point. The recommended way to test for this hardware support is to test bit 1 in __ARM_FP @@ -16,7 +16,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h -index 33d9e7aa39..aaefa5371a 100644 +index 33d9e7aa39f..aaefa5371ae 100644 --- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h +++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h @@ -679,7 +679,7 @@ SI F from_half(U16 h) { @@ -28,6 +28,3 @@ index 33d9e7aa39..aaefa5371a 100644 __fp16 fp16 = __fp16(f); U16 u16; memcpy(&u16, &fp16, sizeof(U16)); --- -2.20.1 - diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch index e0c0dbb6..377795f8 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch @@ -1,4 +1,4 @@ -From 432514e835f5bfefc2bb88adbb2ba468e9c07beb Mon Sep 17 00:00:00 2001 +From b882013421036a05ea8c909292cc38d05fc29c89 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 5 Feb 2019 14:32:20 -0800 Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm @@ -11,9 +11,11 @@ src/3rdparty/chromium/third_party/zlib/crc32_simd.c:184: undefined reference to Upstream-Status: Pending Signed-off-by: Khem Raj --- - chromium/third_party/zlib/BUILD.gn | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + chromium/third_party/zlib/BUILD.gn | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn +index 05907b481ac..dbc4be143cd 100644 --- a/chromium/third_party/zlib/BUILD.gn +++ b/chromium/third_party/zlib/BUILD.gn @@ -70,8 +70,11 @@ config("zlib_arm_crc32_config") { diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index d6730cf9..b65ceea5 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -135,18 +135,18 @@ RDEPENDS_${PN}-examples += " \ QT_MODULE_BRANCH_CHROMIUM = "69-based" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.12 -# 5.12.meta-qt5.2 +# 5.12.meta-qt5.3 SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ file://0001-Force-host-toolchain-configuration.patch \ " SRC_URI_append_libc-musl = "\ - file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ - file://0004-musl-link-against-libexecinfo.patch \ + file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ + file://0003-musl-link-against-libexecinfo.patch \ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/69-based -# 69-based.meta-qt5.3 +# 69-based.meta-qt5.4 SRC_URI += " \ file://chromium/0001-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ @@ -174,8 +174,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "92b078a534390dba64a0dcebcffdab4ce24581b6" -SRCREV_chromium = "43316b156e65f867a76ed2afd96bf30696c5f4f6" +SRCREV_qtwebengine = "c7b8d6d87809253241913c595902a11ea506b2b7" +SRCREV_chromium = "4c7ecce30045daf172dceaeeb86351f60cc91990" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 7faa3795..01538d0d 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb @@ -18,4 +18,4 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "b1662da58d05dd53b5d4c84a3518c65f417cefd8" +SRCREV = "9007ba49d14ef56e56a2114685ddd5b23e25f5c8" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 4ed72dc7..59f5cd85 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "b4bac09b3b2f0c3072d797b22c44e20b661c4723" +SRCREV = "0f1373617f2d1c562fd448fee207f7d99a0191bc" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index a7a66387..60733298 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "0aa43dc555e0a820bf13a6b12671ee6a79161155" +SRCREV = "3ae7d8eac3a46b5a70d71c556703ce2f21c169dc" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index dfd305d3..aca99236 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "3bfaa26890990d140caba4b9a1050906c2ee546c" +SRCREV = "b5c05ebc46fde8e98e388cd5bf86795b040da505" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 9ec19415..103648eb 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -25,7 +25,7 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "e8026ec6a30c5124c2e3162d9a17e9ae11fa4475" +SRCREV = "f969bdea083012282806ae83a38ace53ef1ba600" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3-54-g00ecf From f4531ec860071c308725a8539ef5003da11da8a1 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 2 May 2019 18:36:25 +0000 Subject: qtwebengine: restore the fix for build with clang/libc++ on aarch64/arm * it was fixed in: https://github.com/meta-qt5/meta-qt5/commit/5be2654885b3699520c4370579c929e2ce352e80 * but then when upgrading to 5.12.3 from meta-qt5/qtwebengine I've accidentally overwritten this one with the older version in: https://github.com/meta-qt5/meta-qt5/commit/e2707a016c3475c167a421c9c73d88f81cc61bd1 Signed-off-by: Martin Jansa --- .../0001-Force-host-toolchain-configuration.patch | 16 ++++++++-------- ...don-t-use-pvalloc-as-it-s-not-available-on-musl.patch | 2 +- .../qtwebengine/0003-musl-link-against-libexecinfo.patch | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine_git.bb') diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch index 7136b475..8de23c76 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From bf92c8a03189d7a559aff7d62c2d9fc6047d2659 Mon Sep 17 00:00:00 2001 +From eb0b90b8809a8d8bd76999056d74d433a6c23184 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 15 Mar 2017 13:53:28 +0200 Subject: [PATCH] Force host toolchain configuration @@ -18,7 +18,7 @@ Signed-off-by: Samuli Piippo 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro -index dd0d3e32..70161c82 100644 +index dd0d3e32..6312c867 100644 --- a/src/buildtools/configure_host.pro +++ b/src/buildtools/configure_host.pro @@ -4,7 +4,7 @@ TEMPLATE = aux @@ -37,9 +37,9 @@ index dd0d3e32..70161c82 100644 -" cc = \"$$which($$QMAKE_CC)\" " \ -" cxx = \"$$which($$QMAKE_CXX)\" " \ -" ld = \"$$which($$QMAKE_LINK)\" " \ -+" cc = \"$$which(gcc)\" " \ -+" cxx = \"$$which(g++)\" " \ -+" ld = \"$$which(g++)\" " \ ++" cc = \"$$which($$CC_host)\" " \ ++" cxx = \"$$which($$CXX_host)\" " \ ++" ld = \"$$which($$CXX_host)\" " \ " ar = \"$$which(ar)\" " \ " nm = \"$$which(nm)\" " \ " extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \ @@ -50,9 +50,9 @@ index dd0d3e32..70161c82 100644 -" cc = \"$$which($$QMAKE_CC)\" " \ -" cxx = \"$$which($$QMAKE_CXX)\" " \ -" ld = \"$$which($$QMAKE_LINK)\" " \ -+" cc = \"$$which(gcc)\" " \ -+" cxx = \"$$which(g++)\" " \ -+" ld = \"$$which(g++)\" " \ ++" cc = \"$$which($$CC_host)\" " \ ++" cxx = \"$$which($$CXX_host)\" " \ ++" ld = \"$$which($$CXX_host)\" " \ " ar = \"$$which(ar)\" " \ " nm = \"$$which(nm)\" " \ " toolchain_args = { " \ diff --git a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch index c244a864..07092012 100644 --- a/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch @@ -1,4 +1,4 @@ -From 9409b83e634b53eb59cc0935424ea6fca1f50491 Mon Sep 17 00:00:00 2001 +From b3125c1b3f32915aa80acf58a9d1eeab4e260b17 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 12 Dec 2017 16:06:14 +0200 Subject: [PATCH] musl: don't use pvalloc as it's not available on musl diff --git a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch index 6b78f4ef..6dc7f0cb 100644 --- a/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch +++ b/recipes-qt/qt5/qtwebengine/0003-musl-link-against-libexecinfo.patch @@ -1,4 +1,4 @@ -From a24cb0ef3b7311719ec248f4f1771f192c7cf4a0 Mon Sep 17 00:00:00 2001 +From 983ba7f8f80165ade5347544f1e975bd6b67549e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 14 Dec 2017 11:28:10 +0200 Subject: [PATCH] musl: link against libexecinfo diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index b65ceea5..6ad69f20 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -135,7 +135,7 @@ RDEPENDS_${PN}-examples += " \ QT_MODULE_BRANCH_CHROMIUM = "69-based" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.12 -# 5.12.meta-qt5.3 +# 5.12.meta-qt5.4 SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ file://0001-Force-host-toolchain-configuration.patch \ -- cgit v1.2.3-54-g00ecf From c7e0ba566f136a55ce69287cd3f72952b3a43687 Mon Sep 17 00:00:00 2001 From: Johannes Pointner Date: Mon, 6 May 2019 10:19:46 +0200 Subject: qtwebengine: arm: use OE specified -mcpu option OE-Core sets -mcpu option, which is equivalent to -march and -mtune combination. Therefore don't set -march and -mtune in chromium. Signed-off-by: Johannes Pointner --- ...-not-try-to-set-the-guessed-values-for-ma.patch | 41 ++++++++++++++++++++++ recipes-qt/qt5/qtwebengine_git.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 recipes-qt/qt5/qtwebengine/chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch (limited to 'recipes-qt/qt5/qtwebengine_git.bb') diff --git a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch new file mode 100644 index 00000000..1e3f2c15 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch @@ -0,0 +1,41 @@ +From 058158c568698f79c905c19e5ef32ca714f8223e Mon Sep 17 00:00:00 2001 +From: Johannes Pointner +Date: Fri, 3 May 2019 09:12:38 +0200 +Subject: [PATCH 1/1] chromium: Do not try to set the guessed values for + march/mtune/float-abi OE config machinary has computed these values already + and fed it via compiler cmdline to chromium build + +I think upstream should check for the values on compiler cmdline +before overriding these + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj +Signed-off-by: Johannes Pointner +--- + chromium/build/config/compiler/BUILD.gn | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn +index 1c42c49ea4..e919e157d7 100644 +--- a/chromium/build/config/compiler/BUILD.gn ++++ b/chromium/build/config/compiler/BUILD.gn +@@ -742,15 +742,6 @@ config("compiler_cpu_abi") { + } else if (current_cpu == "arm") { + if (is_clang && !is_android && !is_nacl) { + } +- if (!is_nacl) { +- cflags += [ +- "-march=$arm_arch", +- "-mfloat-abi=$arm_float_abi", +- ] +- } +- if (arm_tune != "") { +- cflags += [ "-mtune=$arm_tune" ] +- } + } else if (current_cpu == "arm64") { + if (is_clang && !is_android && !is_nacl && !is_fuchsia) { + } +-- +2.21.0 + diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 6ad69f20..84fcfbfb 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -155,6 +155,7 @@ SRC_URI += " \ file://chromium/0019-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ file://chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch;patchdir=src/3rdparty \ file://chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ + file://chromium/0022-chromium-Do-not-try-to-set-the-guessed-values-for-ma.patch;patchdir=src/3rdparty \ " SRC_URI_append_libc-musl = "\ -- cgit v1.2.3-54-g00ecf From 5bbb8d27ca10c38300bfc0c31c68470eb32b7711 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Sun, 5 May 2019 20:34:26 +0300 Subject: qt5: update submodules Update to Qt 5.13.0 beta4 Task-number: QTBUG-72311 Change-Id: Ia25415c4fb796bbc7335ae468030be4634ca4085 Reviewed-by: Jani Heikkinen --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- .../qt5/qt3d/0001-Allow-a-tools-only-build.patch | 29 +++++++++++--------- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 32 +++++++++++----------- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtcoap_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtgamepad_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtknx_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtmqtt_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtnetworkauth_git.bb | 2 +- recipes-qt/qt5/qtopcua_git.bb | 2 +- recipes-qt/qt5/qtpurchasing_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtremoteobjects_git.bb | 2 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtscxml_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qtsvg_git.bb | 2 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- .../0001-Force-host-toolchain-configuration.patch | 26 +++++++++--------- recipes-qt/qt5/qtwebengine_git.bb | 4 +-- recipes-qt/qt5/qtwebglplugin_git.bb | 2 +- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtwebview_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 42 files changed, 85 insertions(+), 82 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine_git.bb') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 72de6a81..939d8c02 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -193,4 +193,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 = "12b96dbb81a1a7bc5ffc08c24942038b007985e9" +SRCREV = "ca0f85da82252057894401ada4c2daac63d770bb" diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch index 21fdbd4e..05a86a70 100644 --- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch @@ -1,26 +1,24 @@ -From 98509dbb66b3d93cdb6ca73cb5db537fa8ff8bd3 Mon Sep 17 00:00:00 2001 +From 1e64f9b509e6794c6f01e62443e93f771ac2a65c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 17 Aug 2018 13:23:58 +0300 Subject: [PATCH] Allow a tools-only build --- - qt3d.pro | 9 +++++++-- + qt3d.pro | 7 ++++++- src/3rdparty/assimp/assimp_dependency.pri | 2 +- - tools/tools.pro | 2 +- + tools/tools.pro | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/qt3d.pro b/qt3d.pro -index 847507f..286286d 100644 +index d5dbda4..6809470 100644 --- a/qt3d.pro +++ b/qt3d.pro -@@ -1,5 +1,5 @@ --requires(qtHaveModule(gui)) --requires(qtConfig(opengl):!wasm) -+!tools-only:requires(qtHaveModule(gui)) -+!tools-only:requires(qtConfig(opengl):!wasm) +@@ -1,4 +1,4 @@ +-qtHaveModule(gui): \ ++!tools-only:qtHaveModule(gui): \ + requires(qtConfig(opengl):!wasm) CONFIG += examples_need_tools - load(qt_parts) @@ -15,3 +15,8 @@ load(qt_parts) OTHER_FILES += \ @@ -31,7 +29,7 @@ index 847507f..286286d 100644 + SUBDIRS = sub_tools +} diff --git a/src/3rdparty/assimp/assimp_dependency.pri b/src/3rdparty/assimp/assimp_dependency.pri -index 8ba2d9a41..e973d93dd 100644 +index 8ba2d9a..e973d93 100644 --- a/src/3rdparty/assimp/assimp_dependency.pri +++ b/src/3rdparty/assimp/assimp_dependency.pri @@ -1,5 +1,5 @@ @@ -42,11 +40,16 @@ index 8ba2d9a41..e973d93dd 100644 } else { include(assimp.pri) diff --git a/tools/tools.pro b/tools/tools.pro -index 1215076..24c49ad 100644 +index 3b457ed..9f5376a 100644 --- a/tools/tools.pro +++ b/tools/tools.pro -@@ -1,5 +1,5 @@ +@@ -1,9 +1,9 @@ TEMPLATE = subdirs + +-!qtHaveModule(3dcore): \ ++!tools-only:!qtHaveModule(3dcore): \ + return() + QT_FOR_CONFIG += 3dcore-private -qtConfig(assimp):qtConfig(commandlineparser): { +tools-only|qtConfig(assimp):qtConfig(commandlineparser): { diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 03ec775b..25681f53 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -36,6 +36,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "276be935bfeccde733bacd4267abeb978f6efda5" +SRCREV = "7640c5d526d10e0397e9f2e712139433165d269f" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index b780c5c2..cee1a1c4 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -141,4 +141,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 = "12b96dbb81a1a7bc5ffc08c24942038b007985e9" +SRCREV = "ca0f85da82252057894401ada4c2daac63d770bb" diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 4d90c772..155dd63c 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 406ea336ac2a1bc7dac055c378303f27b8a20c2d Mon Sep 17 00:00:00 2001 +From 0edb35edfc5ef383e705b50422796dbd5ba8ef1a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH] Add linux-oe-g++ platform @@ -21,17 +21,17 @@ Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c Signed-off-by: Martin Jansa --- configure | 2 +- - mkspecs/features/configure.prf | 4 +-- - mkspecs/features/qt.prf | 6 ++--- + mkspecs/features/configure.prf | 4 ++-- + mkspecs/features/qt.prf | 6 +++--- mkspecs/features/qt_functions.prf | 2 +- - mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++++++++++++++++ + mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++++++++++++++++++++++++ mkspecs/linux-oe-g++/qplatformdefs.h | 1 + 6 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 mkspecs/linux-oe-g++/qmake.conf create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index ef7bad1bfc..dcca0f9135 100755 +index ef7bad1..dcca0f9 100755 --- a/configure +++ b/configure @@ -712,7 +712,7 @@ fi @@ -44,7 +44,7 @@ index ef7bad1bfc..dcca0f9135 100755 # build qmake diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index 934a18a924..0f5b1b6333 100644 +index 934a18a..0f5b1b6 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -46,14 +46,14 @@ defineTest(qtCompileTest) { @@ -65,19 +65,19 @@ index 934a18a924..0f5b1b6333 100644 msg = "test $$1 succeeded" write_file($$QMAKE_CONFIG_LOG, msg, append) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index d8d5acaafd..57d11420c2 100644 +index 3a71376..dd6020f 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf -@@ -147,7 +147,7 @@ import_plugins:qtConfig(static) { - !isEmpty(plug_type) { +@@ -148,7 +148,7 @@ import_plugins:qtConfig(static) { + plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB plug_path = $$eval(QT_PLUGIN.$${plug}.PATH) isEmpty(plug_path): \ - plug_path = $$[QT_INSTALL_PLUGINS/get] + plug_path = $$[QT_INSTALL_PLUGINS] - LIBS += -L$$plug_path/$$plug_type - } - LIBS += -l$${plug}$$qtPlatformTargetSuffix() -@@ -277,8 +277,8 @@ for(ever) { + LIBS += $$plug_path/$$plug_type/$$plug_name + } else { + LIBS += -l$${plug}$$qtPlatformTargetSuffix() +@@ -271,8 +271,8 @@ for(ever) { # static builds: link qml import plugins into the target. contains(all_qt_module_deps, qml): \ qtConfig(static):import_plugins:!host_build:!no_import_scan { @@ -89,7 +89,7 @@ index d8d5acaafd..57d11420c2 100644 # run qmlimportscanner qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 1903e509c8..c093dd4592 100644 +index 1903e50..c093dd4 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -69,7 +69,7 @@ defineTest(qtHaveModule) { @@ -103,7 +103,7 @@ index 1903e509c8..c093dd4592 100644 cmd = perl -w $$system_path($${cmd}.pl) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000000..c202c47fa1 +index 0000000..c202c47 --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf @@ -0,0 +1,39 @@ @@ -148,7 +148,7 @@ index 0000000000..c202c47fa1 +load(qt_config) diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h new file mode 100644 -index 0000000000..5d22fb4101 +index 0000000..5d22fb4 --- /dev/null +++ b/mkspecs/linux-oe-g++/qplatformdefs.h @@ -0,0 +1 @@ diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 9a7ffaf5..9161af0d 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -275,4 +275,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "12b96dbb81a1a7bc5ffc08c24942038b007985e9" +SRCREV = "ca0f85da82252057894401ada4c2daac63d770bb" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index cf28db5f..b289914b 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "beda274e7d8b5a6864b254a9e63b654f3c494139" +SRCREV = "7c50ad366e8e40996a3b75a31b9834f6f667bde6" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtcoap_git.bb b/recipes-qt/qt5/qtcoap_git.bb index e638c523..d73c1ace 100644 --- a/recipes-qt/qt5/qtcoap_git.bb +++ b/recipes-qt/qt5/qtcoap_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "cf5699e4050b200b9ee80bf4a1c8fbcecb2877af" +SRCREV = "18289e7c1d2778460dccb1135fe283bd234954ad" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 15e33eb3..5379d09f 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -21,4 +21,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "d37dbf7727e1e7f3dce70d5855ec407e2e8a6e54" +SRCREV = "8f2d6640f959e35a8fd033a50aa57cb13b673cbb" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 56aafa95..78de05b3 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "7dc2d9302347b87993f5cfed4be5d6b9c3e130bc" +SRCREV = "cc7f4769a02421575c9f5a61d9b3687af79201dd" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 34a10e66..9d06377d 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -24,6 +24,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "8bc3329e2cec4638fa9af274a40dda176bbb7352" +SRCREV = "ecc092fa5519e77a47ef560f0137b4cd5f417c5e" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index ebc273e7..a130c86e 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "df36f287894dca61486b6769866718688cce12f3" +SRCREV = "7d610c6b1a437235cba38848c1af9afd5556dc73" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index a27e99ad..973a2b7a 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -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 = "085275b92a55a21cbcf8d307a6f52804875deedd" +SRCREV = "417dff666bd5a9e5a09b67780b0ffa8a496cbe92" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index f7892836..d1905873 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "5fba848889ade8eb067b8a54011e20e9d59b4738" +SRCREV = "a743e1427b4ce9b4f1c43d3456679c09cee7b4e0" diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index cb9b3eb1..5544c62f 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "60d096199945d39aad92384e3ba9a47be406d650" +SRCREV = "4443f12461fc9cab42f4229454a390bd9e1ec4a4" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 5003dd94..7064bc72 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -31,7 +31,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 = "b392921e33b4e8d425f1881afb95e6d34e53879c" +SRCREV_qtlocation = "ca339bc55d6fc617c63e723c43150445fc8ac050" SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index b77f5b65..af28b74b 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "c8a837521b92082d47f986f61ec9ec0263146b7c" +SRCREV = "72257654cc6f065f64c9218864e1be5f66738e8a" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 887c2f38..b24f2a4c 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -37,4 +37,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 = "d97d618a4884c2535ba787e774f0faa6bce82081" +SRCREV = "f5c4fdd1f57bfbcb0a286ca10de5f6d5d0e47047" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index f03ec6e2..a63a29e8 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "cf5741a44a6c337fa523080838d8e9220f4370c1" +SRCREV = "8bc01cbfe15843ab0ea6e9b9731c4eab83dec1ab" diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index 798996de..b7bdd4ec 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb @@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = "" DEPENDS += "qtbase" -SRCREV = "61a2c26fe8831a0a743efd0e179bbe9bf9425235" +SRCREV = "3a75d0ac951d9ef165d1f33e9812be9346a6c1f4" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 692a4b70..846e6eda 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "12c4da762bd29399767538ca716189908e41cc5a" +SRCREV = "d7b00a49803412caf6a0b415974ff2f4c3adf7f7" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 6fbc018e..ea059dde 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtdeclarative-native" -SRCREV = "ced7d5af9caeedd7b3a2278b052a0b0f7bf951b7" +SRCREV = "a87188ace95ad9818e078aae72cfab7ea4a9cfaa" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 2eb450e8..a5228fbd 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "3d44442331ba6f1ba7a5d5ad9f3834993911e288" +SRCREV = "5f7e823d67e615727c8e36aafc6baadfc105c67f" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 4a0ab40b..5e6d6bdc 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "cb9a20c50584eaf950c1fc9a7fd7961a92100046" +SRCREV = "e7b07a60408285128dedb373316801294ca941b0" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 9235f78d..4789cade 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -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 = "8d2c11ac2352556167dc4a86172cd9bc3a979ed8" +SRCREV = "9401306e2db3a1756aab958d0939d12c8d5f46e0" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index c8e1ee50..1b0e51e7 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "acddb0676cafdc83edd08aee87181bf5602d6387" +SRCREV = "cb8388ac1de37ff31786cd1bd4723938b76d0f0a" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12 # 5.12.meta-qt5.2 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 81802fd6..aad757cc 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "d1a1b62914d592bf0bb382accff29abc610d3fab" +SRCREV = "ce508999540cb125dad40dd250b17e6ad20d542b" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 6b32ef11..c73f88b2 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "fe80eef6b3377c8727c5190d275808c343ee7c75" +SRCREV = "562113342f2b232d38a3ea05e84b8d2584799218" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index af437ef8..648460db 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "f47d1b9a11eb8c56afbd929285724f795097da09" +SRCREV = "2f2b747ebc4dd982caede82a0a931ad73e4cd462" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 06cee877..e7d8872d 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "2043a358ea64fe220e0fdee09d1f3aa1fd6aaad7" +SRCREV = "3a4c634241f7271ddfbb840a42d6bf863b46ccea" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 8a1ea59e..3e0f8822 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ " -SRCREV = "1562cf0d6129886e16c57ac72fab00b309db6bc6" +SRCREV = "e363e6400afaa4ddc691bfb5796efd34ecd4f4a8" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 2206399e..8b13dba7 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -98,4 +98,4 @@ FILES_${PN}-qthelp = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -SRCREV = "133f635a25ee58596fcb556b87e841257390758b" +SRCREV = "88266670663256f40019e7163092e17401557d5f" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index b9ba2b4e..21ca0590 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "67e497ff407441515761b312599cb4ad6b61adad" +SRCREV = "2413bc23c5f9995752fdd03d56e480d661fc6fbc" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 0ef260da..3e50356d 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "458bc86f82f8fa6cfd659950549d1d2b36e5e40d" +SRCREV = "fb7aa15c2a27a9dc841806d07aee9c39aa3fb2ef" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 34f52528..b468ecb1 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "24e0c897fac375514396191db7b582505028c918" +SRCREV = "fdba7f6e285d35757190d99f9880e3bd0380e254" diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch index bef8ad6d..9e3eeed0 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From bf92c8a03189d7a559aff7d62c2d9fc6047d2659 Mon Sep 17 00:00:00 2001 +From a35a1ee7e93610d049da6eb0931f69f2647a93dc Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 15 Mar 2017 13:53:28 +0200 Subject: [PATCH] Force host toolchain configuration @@ -19,7 +19,7 @@ Signed-off-by: Samuli Piippo 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro -index dd0d3e32..70161c82 100644 +index dd0d3e3..70161c8 100644 --- a/src/buildtools/configure_host.pro +++ b/src/buildtools/configure_host.pro @@ -4,7 +4,7 @@ TEMPLATE = aux @@ -58,25 +58,25 @@ index dd0d3e32..70161c82 100644 " nm = \"$$which(nm)\" " \ " toolchain_args = { " \ diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro -index 30ada93..afd115c 100644 +index b6bf9cf..ae419b1 100644 --- a/src/buildtools/gn.pro +++ b/src/buildtools/gn.pro @@ -19,8 +19,8 @@ build_pass|!debug_and_release { gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir)) - gn_configure = $$system_quote($$gn_bootstrap) --no-last-commit-position --out-path $$out_path \ -- --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \ -- --ld \"$$which($$QMAKE_LINK)\" -+ --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \ -+ --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\" - macos { - gn_configure += --isysroot \"$$QMAKE_MAC_SDK_PATH\" - } + gn_gen_args = --no-last-commit-position --out-path $$out_path \ +- --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \ +- --ld \"$$which($$QMAKE_LINK)\" ++ --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \ ++ --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\" + + msvc:!clang_cl: gn_gen_args += --use-lto + diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri -index 04c9eca..c48fa06 100644 +index 95b7a4b..db0658e 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri -@@ -115,7 +115,7 @@ contains(QT_ARCH, "mips") { +@@ -116,7 +116,7 @@ contains(QT_ARCH, "mips") { host_build { gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 1e9f0cfa..afbe1de6 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -171,8 +171,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "5de670283e3093fcdd2a91dcca30ffbe0b03d230" -SRCREV_chromium = "4679cc537c8358afa61918d119ceb629593a4d4d" +SRCREV_qtwebengine = "0835dfa3f9b2b20f6f40ee0c2140d5222ed4fff5" +SRCREV_chromium = "00390e99a0041585e1b4ae6dcc6ff12a3d64c743" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index 2e5dc217..b5760229 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb @@ -18,4 +18,4 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "c21dbf122e57ee90436de65a7f868fd8ce5a377b" +SRCREV = "15637e6d824bca5d149147207a98cbc016fbbef6" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index f5fdabf0..b4a10936 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "74c8ebe9696c981311f19bdd6544634ab1b7cc7f" +SRCREV = "142d9798d262a41c09a9c43f3ae3a82c771fc800" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 4766f9da..dc2a3e4b 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)" COMPATIBLE_MACHINE_armv7ve = "(.*)" COMPATIBLE_MACHINE_aarch64 = "(.*)" -SRCREV = "d895829904a1de3f8a63d5ab56e73106847fddcf" +SRCREV = "3265fa961a27894faa5b3413fb39c8682266a72f" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 19a372f0..31c5b671 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "431bd11f304179c77f55edd07d68b02d8408a45c" +SRCREV = "7e86e23ee87f2450b3f7103632c3ad2ab082e5eb" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 8bf5460c..73631fcd 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -25,7 +25,7 @@ do_configure_prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "c886d992029740da0185fd2bf8a040c84156e73d" +SRCREV = "29891df4ce099542635e33891945ba19f3e9572c" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3-54-g00ecf From 381c4318e0ec4de5eab402a02366d4941270a43f Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 27 May 2019 12:36:20 +0300 Subject: qt5: update submodules Update to latest content in Qt 5.13.0 branch Task-number: QTBUG-72311 Change-Id: Idcef4d359f3ccf6fd4e16a179e79c1d32a717474 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 4 ++-- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'recipes-qt/qt5/qtwebengine_git.bb') diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 7064bc72..eae03ae1 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -31,7 +31,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 = "ca339bc55d6fc617c63e723c43150445fc8ac050" +SRCREV_qtlocation = "667af08a388ffc3441adc5b8e73f2f8797b274c5" SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index c73f88b2..1d48f5b0 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "562113342f2b232d38a3ea05e84b8d2584799218" +SRCREV = "b18c452fdbe09c54caacb4323dea65b3746485e5" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 3e0f8822..5cf0a893 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ " -SRCREV = "e363e6400afaa4ddc691bfb5796efd34ecd4f4a8" +SRCREV = "326463142b42b03c0e4c59069e099d6fd27212ce" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 6d1bd8e9..a281cba2 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -172,8 +172,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "0835dfa3f9b2b20f6f40ee0c2140d5222ed4fff5" -SRCREV_chromium = "00390e99a0041585e1b4ae6dcc6ff12a3d64c743" +SRCREV_qtwebengine = "5d4bac57a0191287a2fc345f6b398fb1f5d08517" +SRCREV_chromium = "8a28c0bb19fc8627812cb7c3154408b71ff2bf5e" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index b4a10936..11144537 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "142d9798d262a41c09a9c43f3ae3a82c771fc800" +SRCREV = "b7d892b97697f90b3669dab56358a48fb3542f68" -- cgit v1.2.3-54-g00ecf