1 |
commit: 7843d29ab07411a9c70962fb90b4cd1546910242 |
2 |
Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 30 16:26:21 2017 +0000 |
4 |
Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 30 16:26:21 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7843d29a |
7 |
|
8 |
www-client/chromium: fix remaining gcc-5 issues |
9 |
|
10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=628284 |
11 |
|
12 |
Package-Manager: Portage-2.3.8, Repoman-2.3.1 |
13 |
|
14 |
www-client/chromium/chromium-62.0.3202.18.ebuild | 2 +- |
15 |
www-client/chromium/chromium-63.0.3223.8.ebuild | 2 +- |
16 |
www-client/chromium/files/chromium-gcc5-r3.patch | 98 ++++++++++++++++++++++++ |
17 |
www-client/chromium/files/chromium-gcc5-r4.patch | 98 ++++++++++++++++++++++++ |
18 |
4 files changed, 198 insertions(+), 2 deletions(-) |
19 |
|
20 |
diff --git a/www-client/chromium/chromium-62.0.3202.18.ebuild b/www-client/chromium/chromium-62.0.3202.18.ebuild |
21 |
index 2d08ef65db0..72bfe6ed14d 100644 |
22 |
--- a/www-client/chromium/chromium-62.0.3202.18.ebuild |
23 |
+++ b/www-client/chromium/chromium-62.0.3202.18.ebuild |
24 |
@@ -144,7 +144,7 @@ GTK+ icon theme. |
25 |
PATCHES=( |
26 |
"${FILESDIR}/${PN}-widevine-r1.patch" |
27 |
"${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch" |
28 |
- "${FILESDIR}/${PN}-gcc5-r2.patch" |
29 |
+ "${FILESDIR}/${PN}-gcc5-r3.patch" |
30 |
"${FILESDIR}/${PN}-gn-bootstrap-r17.patch" |
31 |
"${FILESDIR}/${PN}-glibc2.26-r1.patch" |
32 |
) |
33 |
|
34 |
diff --git a/www-client/chromium/chromium-63.0.3223.8.ebuild b/www-client/chromium/chromium-63.0.3223.8.ebuild |
35 |
index 222538cbccb..809c36dc7ab 100644 |
36 |
--- a/www-client/chromium/chromium-63.0.3223.8.ebuild |
37 |
+++ b/www-client/chromium/chromium-63.0.3223.8.ebuild |
38 |
@@ -144,7 +144,7 @@ GTK+ icon theme. |
39 |
PATCHES=( |
40 |
"${FILESDIR}/${PN}-widevine-r1.patch" |
41 |
"${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch" |
42 |
- "${FILESDIR}/${PN}-gcc5-r2.patch" |
43 |
+ "${FILESDIR}/${PN}-gcc5-r4.patch" |
44 |
"${FILESDIR}/${PN}-gn-bootstrap-r20.patch" |
45 |
) |
46 |
|
47 |
|
48 |
diff --git a/www-client/chromium/files/chromium-gcc5-r3.patch b/www-client/chromium/files/chromium-gcc5-r3.patch |
49 |
new file mode 100644 |
50 |
index 00000000000..7605df6b145 |
51 |
--- /dev/null |
52 |
+++ b/www-client/chromium/files/chromium-gcc5-r3.patch |
53 |
@@ -0,0 +1,98 @@ |
54 |
+--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h |
55 |
++++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h |
56 |
+@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { |
57 |
+ allocation_length_(0), |
58 |
+ data_(data), |
59 |
+ data_length_(0), |
60 |
+- kind_(AllocationKind::kNormal), |
61 |
++ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), |
62 |
+ deleter_(deleter) {} |
63 |
+ DataHandle(void* allocation_base, |
64 |
+ size_t allocation_length, |
65 |
+@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { |
66 |
+ reinterpret_cast<uintptr_t>(allocation_base_) + |
67 |
+ allocation_length_); |
68 |
+ switch (kind_) { |
69 |
+- case AllocationKind::kNormal: |
70 |
++ case WTF::ArrayBufferContents::AllocationKind::kNormal: |
71 |
+ DCHECK(deleter_); |
72 |
+ deleter_(data_); |
73 |
+ return; |
74 |
+- case AllocationKind::kReservation: |
75 |
++ case WTF::ArrayBufferContents::AllocationKind::kReservation: |
76 |
+ ReleaseReservedMemory(allocation_base_, allocation_length_); |
77 |
+ return; |
78 |
+ } |
79 |
+--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 |
80 |
++++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 |
81 |
+@@ -10,7 +10,7 @@ |
82 |
+ |
83 |
+ #include "webrtc/modules/audio_processing/aec3/aec_state.h" |
84 |
+ |
85 |
+-#include <math.h> |
86 |
++#include <cmath> |
87 |
+ #include <numeric> |
88 |
+ #include <vector> |
89 |
+ |
90 |
+--- a/gpu/ipc/common/mailbox_struct_traits.h |
91 |
++++ b/gpu/ipc/common/mailbox_struct_traits.h |
92 |
+@@ -15,7 +15,7 @@ namespace mojo { |
93 |
+ template <> |
94 |
+ struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> { |
95 |
+ static base::span<const int8_t> name(const gpu::Mailbox& mailbox) { |
96 |
+- return mailbox.name; |
97 |
++ return base::make_span(mailbox.name); |
98 |
+ } |
99 |
+ static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out); |
100 |
+ }; |
101 |
+--- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h |
102 |
++++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h |
103 |
+@@ -134,7 +134,7 @@ struct StructTraits<viz::mojom::FilterOperationDataView, cc::FilterOperation> { |
104 |
+ static base::span<const float> matrix(const cc::FilterOperation& operation) { |
105 |
+ if (operation.type() != cc::FilterOperation::COLOR_MATRIX) |
106 |
+ return base::span<const float>(); |
107 |
+- return operation.matrix(); |
108 |
++ return base::make_span(operation.matrix()); |
109 |
+ } |
110 |
+ |
111 |
+ static base::span<const gfx::Rect> shape( |
112 |
+--- a/services/viz/public/cpp/compositing/quads_struct_traits.h |
113 |
++++ b/services/viz/public/cpp/compositing/quads_struct_traits.h |
114 |
+@@ -284,7 +284,7 @@ |
115 |
+ |
116 |
+ static base::span<const float> vertex_opacity(const cc::DrawQuad& input) { |
117 |
+ const cc::TextureDrawQuad* quad = cc::TextureDrawQuad::MaterialCast(&input); |
118 |
+- return quad->vertex_opacity; |
119 |
++ return base::make_span(quad->vertex_opacity); |
120 |
+ } |
121 |
+ |
122 |
+ static bool y_flipped(const cc::DrawQuad& input) { |
123 |
+--- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp |
124 |
++++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp |
125 |
+@@ -480,7 +480,7 @@ WebString AccessControlErrorString( |
126 |
+ } |
127 |
+ default: |
128 |
+ NOTREACHED(); |
129 |
+- return ""; |
130 |
++ return WebString(); |
131 |
+ } |
132 |
+ } |
133 |
+ |
134 |
+@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status, |
135 |
+ } |
136 |
+ default: |
137 |
+ NOTREACHED(); |
138 |
+- return ""; |
139 |
++ return WebString(); |
140 |
+ } |
141 |
+ } |
142 |
+ |
143 |
+@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status, |
144 |
+ } |
145 |
+ default: |
146 |
+ NOTREACHED(); |
147 |
+- return ""; |
148 |
++ return WebString(); |
149 |
+ } |
150 |
+ } |
151 |
+ |
152 |
|
153 |
diff --git a/www-client/chromium/files/chromium-gcc5-r4.patch b/www-client/chromium/files/chromium-gcc5-r4.patch |
154 |
new file mode 100644 |
155 |
index 00000000000..cb978d58a06 |
156 |
--- /dev/null |
157 |
+++ b/www-client/chromium/files/chromium-gcc5-r4.patch |
158 |
@@ -0,0 +1,98 @@ |
159 |
+--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h |
160 |
++++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h |
161 |
+@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { |
162 |
+ allocation_length_(0), |
163 |
+ data_(data), |
164 |
+ data_length_(0), |
165 |
+- kind_(AllocationKind::kNormal), |
166 |
++ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), |
167 |
+ deleter_(deleter) {} |
168 |
+ DataHandle(void* allocation_base, |
169 |
+ size_t allocation_length, |
170 |
+@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { |
171 |
+ reinterpret_cast<uintptr_t>(allocation_base_) + |
172 |
+ allocation_length_); |
173 |
+ switch (kind_) { |
174 |
+- case AllocationKind::kNormal: |
175 |
++ case WTF::ArrayBufferContents::AllocationKind::kNormal: |
176 |
+ DCHECK(deleter_); |
177 |
+ deleter_(data_); |
178 |
+ return; |
179 |
+- case AllocationKind::kReservation: |
180 |
++ case WTF::ArrayBufferContents::AllocationKind::kReservation: |
181 |
+ ReleaseReservedMemory(allocation_base_, allocation_length_); |
182 |
+ return; |
183 |
+ } |
184 |
+--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 |
185 |
++++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 |
186 |
+@@ -10,7 +10,7 @@ |
187 |
+ |
188 |
+ #include "webrtc/modules/audio_processing/aec3/aec_state.h" |
189 |
+ |
190 |
+-#include <math.h> |
191 |
++#include <cmath> |
192 |
+ #include <numeric> |
193 |
+ #include <vector> |
194 |
+ |
195 |
+--- a/gpu/ipc/common/mailbox_struct_traits.h |
196 |
++++ b/gpu/ipc/common/mailbox_struct_traits.h |
197 |
+@@ -15,7 +15,7 @@ namespace mojo { |
198 |
+ template <> |
199 |
+ struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> { |
200 |
+ static base::span<const int8_t> name(const gpu::Mailbox& mailbox) { |
201 |
+- return mailbox.name; |
202 |
++ return base::make_span(mailbox.name); |
203 |
+ } |
204 |
+ static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out); |
205 |
+ }; |
206 |
+--- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h |
207 |
++++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h |
208 |
+@@ -134,7 +134,7 @@ struct StructTraits<viz::mojom::FilterOperationDataView, cc::FilterOperation> { |
209 |
+ static base::span<const float> matrix(const cc::FilterOperation& operation) { |
210 |
+ if (operation.type() != cc::FilterOperation::COLOR_MATRIX) |
211 |
+ return base::span<const float>(); |
212 |
+- return operation.matrix(); |
213 |
++ return base::make_span(operation.matrix()); |
214 |
+ } |
215 |
+ |
216 |
+ static base::span<const gfx::Rect> shape( |
217 |
+--- a/services/viz/public/cpp/compositing/quads_struct_traits.h |
218 |
++++ b/services/viz/public/cpp/compositing/quads_struct_traits.h |
219 |
+@@ -303,7 +303,7 @@ struct StructTraits<viz::mojom::TextureQuadStateDataView, viz::DrawQuad> { |
220 |
+ static base::span<const float> vertex_opacity(const viz::DrawQuad& input) { |
221 |
+ const viz::TextureDrawQuad* quad = |
222 |
+ viz::TextureDrawQuad::MaterialCast(&input); |
223 |
+- return quad->vertex_opacity; |
224 |
++ return base::make_span(quad->vertex_opacity); |
225 |
+ } |
226 |
+ |
227 |
+ static bool y_flipped(const viz::DrawQuad& input) { |
228 |
+--- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp |
229 |
++++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp |
230 |
+@@ -480,7 +480,7 @@ WebString AccessControlErrorString( |
231 |
+ } |
232 |
+ default: |
233 |
+ NOTREACHED(); |
234 |
+- return ""; |
235 |
++ return WebString(); |
236 |
+ } |
237 |
+ } |
238 |
+ |
239 |
+@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status, |
240 |
+ } |
241 |
+ default: |
242 |
+ NOTREACHED(); |
243 |
+- return ""; |
244 |
++ return WebString(); |
245 |
+ } |
246 |
+ } |
247 |
+ |
248 |
+@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status, |
249 |
+ } |
250 |
+ default: |
251 |
+ NOTREACHED(); |
252 |
+- return ""; |
253 |
++ return WebString(); |
254 |
+ } |
255 |
+ } |
256 |
+ |