diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-04-08 15:36:11 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-04-15 15:23:26 +0300 |
commit | 34f4b7b004eb6fa46282fff5d8c8026caf64740b (patch) | |
tree | 290ec0cd4ee39c1f97c4a45a1a4cabd80e9d8b49 /recipes-qt/qt5/qtwebengine | |
parent | 7de0cbd5dc9f80972ce559c9e340afbff0b9403d (diff) |
qt5: update submodules
Update to latest content in Qt 5.15 branch
Task-number: QTBUG-80823
Change-Id: I72ecac4a29bf1d1f072169d709aa7ecdc895c0e5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
3 files changed, 19 insertions, 19 deletions
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 <raj.khem@gmail.com> 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 <raj.khem@gmail.com> 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 <raj.khem@gmail.com> 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 <raj.khem@gmail.com> 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 <raj.khem@gmail.com> 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" ] } |