diff --git a/chromium-gcc8-alignof.patch b/chromium-gcc8-alignof.patch new file mode 100644 index 0000000..746783e --- /dev/null +++ b/chromium-gcc8-alignof.patch @@ -0,0 +1,25 @@ +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: chromium-69.0.3497.81/mojo/public/c/system/macros.h +=================================================================== +--- chromium-69.0.3497.81.orig/mojo/public/c/system/macros.h ++++ chromium-69.0.3497.81/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) diff --git a/chromium.changes b/chromium.changes index 6ba8053..1e08eee 100644 --- a/chromium.changes +++ b/chromium.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 6 13:27:18 UTC 2018 - tchvatal@suse.com + +- Add patch to fix mojo build on 32bit: + * chromium-gcc8-alignof.patch + ------------------------------------------------------------------- Thu Sep 6 09:13:49 UTC 2018 - Tomáš Chvátal diff --git a/chromium.spec b/chromium.spec index f6d4f81..c626f40 100644 --- a/chromium.spec +++ b/chromium.spec @@ -74,6 +74,7 @@ Patch10: chromium-skia-aarch64-buildfix.patch Patch11: chromium-vpx-aarch64.patch Patch12: chromium-system-icu.patch Patch13: chromium-old-glibc.patch +Patch14: chromium-gcc8-alignof.patch # Google seem not too keen on merging this but GPU accel is quite important # https://chromium-review.googlesource.com/c/chromium/src/+/532294 # https://github.com/saiarcot895/chromium-ubuntu-build/tree/master/debian/patches