From 40cdc96243c4bae26789ba1c9373348a799607d9 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Fri, 28 Sep 2018 08:05:45 +0300 Subject: qt5: update submodules Update to latest 5.12.0 snapshot Change-Id: I5c0c78ffa069edf3a7103bb9bf7f576c14581e4f Reviewed-by: Samuli Piippo --- .../0003-chromium-Fix-build-with-gcc8.patch | 50 +++++++++++----------- 1 file changed, 25 insertions(+), 25 deletions(-) (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 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 @@ -From d16d04ea5c47974f038c4434011e69dbfc23c797 Mon Sep 17 00:00:00 2001 +From fd00eeaf7ad3b20c59c42f401910a9f3d0ff0d42 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 @@ -10,41 +10,41 @@ Subject: [PATCH] chromium: Fix build with gcc8 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 +index 2cc5427..917415f 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 - +@@ -30,7 +30,7 @@ struct MOJO_ALIGNAS(8) MojoCreateSharedBufferOptions { + // See |MojoCreateSharedBufferFlags|. + MojoCreateSharedBufferFlags flags; + }; -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; + MOJO_STATIC_ASSERT(sizeof(MojoCreateSharedBufferOptions) == 8, + "MojoCreateSharedBufferOptions has wrong size"); + diff --git a/chromium/mojo/public/c/system/data_pipe.h b/chromium/mojo/public/c/system/data_pipe.h -index 62adbea1ea..76225858ba 100644 +index 3702cdb..a86c8e8 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 - +@@ -40,7 +40,7 @@ struct MOJO_ALIGNAS(8) MojoCreateDataPipeOptions { + // system-dependent capacity of at least one element in size. + uint32_t capacity_num_bytes; + }; -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; + MOJO_STATIC_ASSERT(sizeof(MojoCreateDataPipeOptions) == 16, + "MojoCreateDataPipeOptions has wrong size"); + diff --git a/chromium/mojo/public/c/system/message_pipe.h b/chromium/mojo/public/c/system/message_pipe.h -index f0f69d1025..364a02971e 100644 +index 9f222f9..4878774 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 - +@@ -35,7 +35,7 @@ struct MOJO_ALIGNAS(8) MojoCreateMessagePipeOptions { + // See |MojoCreateMessagePipeFlags|. + MojoCreateMessagePipeFlags flags; + }; -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; + MOJO_STATIC_ASSERT(sizeof(MojoCreateMessagePipeOptions) == 8, + "MojoCreateMessagePipeOptions has wrong size"); + -- cgit v1.2.3-54-g00ecf