File 0001-chromium-Fix-build-with-gcc8.patch of Package libqt5-qtwebengine

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-chromium-Fix-build-with-gcc8.patch of Package libqt5-qtwebengine (Revision cd4c984b285fe155e8fbbeba5a60542d)

Currently displaying revision cd4c984b285fe155e8fbbeba5a60542d , Show latest

From 4a8e2acea8759c6eafa22d325f6c2e27862404de Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
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/src/3rdparty/chromium/mojo/public/c/system/buffer.h b/src/3rdparty/chromium/mojo/public/c/system/buffer.h
index 09f6d285f3..e516a09e49 100644
--- a/src/3rdparty/chromium/mojo/public/c/system/buffer.h
+++ b/src/3rdparty/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/src/3rdparty/chromium/mojo/public/c/system/data_pipe.h b/src/3rdparty/chromium/mojo/public/c/system/data_pipe.h
index 62adbea1ea..76225858ba 100644
--- a/src/3rdparty/chromium/mojo/public/c/system/data_pipe.h
+++ b/src/3rdparty/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/src/3rdparty/chromium/mojo/public/c/system/message_pipe.h b/src/3rdparty/chromium/mojo/public/c/system/message_pipe.h
index f0f69d1025..364a02971e 100644
--- a/src/3rdparty/chromium/mojo/public/c/system/message_pipe.h
+++ b/src/3rdparty/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;

Places

File 0001-chromium-Fix-build-with-gcc8.patch of Package libqt5-qtwebengine (Revision cd4c984b285fe155e8fbbeba5a60542d)

Places