1 |
commit: 141357aad041fd74e847dbd07af29b09159022b1 |
2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 31 19:20:50 2018 +0000 |
4 |
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 31 19:24:05 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=141357aa |
7 |
|
8 |
dev-qt/qtwebengine: sync with the main Gentoo repo tree |
9 |
|
10 |
- Add patch for GCC-8 (https://bugs.gentoo.org/657124). |
11 |
- Remove 'net-libs/libsrtp' DEPEND |
12 |
(https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02c290ff). |
13 |
|
14 |
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> |
15 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
16 |
|
17 |
.../qtwebengine/files/qtwebengine-5.9.6-gcc8.patch | 24 ++++++++++++++++++++++ |
18 |
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 4 ++-- |
19 |
dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild | 3 ++- |
20 |
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 4 ++-- |
21 |
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 3 ++- |
22 |
5 files changed, 32 insertions(+), 6 deletions(-) |
23 |
|
24 |
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch |
25 |
new file mode 100644 |
26 |
index 00000000..ba6a49fd |
27 |
--- /dev/null |
28 |
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.6-gcc8.patch |
29 |
@@ -0,0 +1,24 @@ |
30 |
+From: Fedora |
31 |
+Subject: Fix build for 32-bit platforms |
32 |
+ |
33 |
+Apparently not upstream, can't find this anywhere. So I assume Fedora is the actual source? |
34 |
+https://src.fedoraproject.org/cgit/rpms/chromium.git/tree/chromium-66.0.3359.170-gcc8-alignof.patch |
35 |
+ |
36 |
+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 |
37 |
+--- a/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:46.448912634 -0400 |
38 |
++++ b/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:52.041784613 -0400 |
39 |
+@@ -18,7 +18,13 @@ |
40 |
+ #endif |
41 |
+ |
42 |
+ // Like the C++11 |alignof| operator. |
43 |
+-#if __cplusplus >= 201103L |
44 |
++#if defined(__GNUC__) && __GNUC__ >= 8 |
45 |
++// GCC 8 has changed the alignof operator to return the minimal alignment |
46 |
++// required by the target ABI, instead of the preferred alignment. |
47 |
++// This means that on 32-bit x86, it will return 4 instead of 8. |
48 |
++// Use __alignof__ instead to avoid this. |
49 |
++#define MOJO_ALIGNOF(type) __alignof__(type) |
50 |
++#elif __cplusplus >= 201103L |
51 |
+ #define MOJO_ALIGNOF(type) alignof(type) |
52 |
+ #elif defined(__GNUC__) |
53 |
+ #define MOJO_ALIGNOF(type) __alignof__(type) |
54 |
|
55 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild |
56 |
index c3ed341b..57fa9ada 100644 |
57 |
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild |
58 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild |
59 |
@@ -1,4 +1,4 @@ |
60 |
-# Copyright 1999-2018 Gentoo Foundation |
61 |
+# Copyright 1999-2018 Gentoo Authors |
62 |
# Distributed under the terms of the GNU General Public License v2 |
63 |
|
64 |
EAPI=6 |
65 |
@@ -40,7 +40,6 @@ RDEPEND=" |
66 |
media-libs/libwebp:= |
67 |
media-libs/mesa[egl] |
68 |
media-libs/opus |
69 |
- net-libs/libsrtp:0= |
70 |
sys-apps/dbus |
71 |
sys-apps/pciutils |
72 |
sys-libs/libcap |
73 |
@@ -80,6 +79,7 @@ DEPEND="${RDEPEND} |
74 |
" |
75 |
|
76 |
PATCHES+=( |
77 |
+ "${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124 |
78 |
"${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752 |
79 |
) |
80 |
|
81 |
|
82 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild |
83 |
index 4a62001c..2a34a526 100644 |
84 |
--- a/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild |
85 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.9999.ebuild |
86 |
@@ -40,7 +40,6 @@ RDEPEND=" |
87 |
media-libs/libwebp:= |
88 |
media-libs/mesa[egl] |
89 |
media-libs/opus |
90 |
- net-libs/libsrtp:0= |
91 |
sys-apps/dbus |
92 |
sys-apps/pciutils |
93 |
sys-libs/libcap |
94 |
@@ -79,6 +78,8 @@ DEPEND="${RDEPEND} |
95 |
pax_kernel? ( sys-apps/elfix ) |
96 |
" |
97 |
|
98 |
+PATCHES+=( "${FILESDIR}/${PN}-5.9.6-gcc8.patch" ) # bug 657124 |
99 |
+ |
100 |
src_prepare() { |
101 |
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) |
102 |
|
103 |
|
104 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild |
105 |
index 65a2d764..2b521acd 100644 |
106 |
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild |
107 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild |
108 |
@@ -1,4 +1,4 @@ |
109 |
-# Copyright 1999-2018 Gentoo Foundation |
110 |
+# Copyright 1999-2018 Gentoo Authors |
111 |
# Distributed under the terms of the GNU General Public License v2 |
112 |
|
113 |
EAPI=6 |
114 |
@@ -38,7 +38,6 @@ RDEPEND=" |
115 |
media-libs/libwebp:= |
116 |
media-libs/mesa[egl] |
117 |
media-libs/opus |
118 |
- net-libs/libsrtp:0= |
119 |
sys-apps/dbus |
120 |
sys-apps/pciutils |
121 |
sys-libs/libcap |
122 |
@@ -81,6 +80,7 @@ DEPEND="${RDEPEND} |
123 |
PATCHES=( |
124 |
"${FILESDIR}/${PN}-5.9.4-jpeg-9-1.patch" |
125 |
"${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch" |
126 |
+ "${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124 |
127 |
) |
128 |
|
129 |
src_prepare() { |
130 |
|
131 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
132 |
index 4a62001c..2a34a526 100644 |
133 |
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
134 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
135 |
@@ -40,7 +40,6 @@ RDEPEND=" |
136 |
media-libs/libwebp:= |
137 |
media-libs/mesa[egl] |
138 |
media-libs/opus |
139 |
- net-libs/libsrtp:0= |
140 |
sys-apps/dbus |
141 |
sys-apps/pciutils |
142 |
sys-libs/libcap |
143 |
@@ -79,6 +78,8 @@ DEPEND="${RDEPEND} |
144 |
pax_kernel? ( sys-apps/elfix ) |
145 |
" |
146 |
|
147 |
+PATCHES+=( "${FILESDIR}/${PN}-5.9.6-gcc8.patch" ) # bug 657124 |
148 |
+ |
149 |
src_prepare() { |
150 |
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) |