summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2020-04-08 15:36:11 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2020-04-15 15:23:26 +0300
commit34f4b7b004eb6fa46282fff5d8c8026caf64740b (patch)
tree290ec0cd4ee39c1f97c4a45a1a4cabd80e9d8b49 /recipes-qt/qt5/qtwebengine
parent7de0cbd5dc9f80972ce559c9e340afbff0b9403d (diff)
downloadmeta-qt5-34f4b7b004eb6fa46282fff5d8c8026caf64740b.tar.gz
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')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0003-chromium-fix-build-with-clang.patch20
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch10
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch8
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 @@
1From e590e511b89a08867a801cb20e4e98787cb36e78 Mon Sep 17 00:00:00 2001 1From 9329f596101b65b166e635f04f617b01f955697f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 2 Feb 2019 19:28:59 -0800 3Date: Sat, 2 Feb 2019 19:28:59 -0800
4Subject: [PATCH] chromium: fix build with clang 4Subject: [PATCH] chromium: fix build with clang
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 1 file changed, 2 insertions(+), 25 deletions(-) 10 1 file changed, 2 insertions(+), 25 deletions(-)
11 11
12diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn 12diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
13index ab47e2b98f8..f5ac335af90 100644 13index fdfcf65f5ab..13d71d04030 100644
14--- a/chromium/build/config/compiler/BUILD.gn 14--- a/chromium/build/config/compiler/BUILD.gn
15+++ b/chromium/build/config/compiler/BUILD.gn 15+++ b/chromium/build/config/compiler/BUILD.gn
16@@ -774,8 +774,6 @@ config("compiler_cpu_abi") { 16@@ -779,8 +779,6 @@ config("compiler_cpu_abi") {
17 } 17 }
18 } else if (current_cpu == "arm") { 18 } else if (current_cpu == "arm") {
19 if (is_clang && !is_android && !is_nacl) { 19 if (is_clang && !is_android && !is_nacl) {
@@ -22,7 +22,7 @@ index ab47e2b98f8..f5ac335af90 100644
22 } 22 }
23 if (!is_nacl) { 23 if (!is_nacl) {
24 cflags += [ 24 cflags += [
25@@ -788,8 +786,6 @@ config("compiler_cpu_abi") { 25@@ -793,8 +791,6 @@ config("compiler_cpu_abi") {
26 } 26 }
27 } else if (current_cpu == "arm64") { 27 } else if (current_cpu == "arm64") {
28 if (is_clang && !is_android && !is_nacl && !is_fuchsia) { 28 if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
@@ -31,7 +31,7 @@ index ab47e2b98f8..f5ac335af90 100644
31 } 31 }
32 } else if (current_cpu == "mipsel" && !is_nacl) { 32 } else if (current_cpu == "mipsel" && !is_nacl) {
33 ldflags += [ "-Wl,--hash-style=sysv" ] 33 ldflags += [ "-Wl,--hash-style=sysv" ]
34@@ -798,9 +794,6 @@ config("compiler_cpu_abi") { 34@@ -803,9 +799,6 @@ config("compiler_cpu_abi") {
35 if (is_android) { 35 if (is_android) {
36 cflags += [ "--target=mipsel-linux-android" ] 36 cflags += [ "--target=mipsel-linux-android" ]
37 ldflags += [ "--target=mipsel-linux-android" ] 37 ldflags += [ "--target=mipsel-linux-android" ]
@@ -41,7 +41,7 @@ index ab47e2b98f8..f5ac335af90 100644
41 } 41 }
42 } else { 42 } else {
43 cflags += [ "-EL" ] 43 cflags += [ "-EL" ]
44@@ -879,10 +872,7 @@ config("compiler_cpu_abi") { 44@@ -884,10 +877,7 @@ config("compiler_cpu_abi") {
45 } else if (current_cpu == "mips" && !is_nacl) { 45 } else if (current_cpu == "mips" && !is_nacl) {
46 ldflags += [ "-Wl,--hash-style=sysv" ] 46 ldflags += [ "-Wl,--hash-style=sysv" ]
47 if (custom_toolchain == "") { 47 if (custom_toolchain == "") {
@@ -53,7 +53,7 @@ index ab47e2b98f8..f5ac335af90 100644
53 cflags += [ "-EB" ] 53 cflags += [ "-EB" ]
54 ldflags += [ "-EB" ] 54 ldflags += [ "-EB" ]
55 } 55 }
56@@ -929,9 +919,6 @@ config("compiler_cpu_abi") { 56@@ -934,9 +924,6 @@ config("compiler_cpu_abi") {
57 if (is_android) { 57 if (is_android) {
58 cflags += [ "--target=mips64el-linux-android" ] 58 cflags += [ "--target=mips64el-linux-android" ]
59 ldflags += [ "--target=mips64el-linux-android" ] 59 ldflags += [ "--target=mips64el-linux-android" ]
@@ -63,7 +63,7 @@ index ab47e2b98f8..f5ac335af90 100644
63 } 63 }
64 } else { 64 } else {
65 cflags += [ 65 cflags += [
66@@ -988,10 +975,7 @@ config("compiler_cpu_abi") { 66@@ -993,10 +980,7 @@ config("compiler_cpu_abi") {
67 } else if (current_cpu == "mips64") { 67 } else if (current_cpu == "mips64") {
68 ldflags += [ "-Wl,--hash-style=sysv" ] 68 ldflags += [ "-Wl,--hash-style=sysv" ]
69 if (custom_toolchain == "") { 69 if (custom_toolchain == "") {
@@ -75,7 +75,7 @@ index ab47e2b98f8..f5ac335af90 100644
75 cflags += [ 75 cflags += [
76 "-EB", 76 "-EB",
77 "-mabi=64", 77 "-mabi=64",
78@@ -1160,13 +1144,6 @@ config("compiler_deterministic") { 78@@ -1165,13 +1149,6 @@ config("compiler_deterministic") {
79 } 79 }
80 } 80 }
81 } 81 }
@@ -83,7 +83,7 @@ index ab47e2b98f8..f5ac335af90 100644
83- # Tells the compiler not to use absolute paths when passing the default 83- # Tells the compiler not to use absolute paths when passing the default
84- # paths to the tools it invokes. We don't want this because we don't 84- # paths to the tools it invokes. We don't want this because we don't
85- # really need it and it can mess up the goma cache entries. 85- # really need it and it can mess up the goma cache entries.
86- if (is_clang && !is_nacl) { 86- if (is_clang && !is_nacl && !(use_qt && use_libcxx)) {
87- cflags += [ "-no-canonical-prefixes" ] 87- cflags += [ "-no-canonical-prefixes" ]
88- } 88- }
89 } 89 }
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 @@
1From c24673923fca116df3bf59f19f8c668973f77e4d Mon Sep 17 00:00:00 2001 1From ac2c4d67820f7d571b2b6a2b64fcb145aabb3cec Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Nov 2019 10:07:43 -0800 3Date: Sat, 30 Nov 2019 10:07:43 -0800
4Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t 4Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t
@@ -33,11 +33,11 @@ index 9f27d39e209..f565dd2ce5c 100644
33 return timestamp; 33 return timestamp;
34 } 34 }
35diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h 35diff --git a/chromium/ui/events/ozone/evdev/event_converter_evdev.h b/chromium/ui/events/ozone/evdev/event_converter_evdev.h
36index a91807b60e8..74d46cb8608 100644 36index 717410f2ebc..a4cd55ca20e 100644
37--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h 37--- a/chromium/ui/events/ozone/evdev/event_converter_evdev.h
38+++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.h 38+++ b/chromium/ui/events/ozone/evdev/event_converter_evdev.h
39@@ -20,6 +20,11 @@ 39@@ -20,6 +20,11 @@
40 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h" 40 #include "ui/events/ozone/evdev/event_dispatch_callback.h"
41 #include "ui/gfx/geometry/size.h" 41 #include "ui/gfx/geometry/size.h"
42 42
43+#ifndef input_event_sec 43+#ifndef input_event_sec
@@ -68,12 +68,12 @@ index 363c3183e05..4fccfd62f84 100644
68 } 68 }
69 file.Write(0, report_content.c_str(), report_content.length()); 69 file.Write(0, report_content.c_str(), report_content.length());
70diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h 70diff --git a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
71index ccd3a499a38..5a2da89d09a 100644 71index 0d5b83148f6..1f17608e94d 100644
72--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h 72--- a/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
73+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h 73+++ b/chromium/ui/events/ozone/evdev/touch_evdev_debug_buffer.h
74@@ -14,6 +14,11 @@ 74@@ -14,6 +14,11 @@
75 75
76 #include "ui/events/ozone/evdev/events_ozone_evdev_export.h" 76 #include "base/component_export.h"
77 77
78+#ifndef input_event_sec 78+#ifndef input_event_sec
79+#define input_event_sec time.tv_sec 79+#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 @@
1From bf8381f35e8f4aeac0cbdb9b4a960bccf259f69c Mon Sep 17 00:00:00 2001 1From c00840448ba1df98a8e9d831bc3ddb795cf37a98 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 1 Feb 2020 12:17:23 -0800 3Date: Sat, 1 Feb 2020 12:17:23 -0800
4Subject: [PATCH] chromium: Link v8 with libatomic on x86 4Subject: [PATCH] chromium: Link v8 with libatomic on x86
@@ -14,16 +14,16 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 2 insertions(+), 1 deletion(-) 14 1 file changed, 2 insertions(+), 1 deletion(-)
15 15
16diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn 16diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn
17index 426d83b4561..501e78d793c 100644 17index 9107b302476..12d8171d238 100644
18--- a/chromium/v8/BUILD.gn 18--- a/chromium/v8/BUILD.gn
19+++ b/chromium/v8/BUILD.gn 19+++ b/chromium/v8/BUILD.gn
20@@ -3405,7 +3405,8 @@ v8_source_set("v8_base_without_compiler") { 20@@ -3324,7 +3324,8 @@ v8_source_set("v8_base_without_compiler") {
21 if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel" || 21 if (v8_current_cpu == "mips" || v8_current_cpu == "mipsel" ||
22 v8_current_cpu == "mips64" || v8_current_cpu == "mips64el" || 22 v8_current_cpu == "mips64" || v8_current_cpu == "mips64el" ||
23 v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" || 23 v8_current_cpu == "ppc" || v8_current_cpu == "ppc64" ||
24- v8_current_cpu == "s390" || v8_current_cpu == "s390x") { 24- v8_current_cpu == "s390" || v8_current_cpu == "s390x") {
25+ v8_current_cpu == "s390" || v8_current_cpu == "s390x" || 25+ v8_current_cpu == "s390" || v8_current_cpu == "s390x" ||
26+ v8_current_cpu == "x86") { 26+ v8_current_cpu == "x86") {
27 libs = [ "atomic" ] 27 libs += [ "atomic" ]
28 } 28 }
29 29