summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0003-Fix-build-with-gcc8.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-06-05 14:01:48 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-06-05 14:03:20 +0000
commit267a38fddeecb28b269fc86f7024e50dbc47acbe (patch)
tree4034b8d77511194d0b84b7b9125c22ca3c12145e /recipes-qt/qt5/qtwebengine/0003-Fix-build-with-gcc8.patch
parent7193a7f1f4f49ba940d5b4cc15a46be2077d0a14 (diff)
downloadmeta-qt5-267a38fddeecb28b269fc86f7024e50dbc47acbe.tar.gz
qtwebengine: fix build with gcc8
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0003-Fix-build-with-gcc8.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-Fix-build-with-gcc8.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0003-Fix-build-with-gcc8.patch b/recipes-qt/qt5/qtwebengine/0003-Fix-build-with-gcc8.patch
new file mode 100644
index 00000000..10c81e9e
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0003-Fix-build-with-gcc8.patch
@@ -0,0 +1,50 @@
1From 334c96ea89c49d559f955182c9a30c62919622ca 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] 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 09f6d285f3..e516a09e49 100644
14--- a/chromium/mojo/public/c/system/buffer.h
15+++ b/chromium/mojo/public/c/system/buffer.h
16@@ -35,7 +35,7 @@ const MojoCreateSharedBufferOptionsFlags
17 ((MojoCreateSharedBufferOptionsFlags)0)
18 #endif
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 struct MOJO_ALIGNAS(8) MojoCreateSharedBufferOptions {
23 uint32_t struct_size;
24 MojoCreateSharedBufferOptionsFlags flags;
25diff --git a/chromium/mojo/public/c/system/data_pipe.h b/chromium/mojo/public/c/system/data_pipe.h
26index 62adbea1ea..76225858ba 100644
27--- a/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 =
30 ((MojoCreateDataPipeOptionsFlags)0)
31 #endif
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 struct MOJO_ALIGNAS(8) MojoCreateDataPipeOptions {
36 MOJO_ALIGNAS(4) uint32_t struct_size;
37 MOJO_ALIGNAS(4) MojoCreateDataPipeOptionsFlags flags;
38diff --git a/chromium/mojo/public/c/system/message_pipe.h b/chromium/mojo/public/c/system/message_pipe.h
39index f0f69d1025..364a02971e 100644
40--- a/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
43 ((MojoCreateMessagePipeOptionsFlags)0)
44 #endif
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 struct MOJO_ALIGNAS(8) MojoCreateMessagePipeOptions {
49 uint32_t struct_size;
50 MojoCreateMessagePipeOptionsFlags flags;