summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2018-09-28 08:05:45 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2018-10-01 14:09:18 +0000
commit40cdc96243c4bae26789ba1c9373348a799607d9 (patch)
tree70acf25130a4b86338160d3aff19efc674ea9096 /recipes-qt/qt5/qtwebengine
parenta34f936566039c2cba6a0e58192398255a0653b8 (diff)
downloadmeta-qt5-40cdc96243c4bae26789ba1c9373348a799607d9.tar.gz
qt5: update submodules
Update to latest 5.12.0 snapshot Change-Id: I5c0c78ffa069edf3a7103bb9bf7f576c14581e4f Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine')
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch16
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch14
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch50
3 files changed, 40 insertions, 40 deletions
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 32efcf99..941aab1b 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 @@
1From 761754d5edf129d526e87ed5ace71d24f30e9618 Mon Sep 17 00:00:00 2001 1From b462e56f5254956d582cf6d74c0525d588dd3c07 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200 3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] chromium: Force host toolchain configuration 4Subject: [PATCH] chromium: Force host toolchain configuration
@@ -10,15 +10,15 @@ Upstream-Status: Inappropriate [OE specific]
10Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> 10Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12--- 12---
13 chromium/tools/gn/bootstrap/bootstrap.py | 6 +++--- 13 gn/build/gen.py | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-) 14 1 file changed, 3 insertions(+), 3 deletions(-)
15 15
16diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py 16diff --git a/gn/build/gen.py b/gn/build/gen.py
17index 93c6446f28..0fe7e6737d 100755 17index b677954..698b4e5 100755
18--- a/chromium/tools/gn/bootstrap/bootstrap.py 18--- a/gn/build/gen.py
19+++ b/chromium/tools/gn/bootstrap/bootstrap.py 19+++ b/gn/build/gen.py
20@@ -352,10 +352,10 @@ def write_gn_ninja(path, root_gen_dir, options): 20@@ -310,10 +310,10 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
21 ld = os.environ.get('LD', cxx) 21 ld = os.environ.get('LD', 'g++')
22 ar = os.environ.get('AR', 'ar -X64') 22 ar = os.environ.get('AR', 'ar -X64')
23 else: 23 else:
24- cc = os.environ.get('CC', 'cc') 24- cc = os.environ.get('CC', 'cc')
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 2b30ef4e..30e0d856 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 @@
1From 108bc7caf7544b47a392aac690f0d616f1c6c42e Mon Sep 17 00:00:00 2001 1From a2e7a5d22d1ad4b2985bee1cbf88bdb3a3f80b67 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Thu, 30 Mar 2017 11:37:24 +0300 3Date: Thu, 30 Mar 2017 11:37:24 +0300
4Subject: [PATCH] chromium: workaround for too long .rps file name 4Subject: [PATCH] chromium: workaround for too long .rps file name
@@ -14,14 +14,14 @@ le.rsp): Unable to create file. File name too long
14Task-number: QTBUG-59769 14Task-number: QTBUG-59769
15Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1 15Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1
16--- 16---
17 chromium/tools/gn/ninja_action_target_writer.cc | 9 +++++++++ 17 gn/tools/gn/ninja_action_target_writer.cc | 9 +++++++++
18 1 file changed, 9 insertions(+) 18 1 file changed, 9 insertions(+)
19 19
20diff --git a/chromium/tools/gn/ninja_action_target_writer.cc b/chromium/tools/gn/ninja_action_target_writer.cc 20diff --git a/gn/tools/gn/ninja_action_target_writer.cc b/gn/tools/gn/ninja_action_target_writer.cc
21index bab07c5d2b..8f889aebc1 100644 21index 7e945c0..3deb587 100644
22--- a/chromium/tools/gn/ninja_action_target_writer.cc 22--- a/gn/tools/gn/ninja_action_target_writer.cc
23+++ b/chromium/tools/gn/ninja_action_target_writer.cc 23+++ b/gn/tools/gn/ninja_action_target_writer.cc
24@@ -117,9 +117,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() { 24@@ -118,9 +118,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() {
25 // strictly necessary for regular one-shot actions, but it's easier to 25 // strictly necessary for regular one-shot actions, but it's easier to
26 // just always define unique_name. 26 // just always define unique_name.
27 std::string rspfile = custom_rule_name; 27 std::string rspfile = custom_rule_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 f2747330..3d37b7b6 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 @@
1From d16d04ea5c47974f038c4434011e69dbfc23c797 Mon Sep 17 00:00:00 2001 1From fd00eeaf7ad3b20c59c42f401910a9f3d0ff0d42 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 5 Jun 2018 13:58:16 +0000 3Date: Tue, 5 Jun 2018 13:58:16 +0000
4Subject: [PATCH] chromium: Fix build with gcc8 4Subject: [PATCH] chromium: Fix build with gcc8
@@ -10,41 +10,41 @@ Subject: [PATCH] chromium: Fix build with gcc8
10 3 files changed, 3 insertions(+), 3 deletions(-) 10 3 files changed, 3 insertions(+), 3 deletions(-)
11 11
12diff --git a/chromium/mojo/public/c/system/buffer.h b/chromium/mojo/public/c/system/buffer.h 12diff --git a/chromium/mojo/public/c/system/buffer.h b/chromium/mojo/public/c/system/buffer.h
13index 09f6d285f3..e516a09e49 100644 13index 2cc5427..917415f 100644
14--- a/chromium/mojo/public/c/system/buffer.h 14--- a/chromium/mojo/public/c/system/buffer.h
15+++ b/chromium/mojo/public/c/system/buffer.h 15+++ b/chromium/mojo/public/c/system/buffer.h
16@@ -35,7 +35,7 @@ const MojoCreateSharedBufferOptionsFlags 16@@ -30,7 +30,7 @@ struct MOJO_ALIGNAS(8) MojoCreateSharedBufferOptions {
17 ((MojoCreateSharedBufferOptionsFlags)0) 17 // See |MojoCreateSharedBufferFlags|.
18 #endif 18 MojoCreateSharedBufferFlags flags;
19 19 };
20-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); 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"); 21+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
22 struct MOJO_ALIGNAS(8) MojoCreateSharedBufferOptions { 22 MOJO_STATIC_ASSERT(sizeof(MojoCreateSharedBufferOptions) == 8,
23 uint32_t struct_size; 23 "MojoCreateSharedBufferOptions has wrong size");
24 MojoCreateSharedBufferOptionsFlags flags; 24
25diff --git a/chromium/mojo/public/c/system/data_pipe.h b/chromium/mojo/public/c/system/data_pipe.h 25diff --git a/chromium/mojo/public/c/system/data_pipe.h b/chromium/mojo/public/c/system/data_pipe.h
26index 62adbea1ea..76225858ba 100644 26index 3702cdb..a86c8e8 100644
27--- a/chromium/mojo/public/c/system/data_pipe.h 27--- a/chromium/mojo/public/c/system/data_pipe.h
28+++ b/chromium/mojo/public/c/system/data_pipe.h 28+++ b/chromium/mojo/public/c/system/data_pipe.h
29@@ -46,7 +46,7 @@ const MojoCreateDataPipeOptionsFlags MOJO_CREATE_DATA_PIPE_OPTIONS_FLAG_NONE = 29@@ -40,7 +40,7 @@ struct MOJO_ALIGNAS(8) MojoCreateDataPipeOptions {
30 ((MojoCreateDataPipeOptionsFlags)0) 30 // system-dependent capacity of at least one element in size.
31 #endif 31 uint32_t capacity_num_bytes;
32 32 };
33-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); 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"); 34+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
35 struct MOJO_ALIGNAS(8) MojoCreateDataPipeOptions { 35 MOJO_STATIC_ASSERT(sizeof(MojoCreateDataPipeOptions) == 16,
36 MOJO_ALIGNAS(4) uint32_t struct_size; 36 "MojoCreateDataPipeOptions has wrong size");
37 MOJO_ALIGNAS(4) MojoCreateDataPipeOptionsFlags flags; 37
38diff --git a/chromium/mojo/public/c/system/message_pipe.h b/chromium/mojo/public/c/system/message_pipe.h 38diff --git a/chromium/mojo/public/c/system/message_pipe.h b/chromium/mojo/public/c/system/message_pipe.h
39index f0f69d1025..364a02971e 100644 39index 9f222f9..4878774 100644
40--- a/chromium/mojo/public/c/system/message_pipe.h 40--- a/chromium/mojo/public/c/system/message_pipe.h
41+++ b/chromium/mojo/public/c/system/message_pipe.h 41+++ b/chromium/mojo/public/c/system/message_pipe.h
42@@ -44,7 +44,7 @@ const MojoCreateMessagePipeOptionsFlags 42@@ -35,7 +35,7 @@ struct MOJO_ALIGNAS(8) MojoCreateMessagePipeOptions {
43 ((MojoCreateMessagePipeOptionsFlags)0) 43 // See |MojoCreateMessagePipeFlags|.
44 #endif 44 MojoCreateMessagePipeFlags flags;
45 45 };
46-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); 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"); 47+MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment");
48 struct MOJO_ALIGNAS(8) MojoCreateMessagePipeOptions { 48 MOJO_STATIC_ASSERT(sizeof(MojoCreateMessagePipeOptions) == 8,
49 uint32_t struct_size; 49 "MojoCreateMessagePipeOptions has wrong size");
50 MojoCreateMessagePipeOptionsFlags flags; 50