commit: a4671abbefea45730d7e8204ce4e8f510069e7c7 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Feb 5 20:35:21 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Feb 5 20:35:21 2019 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a4671abb
dev-qt/qtwebengine: Drop broken gcc8 patch Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 .../qtwebengine/files/qtwebengine-5.9.6-gcc8.patch | 24 ---------------------- dev-qt/qtwebengine/qtwebengine-5.12.1.ebuild | 1 - dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 3 +-- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch deleted file mode 100644 index ba6a49fd..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch +++ /dev/null @@ -1,24 +0,0 @@ -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) diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.1.ebuild index 2fb3f7b6..48fcb535 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.12.1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.12.1.ebuild @@ -80,7 +80,6 @@ DEPEND="${RDEPEND} " PATCHES+=( - "${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124 "${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752 ) diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild index 232f3195..48fcb535 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -80,7 +80,6 @@ DEPEND="${RDEPEND} " PATCHES+=( - "${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124 "${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752 )
