summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-04-03 15:05:29 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2019-04-08 05:26:52 +0000
commit119a5bde5b852f663f7c1f0cd720a810a29db2a4 (patch)
tree8178565863090759a905a6cff65031de986f0a19 /recipes-qt/qt5/qtwebengine
parent7b03a69d33cf7887d2c202b38716d04433318b1d (diff)
downloadmeta-qt5-119a5bde5b852f663f7c1f0cd720a810a29db2a4.tar.gz
qt5: update submodules
Update to latest content in Qt 5.13.0 beta2 branch Task-number: QTBUG-72311 Change-Id: I6b7a6629412bb595d5e668ce28d95e3dee45345c 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-gcc8.patch50
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch12
2 files changed, 6 insertions, 56 deletions
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
deleted file mode 100644
index ef44aaf6..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From 5945b54c4095cd52eef8ab43c47a5c8c24a1aa0a Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 5 Jun 2018 13:58:16 +0000
4Subject: [PATCH] chromium: Fix build with gcc8
5
6---
7 chromium/mojo/public/c/system/buffer.h | 2 +-
8 chromium/mojo/public/c/system/data_pipe.h | 2 +-
9 chromium/mojo/public/c/system/message_pipe.h | 2 +-
10 3 files changed, 3 insertions(+), 3 deletions(-)
11
12diff --git a/chromium/mojo/public/c/system/buffer.h b/chromium/mojo/public/c/system/buffer.h
13index 2cc54270ad1..917415f8db4 100644
14--- a/chromium/mojo/public/c/system/buffer.h
15+++ b/chromium/mojo/public/c/system/buffer.h
16@@ -30,7 +30,7 @@ struct MOJO_ALIGNAS(8) MojoCreateSharedBufferOptions {
17 // See |MojoCreateSharedBufferFlags|.
18 MojoCreateSharedBufferFlags flags;
19 };
20-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
21+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
22 MOJO_STATIC_ASSERT(sizeof(MojoCreateSharedBufferOptions) == 8,
23 "MojoCreateSharedBufferOptions has wrong size");
24
25diff --git a/chromium/mojo/public/c/system/data_pipe.h b/chromium/mojo/public/c/system/data_pipe.h
26index 3702cdb6249..a86c8e8b321 100644
27--- a/chromium/mojo/public/c/system/data_pipe.h
28+++ b/chromium/mojo/public/c/system/data_pipe.h
29@@ -40,7 +40,7 @@ struct MOJO_ALIGNAS(8) MojoCreateDataPipeOptions {
30 // system-dependent capacity of at least one element in size.
31 uint32_t capacity_num_bytes;
32 };
33-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
34+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
35 MOJO_STATIC_ASSERT(sizeof(MojoCreateDataPipeOptions) == 16,
36 "MojoCreateDataPipeOptions has wrong size");
37
38diff --git a/chromium/mojo/public/c/system/message_pipe.h b/chromium/mojo/public/c/system/message_pipe.h
39index 9f222f9aa81..4878774707a 100644
40--- a/chromium/mojo/public/c/system/message_pipe.h
41+++ b/chromium/mojo/public/c/system/message_pipe.h
42@@ -35,7 +35,7 @@ struct MOJO_ALIGNAS(8) MojoCreateMessagePipeOptions {
43 // See |MojoCreateMessagePipeFlags|.
44 MojoCreateMessagePipeFlags flags;
45 };
46-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
47+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
48 MOJO_STATIC_ASSERT(sizeof(MojoCreateMessagePipeOptions) == 8,
49 "MojoCreateMessagePipeOptions has wrong size");
50
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 392fb5a7..73d838b6 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 @@
1From af02d2c093b870d3c8b751d0cb573a797f46ccb9 Mon Sep 17 00:00:00 2001 1From 99660440fb4e876fe6c008f37fb70fce9cb61b9b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 5 Feb 2019 14:32:20 -0800 3Date: Tue, 5 Feb 2019 14:32:20 -0800
4Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm 4Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm
@@ -15,18 +15,18 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
15 1 file changed, 4 insertions(+), 1 deletion(-) 15 1 file changed, 4 insertions(+), 1 deletion(-)
16 16
17diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn 17diff --git a/chromium/third_party/zlib/BUILD.gn b/chromium/third_party/zlib/BUILD.gn
18index 6aca13e..bd49d99 100644 18index 458f428..18b4f23 100644
19--- a/chromium/third_party/zlib/BUILD.gn 19--- a/chromium/third_party/zlib/BUILD.gn
20+++ b/chromium/third_party/zlib/BUILD.gn 20+++ b/chromium/third_party/zlib/BUILD.gn
21@@ -70,8 +70,11 @@ config("zlib_arm_crc32_config") { 21@@ -74,8 +74,11 @@ if (use_arm_neon_optimizations) {
22 # - ChromeOS has wrapper scripts that are borking the compiler flags. 22 # implement the CRC32* instructions. These are optional in ARMv8.0."
23 # - Fuchsia just added a syscall for feature detection. 23 # - Fuchsia just added a syscall for feature detection.
24 # TODO(cavalcantii): crbug.com/810125. 24 # TODO(cavalcantii): crbug.com/810125.
25+ defines = [] 25+ defines = []
26 if (is_clang && (!is_ios && !is_chromeos && !is_fuchsia)) { 26 if (is_clang && (!is_ios && !is_fuchsia)) {
27- defines = [ "CRC32_ARMV8_CRC32" ] 27- defines = [ "CRC32_ARMV8_CRC32" ]
28+ if (current_cpu == "arm64") { 28+ if (current_cpu == "arm64") {
29+ defines += [ "CRC32_ARMV8_CRC32" ] 29+ defines += [ "CRC32_ARMV8_CRC32" ]
30+ } 30+ }
31 if (is_android) { 31 if (is_android) {
32 defines += [ "ARMV8_OS_ANDROID" ] 32 defines += [ "ARMV8_OS_ANDROID" ]