diff options
author | Matteo Bernardini | 2019-03-30 08:53:10 +0100 |
---|---|---|
committer | Matteo Bernardini | 2019-03-30 08:53:10 +0100 |
commit | 37f81333f74286adfe76ea53c2b701b0117e0776 (patch) | |
tree | 2a09dae8766cfae8cb4d655a42477e0d6a2a0bf8 /libraries/qt5/patches/qtwebengine-5.9.6-gcc8.patch | |
parent | 158e3ce0a80a1028c48af5d639f5fde39c94af3c (diff) | |
download | slackbuilds-4a3f18b3f12b8b94deed6a54badfca447a48e78d.tar.gz |
20190330.1 global branch merge.current-20190330.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'libraries/qt5/patches/qtwebengine-5.9.6-gcc8.patch')
-rw-r--r-- | libraries/qt5/patches/qtwebengine-5.9.6-gcc8.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/libraries/qt5/patches/qtwebengine-5.9.6-gcc8.patch b/libraries/qt5/patches/qtwebengine-5.9.6-gcc8.patch new file mode 100644 index 0000000000..ba6a49fd74 --- /dev/null +++ b/libraries/qt5/patches/qtwebengine-5.9.6-gcc8.patch @@ -0,0 +1,24 @@ +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 + +diff -up chromium-66.0.3359.170/src/3rdparty/chromium/mojo/public/c/system/macros.h.gcc8-alignof chromium-66.0.3359.170/src/3rdparty/chromium/mojo/public/c/system/macros.h +--- a/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:46.448912634 -0400 ++++ b/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:52.041784613 -0400 +@@ -18,7 +18,13 @@ + #endif + + // 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) |