diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-28 08:05:45 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-01 14:09:18 +0000 |
commit | 40cdc96243c4bae26789ba1c9373348a799607d9 (patch) | |
tree | 70acf25130a4b86338160d3aff19efc674ea9096 /recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch | |
parent | a34f936566039c2cba6a0e58192398255a0653b8 (diff) | |
download | meta-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/chromium/0003-chromium-Fix-build-with-gcc8.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch | 50 |
1 files changed, 25 insertions, 25 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 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 @@ | |||
1 | From d16d04ea5c47974f038c4434011e69dbfc23c797 Mon Sep 17 00:00:00 2001 | 1 | From fd00eeaf7ad3b20c59c42f401910a9f3d0ff0d42 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Tue, 5 Jun 2018 13:58:16 +0000 | 3 | Date: Tue, 5 Jun 2018 13:58:16 +0000 |
4 | Subject: [PATCH] chromium: Fix build with gcc8 | 4 | Subject: [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 | ||
12 | diff --git a/chromium/mojo/public/c/system/buffer.h b/chromium/mojo/public/c/system/buffer.h | 12 | diff --git a/chromium/mojo/public/c/system/buffer.h b/chromium/mojo/public/c/system/buffer.h |
13 | index 09f6d285f3..e516a09e49 100644 | 13 | index 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 | |
25 | diff --git a/chromium/mojo/public/c/system/data_pipe.h b/chromium/mojo/public/c/system/data_pipe.h | 25 | diff --git a/chromium/mojo/public/c/system/data_pipe.h b/chromium/mojo/public/c/system/data_pipe.h |
26 | index 62adbea1ea..76225858ba 100644 | 26 | index 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 | |
38 | diff --git a/chromium/mojo/public/c/system/message_pipe.h b/chromium/mojo/public/c/system/message_pipe.h | 38 | diff --git a/chromium/mojo/public/c/system/message_pipe.h b/chromium/mojo/public/c/system/message_pipe.h |
39 | index f0f69d1025..364a02971e 100644 | 39 | index 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 | |