summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-07-03 15:01:08 +0300
committerMartin Jansa <Martin.Jansa@gmail.com>2019-07-15 13:58:40 +0000
commit8d2e1b401987d743ebdf964927c03f41e8f60328 (patch)
treed002364505c85ecb0a508dc359156c4444ffeaed /recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch
parent8da88b098fae46e13cd7cbaf8d65dd0e99b4e0e5 (diff)
downloadmeta-qt5-8d2e1b401987d743ebdf964927c03f41e8f60328.tar.gz
qt5: Upgrade to Qt 5.13.0
Update recipes for Qt 5.13.0, add new recipes for Qt modules qtcoap and qtlottie, and remove qtcanvas3d. Signed-off-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.patch50
1 files changed, 0 insertions, 50 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 8281dd71..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From 53b101c4d3d419920d8a9f96d8afe10716c137c5 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