b789e0340b
Qt 5.12.0 final OBS-URL: https://build.opensuse.org/request/show/656578 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=41
26 lines
1.2 KiB
Diff
26 lines
1.2 KiB
Diff
From: Fedora
|
|
Subject: Fix build for 32-bit platforms
|
|
|
|
Apparently not upstream, can't find this anywhere. So I assume Fedora is the actual source?
|
|
https://src.fedoraproject.org/cgit/rpms/chromium.git/tree/chromium-66.0.3359.170-gcc8-alignof.patch
|
|
|
|
Index: qtwebengine-everywhere-src-5.12.0-beta1/src/3rdparty/chromium/mojo/public/c/system/macros.h
|
|
===================================================================
|
|
--- qtwebengine-everywhere-src-5.12.0-beta1.orig/src/3rdparty/chromium/mojo/public/c/system/macros.h
|
|
+++ qtwebengine-everywhere-src-5.12.0-beta1/src/3rdparty/chromium/mojo/public/c/system/macros.h
|
|
@@ -27,7 +27,13 @@
|
|
(sizeof(void*) == 4 ? 32 : 0)
|
|
|
|
// Like the C++11 |alignof| operator.
|
|
-#if __cplusplus >= 201103L
|
|
+#if defined(__GNUC__) && __GNUC__ >= 8
|
|
+// GCC 8 has changed the alignof operator to return the minimal alignment
|
|
+// required by the target ABI, instead of the preferred alignment.
|
|
+// This means that on 32-bit x86, it will return 4 instead of 8.
|
|
+// Use __alignof__ instead to avoid this.
|
|
+#define MOJO_ALIGNOF(type) __alignof__(type)
|
|
+#elif __cplusplus >= 201103L
|
|
#define MOJO_ALIGNOF(type) alignof(type)
|
|
#elif defined(__GNUC__)
|
|
#define MOJO_ALIGNOF(type) __alignof__(type)
|