From 33f58ffa657c3ae924f86a65be117be3562b2bf3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 6 Jun 2018 08:25:33 +0000 Subject: qtwebengine: fix build with gcc8, part II Signed-off-by: Martin Jansa --- .../0003-chromium-Fix-build-with-gcc8.patch | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch (limited to 'recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch') 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..f79b0e8c --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch @@ -0,0 +1,50 @@ +From c0047b885faafaab35d6dde4578c3c1a00b80cee Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Tue, 5 Jun 2018 13:58:16 +0000 +Subject: [PATCH] chromium: Fix build with gcc8 + +--- + chromium/mojo/public/c/system/buffer.h | 2 +- + chromium/mojo/public/c/system/data_pipe.h | 2 +- + chromium/mojo/public/c/system/message_pipe.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/chromium/mojo/public/c/system/buffer.h b/chromium/mojo/public/c/system/buffer.h +index 09f6d285f3..e516a09e49 100644 +--- a/chromium/mojo/public/c/system/buffer.h ++++ b/chromium/mojo/public/c/system/buffer.h +@@ -35,7 +35,7 @@ const MojoCreateSharedBufferOptionsFlags + ((MojoCreateSharedBufferOptionsFlags)0) + #endif + +-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); ++MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); + struct MOJO_ALIGNAS(8) MojoCreateSharedBufferOptions { + uint32_t struct_size; + MojoCreateSharedBufferOptionsFlags flags; +diff --git a/chromium/mojo/public/c/system/data_pipe.h b/chromium/mojo/public/c/system/data_pipe.h +index 62adbea1ea..76225858ba 100644 +--- a/chromium/mojo/public/c/system/data_pipe.h ++++ b/chromium/mojo/public/c/system/data_pipe.h +@@ -46,7 +46,7 @@ const MojoCreateDataPipeOptionsFlags MOJO_CREATE_DATA_PIPE_OPTIONS_FLAG_NONE = + ((MojoCreateDataPipeOptionsFlags)0) + #endif + +-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); ++MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); + struct MOJO_ALIGNAS(8) MojoCreateDataPipeOptions { + MOJO_ALIGNAS(4) uint32_t struct_size; + MOJO_ALIGNAS(4) MojoCreateDataPipeOptionsFlags flags; +diff --git a/chromium/mojo/public/c/system/message_pipe.h b/chromium/mojo/public/c/system/message_pipe.h +index f0f69d1025..364a02971e 100644 +--- a/chromium/mojo/public/c/system/message_pipe.h ++++ b/chromium/mojo/public/c/system/message_pipe.h +@@ -44,7 +44,7 @@ const MojoCreateMessagePipeOptionsFlags + ((MojoCreateMessagePipeOptionsFlags)0) + #endif + +-MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); ++MOJO_STATIC_ASSERT(MOJO_ALIGNOF(int64_t) == 4 || MOJO_ALIGNOF(int64_t) == 8, "int64_t has weird alignment"); + struct MOJO_ALIGNAS(8) MojoCreateMessagePipeOptions { + uint32_t struct_size; + MojoCreateMessagePipeOptionsFlags flags; -- cgit v1.2.3-54-g00ecf