From 0e4d7f8fa76c0d58f8f898a15eee91c09496b044 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 16 May 2020 09:37:23 +0200 Subject: extra/qt5-webengine: - removed old and broken gcc8 alignof patch (was a HTML page!?) - added patching for gcc 10 (thanks to Gentoo people) --- extra/qt5-webengine/PKGBUILD | 18 ++-- .../chromium-69.0.3497.81-gcc8-alignof.patch | 102 --------------------- 2 files changed, 9 insertions(+), 111 deletions(-) delete mode 100644 extra/qt5-webengine/chromium-69.0.3497.81-gcc8-alignof.patch diff --git a/extra/qt5-webengine/PKGBUILD b/extra/qt5-webengine/PKGBUILD index 96f27462..c7956f58 100644 --- a/extra/qt5-webengine/PKGBUILD +++ b/extra/qt5-webengine/PKGBUILD @@ -23,13 +23,13 @@ eval "$( ' )" -# 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') +# from https://bugs.gentoo.org/721876 +source+=('qtwebengine-everywhere-src-5.14.2-gcc10-patches.patch') +sha256sums+=('51b6a921e473ddbab14d7c8a8c698e3d68dde9be4c8a0a0f4cf07ac00f82e0f6') -#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}"; patch -Np1 -i "${srcdir}"/qtwebengine-everywhere-src-5.14.2-gcc10-patches.patch + ' +)" 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 deleted file mode 100644 index eda047b0..00000000 --- a/extra/qt5-webengine/chromium-69.0.3497.81-gcc8-alignof.patch +++ /dev/null @@ -1,102 +0,0 @@ - - - -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
-
- - -- cgit v1.2.3