From bccde4757f795f7c9dc40444a941f0992b41e11d Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sun, 17 Feb 2019 09:41:54 +0100 Subject: extra/qt5-webengine: updated chromium alignment patch --- extra/qt5-webengine/PKGBUILD | 18 ++-- .../chromium-69.0.3497.81-gcc8-alignof.patch | 102 +++++++++++++++++++++ ...where-src-5.11.0-chromium-64bit-alignment.patch | 18 ---- 3 files changed, 111 insertions(+), 27 deletions(-) create mode 100644 extra/qt5-webengine/chromium-69.0.3497.81-gcc8-alignof.patch delete mode 100644 extra/qt5-webengine/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch diff --git a/extra/qt5-webengine/PKGBUILD b/extra/qt5-webengine/PKGBUILD index 26837912..c01280e8 100644 --- a/extra/qt5-webengine/PKGBUILD +++ b/extra/qt5-webengine/PKGBUILD @@ -16,16 +16,16 @@ eval "$( ' )" -# see https://src.fedoraproject.org/cgit/rpms/chromium.git/tree/chromium-66.0.3359.170-gcc8-alignof.patch -source+=('qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch') -sha256sums+=('f1d810bf237ea3ce85803eb4665273b2d2bfa8a2a19521d5fa05568cec5d8cba') +# see https://src.fedoraproject.org/cgit/rpms/chromium.git/tree/chromium-69.0.3497.81-gcc8-alignof.patch +source+=('chromium-69.0.3497.81-gcc8-alignof.patch') +sha256sums+=('92e613d645f3e21d704e43a4000b796dac3fee772fb010844ab1435e45ec37d0') -eval "$( - declare -f prepare | \ - sed ' - $ i cd "$srcdir/${_pkgfqn}/src/3rdparty"; patch -Np0 -i "${srcdir}"/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch - ' -)" +#eval "$( +# declare -f prepare | \ +# sed ' +# $ i cd "$srcdir/${_pkgfqn}/src/3rdparty"; patch -Np0 -i "${srcdir}"/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch +# ' +#)" # see FS32#44, installing qt4 seems to help against: # fatal error: QtUiPlugin/QDesignerCustomWidgetInterface: No such file or directory diff --git a/extra/qt5-webengine/chromium-69.0.3497.81-gcc8-alignof.patch b/extra/qt5-webengine/chromium-69.0.3497.81-gcc8-alignof.patch new file mode 100644 index 00000000..eda047b0 --- /dev/null +++ b/extra/qt5-webengine/chromium-69.0.3497.81-gcc8-alignof.patch @@ -0,0 +1,102 @@ + + + +chromium-69.0.3497.81-gcc8-alignof.patch - rpms/chromium.git - rpms/chromium + + + + + + + + + + + + +
+ + + + +
+summaryrefslogtreecommitdiffstats
+ + + +
+
+
path: root/chromium-69.0.3497.81-gcc8-alignof.patch
blob: 234b391824871e0a309b0beaf5c858ae36f8dddc (plain) + + +
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+
diff -up chromium-69.0.3497.81/mojo/public/c/system/macros.h.gcc8-alignof chromium-69.0.3497.81/mojo/public/c/system/macros.h
+--- chromium-69.0.3497.81/mojo/public/c/system/macros.h.gcc8-alignof	2018-09-06 10:11:54.336432699 -0400
++++ chromium-69.0.3497.81/mojo/public/c/system/macros.h	2018-09-06 10:13:56.555727572 -0400
+@@ -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)
+
+
+
generated by cgit v1.1 at 2019-02-17 08:32:15 +0000
+
+ + diff --git a/extra/qt5-webengine/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch b/extra/qt5-webengine/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch deleted file mode 100644 index 6027d29f..00000000 --- a/extra/qt5-webengine/qtwebengine-everywhere-src-5.11.0-chromium-64bit-alignment.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -rauN chromium/mojo/public/c/system/macros.h chromium/mojo/public/c/system/macros.h ---- chromium/mojo/public/c/system/macros.h 2018-06-03 09:46:38.408293369 +0200 -+++ chromium/mojo/public/c/system/macros.h 2018-06-03 09:46:54.734960038 +0200 -@@ -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) -- cgit v1.2.3