1 |
commit: a4671abbefea45730d7e8204ce4e8f510069e7c7 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 5 20:35:21 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 5 20:35:21 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a4671abb |
7 |
|
8 |
dev-qt/qtwebengine: Drop broken gcc8 patch |
9 |
|
10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
.../qtwebengine/files/qtwebengine-5.9.6-gcc8.patch | 24 ---------------------- |
14 |
dev-qt/qtwebengine/qtwebengine-5.12.1.ebuild | 1 - |
15 |
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 3 +-- |
16 |
3 files changed, 1 insertion(+), 27 deletions(-) |
17 |
|
18 |
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch |
19 |
deleted file mode 100644 |
20 |
index ba6a49fd..00000000 |
21 |
--- a/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch |
22 |
+++ /dev/null |
23 |
@@ -1,24 +0,0 @@ |
24 |
-From: Fedora |
25 |
-Subject: Fix build for 32-bit platforms |
26 |
- |
27 |
-Apparently not upstream, can't find this anywhere. So I assume Fedora is the actual source? |
28 |
-https://src.fedoraproject.org/cgit/rpms/chromium.git/tree/chromium-66.0.3359.170-gcc8-alignof.patch |
29 |
- |
30 |
-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 |
31 |
---- a/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:46.448912634 -0400 |
32 |
-+++ b/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:52.041784613 -0400 |
33 |
-@@ -18,7 +18,13 @@ |
34 |
- #endif |
35 |
- |
36 |
- // Like the C++11 |alignof| operator. |
37 |
--#if __cplusplus >= 201103L |
38 |
-+#if defined(__GNUC__) && __GNUC__ >= 8 |
39 |
-+// GCC 8 has changed the alignof operator to return the minimal alignment |
40 |
-+// required by the target ABI, instead of the preferred alignment. |
41 |
-+// This means that on 32-bit x86, it will return 4 instead of 8. |
42 |
-+// Use __alignof__ instead to avoid this. |
43 |
-+#define MOJO_ALIGNOF(type) __alignof__(type) |
44 |
-+#elif __cplusplus >= 201103L |
45 |
- #define MOJO_ALIGNOF(type) alignof(type) |
46 |
- #elif defined(__GNUC__) |
47 |
- #define MOJO_ALIGNOF(type) __alignof__(type) |
48 |
|
49 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.1.ebuild |
50 |
index 2fb3f7b6..48fcb535 100644 |
51 |
--- a/dev-qt/qtwebengine/qtwebengine-5.12.1.ebuild |
52 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.1.ebuild |
53 |
@@ -80,7 +80,6 @@ DEPEND="${RDEPEND} |
54 |
" |
55 |
|
56 |
PATCHES+=( |
57 |
- "${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124 |
58 |
"${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752 |
59 |
) |
60 |
|
61 |
|
62 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild |
63 |
index 232f3195..48fcb535 100644 |
64 |
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild |
65 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild |
66 |
@@ -1,4 +1,4 @@ |
67 |
-# Copyright 1999-2018 Gentoo Authors |
68 |
+# Copyright 1999-2019 Gentoo Authors |
69 |
# Distributed under the terms of the GNU General Public License v2 |
70 |
|
71 |
EAPI=6 |
72 |
@@ -80,7 +80,6 @@ DEPEND="${RDEPEND} |
73 |
" |
74 |
|
75 |
PATCHES+=( |
76 |
- "${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124 |
77 |
"${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752 |
78 |
) |