From 34f4b7b004eb6fa46282fff5d8c8026caf64740b Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Wed, 8 Apr 2020 15:36:11 +0300 Subject: qt5: update submodules Update to latest content in Qt 5.15 branch Task-number: QTBUG-80823 Change-Id: I72ecac4a29bf1d1f072169d709aa7ecdc895c0e5 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/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtquick3d_git.bb | 2 +- recipes-qt/qt5/qtquicktimeline_git.bb | 2 +- recipes-qt/qt5/qtremoteobjects_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- .../0003-chromium-fix-build-with-clang.patch | 20 ++++++++++---------- ...Fix-build-on-32bit-arches-with-64bit-time_t.patch | 10 +++++----- ...0012-chromium-Link-v8-with-libatomic-on-x86.patch | 8 ++++---- recipes-qt/qt5/qtwebengine_git.bb | 6 +++--- 17 files changed, 35 insertions(+), 35 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index bf5f5d81..5bbbb3f5 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -196,4 +196,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 = "7ed097b31f7e15812144c360021872cf8f11821e" +SRCREV = "34adcabc6c294150ba530374fba5b05b43c1ca49" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index f6cde878..a12d3530 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 = "dd84bf4a99bb181fc1176830b4504d6f023898d8" +SRCREV = "51719ae6e726ef8a30e7d0ab3e84d97b2ca67857" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 02456b58..ed544f71 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -143,4 +143,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "7ed097b31f7e15812144c360021872cf8f11821e" +SRCREV = "34adcabc6c294150ba530374fba5b05b43c1ca49" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 67c1ef19..64d26fb9 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -295,4 +295,4 @@ sed -i \ $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri } -SRCREV = "7ed097b31f7e15812144c360021872cf8f11821e" +SRCREV = "34adcabc6c294150ba530374fba5b05b43c1ca49" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index ffed74b9..c6f12f7f 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -31,6 +31,6 @@ do_install_append_class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "8dfcc71953cd36370bcf19f537445e3766f39635" +SRCREV = "bf205b45a29ba80d94df3b6bac5fec4c7cd79bf9" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index f7f1f35b..fdc8fc0d 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -35,7 +35,7 @@ SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ " -SRCREV_qtlocation = "05659943df25a4ab6edcbfc8ebaa6bc23a2eb72f" +SRCREV_qtlocation = "eda2a7c286058176e1906d0ddc88d4e2cfbec55e" SRCREV_qtlocation-mapboxgl = "d9577fdebe019b19e184b4cac82749ae9ec87afb" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index 67c7bef8..28cfd024 100644 --- a/recipes-qt/qt5/qtquick3d_git.bb +++ b/recipes-qt/qt5/qtquick3d_git.bb @@ -21,7 +21,7 @@ FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ " -SRCREV_qtquick3d = "91704d001196be41d9cc59b22692b73cf8d409d9" +SRCREV_qtquick3d = "ba49d22e9dce12f2a85b91d4876d8e1aee0792df" SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" SRCREV_FORMAT = "qtquick3d_assimp" diff --git a/recipes-qt/qt5/qtquicktimeline_git.bb b/recipes-qt/qt5/qtquicktimeline_git.bb index 14817e72..d186e286 100644 --- a/recipes-qt/qt5/qtquicktimeline_git.bb +++ b/recipes-qt/qt5/qtquicktimeline_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtbase qtdeclarative" -SRCREV = "973e5e6da27cee94d95ed05cc4251c70381e9ad9" +SRCREV = "87d429e0ada30197945a65a91fcaedd935a37ad0" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 3b14a48a..8dc9d068 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "5ac51056f9b99ca6741e008bdd77cce10107bd91" +SRCREV = "9ec14db5a9f735eb4286984f934568f089627bd7" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index c181b8dc..4ab0eecd 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 = "b30052fa41f6332f20ec440dcdbcd06b41a954f5" +SRCREV = "ff3fd7b0330cb76772066ce7162320f4dc1a5c28" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index bfe98a07..deb55377 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -49,7 +49,7 @@ EXTRA_QMAKEVARS_PRE_append_class-target = "\ ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \ " -SRCREV = "8685a264d6961a759257bb3c8ece0beffca2bd14" +SRCREV = "78e8a23e171569d231c3b8cd14fddef1e9b10a34" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 5038f084..937de4b8 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -71,4 +71,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "d2648237c7e3bfc03077b7b1e63c72dc24ff519c" +SRCREV = "b3556c25ffdc64595e41d005b091776035134846" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 71ce03be..ee9b692c 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -43,7 +43,7 @@ PACKAGECONFIG[wayland-vulkan-server-buffer] = "-feature-wayland-vulkan-server-bu EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "e2d2d7e06ae4d054d75738038645126bce9092ad" +SRCREV = "57e31dd17cbf22e8bdebc5e4a537dd3d632936f7" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch index 0171a5dd..00241951 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch @@ -1,4 +1,4 @@ -From e590e511b89a08867a801cb20e4e98787cb36e78 Mon Sep 17 00:00:00 2001 +From 9329f596101b65b166e635f04f617b01f955697f 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,10 +10,10 @@ 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 ab47e2b98f8..f5ac335af90 100644 +index fdfcf65f5ab..13d71d04030 100644 --- a/chromium/build/config/compiler/BUILD.gn +++ b/chromium/build/config/compiler/BUILD.gn -@@ -774,8 +774,6 @@ config("compiler_cpu_abi") { +@@ -779,8 +779,6 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm") { if (is_clang && !is_android && !is_nacl) { @@ -22,7 +22,7 @@ index ab47e2b98f8..f5ac335af90 100644 } if (!is_nacl) { cflags += [ -@@ -788,8 +786,6 @@ config("compiler_cpu_abi") { +@@ -793,8 +791,6 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm64") { if (is_clang && !is_android && !is_nacl && !is_fuchsia) { @@ -31,7 +31,7 @@ index ab47e2b98f8..f5ac335af90 100644 } } else if (current_cpu == "mipsel" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] -@@ -798,9 +794,6 @@ config("compiler_cpu_abi") { +@@ -803,9 +799,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mipsel-linux-android" ] ldflags += [ "--target=mipsel-linux-android" ] @@ -41,7 +41,7 @@ index ab47e2b98f8..f5ac335af90 100644 } } else { cflags += [ "-EL" ] -@@ -879,10 +872,7 @@ config("compiler_cpu_abi") { +@@ -884,10 +877,7 @@ config("compiler_cpu_abi") { } else if (current_cpu == "mips" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { @@ -53,7 +53,7 @@ index ab47e2b98f8..f5ac335af90 100644 cflags += [ "-EB" ] ldflags += [ "-EB" ] } -@@ -929,9 +919,6 @@ config("compiler_cpu_abi") { +@@ -934,9 +924,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mips64el-linux-android" ] ldflags += [ "--target=mips64el-linux-android" ] @@ -63,7 +63,7 @@ index ab47e2b98f8..f5ac335af90 100644 } } else { cflags += [ -@@ -988,10 +975,7 @@ config("compiler_cpu_abi") { +@@ -993,10 +980,7 @@ config("compiler_cpu_abi") { } else if (current_cpu == "mips64") { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { @@ -75,7 +75,7 @@ index ab47e2b98f8..f5ac335af90 100644 cflags += [ "-EB", "-mabi=64", -@@ -1160,13 +1144,6 @@ config("compiler_deterministic") { +@@ -1165,13 +1149,6 @@ config("compiler_deterministic") { } } } @@ -83,7 +83,7 @@ index ab47e2b98f8..f5ac335af90 100644 - # Tells the compiler not to use absolute paths when passing the default - # paths to the tools it invokes. We don't want this because we don't - # really need it and it can mess up the goma cache entries. -- if (is_clang && !is_nacl) { +- if (is_clang && !is_nacl && !(use_qt && use_libcxx)) { - cflags += [ "-no-canonical-prefixes" ] - } } diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch index 7485a896..8bf8eee0 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -1,4 +1,4 @@ -From c24673923fca116df3bf59f19f8c668973f77e4d Mon Sep 17 00:00:00 2001 +From ac2c4d67820f7d571b2b6a2b64fcb145aabb3cec Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Nov 2019 10:07:43 -0800 Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t @@ -33,11 +33,11 @@ index 9f27d39e209..f565dd2ce5c 100644 return timestamp; } diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h -index a91807b60e8..74d46cb8608 100644 +index 717410f2ebc..a4cd55ca20e 100644 --- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h +++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.h @@ -20,6 +20,11 @@ - #include "ui/events/ozone/evdev/events_ozone_evdev_export.h" + #include "ui/events/ozone/evdev/event_dispatch_callback.h" #include "ui/gfx/geometry/size.h" +#ifndef input_event_sec @@ -68,12 +68,12 @@ index 363c3183e05..4fccfd62f84 100644 } file.Write(0, report_content.c_str(), report_content.length()); diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h -index ccd3a499a38..5a2da89d09a 100644 +index 0d5b83148f6..1f17608e94d 100644 --- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h +++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h @@ -14,6 +14,11 @@ - #include "ui/events/ozone/evdev/events_ozone_evdev_export.h" + #include "base/component_export.h" +#ifndef input_event_sec +#define input_event_sec time.tv_sec diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch index 225e7157..fc95edd7 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch @@ -1,4 +1,4 @@ -From bf8381f35e8f4aeac0cbdb9b4a960bccf259f69c Mon Sep 17 00:00:00 2001 +From c00840448ba1df98a8e9d831bc3ddb795cf37a98 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 1 Feb 2020 12:17:23 -0800 Subject: [PATCH] chromium: Link v8 with libatomic on x86 @@ -14,16 +14,16 @@ Signed-off-by: Khem Raj 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn -index 426d83b4561..501e78d793c 100644 +index 9107b302476..12d8171d238 100644 --- a/chromium/v8/BUILD.gn +++ b/chromium/v8/BUILD.gn -@@ -3405,7 +3405,8 @@ v8_source_set("v8_base_without_compiler") { +@@ -3324,7 +3324,8 @@ v8_source_set("v8_base_without_compiler") { if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel" || v8_current_cpu == "mips64" || v8_current_cpu == "mips64el" || v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" || - v8_current_cpu == "s390" || v8_current_cpu == "s390x") { + v8_current_cpu == "s390" || v8_current_cpu == "s390x" || + v8_current_cpu == "x86") { - libs = [ "atomic" ] + libs += [ "atomic" ] } diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 9dad8adc..4f9b5c6e 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -142,7 +142,7 @@ RDEPENDS_${PN}-examples += " \ qtdeclarative-qmlplugins \ " -QT_MODULE_BRANCH_CHROMIUM = "79-based" +QT_MODULE_BRANCH_CHROMIUM = "80-based" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 # 5.15.meta-qt5.4 @@ -189,8 +189,8 @@ SRC_URI_append_libc-musl = "\ file://chromium/0025-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "3394cde4e89463ba49af379b89863c7731c4b4ac" -SRCREV_chromium = "9424dc7ceeccf6e6d5edc7757edb39a7ae4983ab" +SRCREV_qtwebengine = "e828423722cb57d55c0cb5fc66e3911b76197cd8" +SRCREV_chromium = "6b151acc9f31574c7b739433c538b90b989c9a23" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" -- cgit v1.2.3