diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-26 12:42:33 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-06-27 12:03:36 +0000 |
commit | 6765cbe6a255771cc1d06e5d3878c7e705769fc3 (patch) | |
tree | 377c10e198c33bb5ffa509f24748891a7e341a02 /recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch | |
parent | b84881444814a361fcc17e7eb34407fb175541da (diff) | |
parent | 40054db1de152d85c22aefdae50b136ca56967c5 (diff) | |
download | meta-qt5-6765cbe6a255771cc1d06e5d3878c7e705769fc3.tar.gz |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
* qtyocto/upstream/master:
40054db qt5: qtbase: Upgrade Double-Conversion
dd1ce3c README: Rework to start using GitHub for development
ef5f5d9 qt5: upgrade to 5.11.1
820f3ef qt5: add common PACKAGECONFIG for QtQuickCompiler
e199d80 python-pyqt5: update recipe to 5.10.1
65db89e qtbase: don't pass empty filename to function
3b27896 nativesdk-qtbase: add quotes to CC and CXX in environment file
a36cc5f libvcard: add recipe
1ac92b6 qtbase: Add packageconfigs for renameat2 and getentropy use
557aabd qttranslations: remove qtquick1 translation package
00aafa0 qt5-creator: Remove qtquick1 dependency
731334a qtwebengine: fix build with plugins as well as ozone enabled
70ce980 qtwebengine: add -fpermissive
33f58ff qtwebengine: fix build with gcc8, part II
267a38f qtwebengine: fix build with gcc8
7193a7f qtquick1: remove recipe and all references
29445f6 qtwebkit: do not skip build - use cmake as build system
dde9b55 qt5: refresh the patches and update them on meta-qt5 repositories
e0a4e23 qt5: Update to Qt 5.11.0
73f99f2 gstreamer1.0-plugins-{good,bad}: move the qt5 PACKAGECONFIG from bad to good bbappend
Change-Id: Ib58d0e103bda0b58338989c00f1fa80bd699534c
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, 50 insertions, 0 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 new file mode 100644 index 00000000..f2747330 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From d16d04ea5c47974f038c4434011e69dbfc23c797 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Tue, 5 Jun 2018 13:58:16 +0000 | ||
4 | Subject: [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 | |||
12 | diff --git a/chromium/mojo/public/c/system/buffer.h b/chromium/mojo/public/c/system/buffer.h | ||
13 | index 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; | ||
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 | ||
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; | ||
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 | ||
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; | ||