Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/, www-client/chromium/
Date: Tue, 10 Mar 2020 15:06:54
Message-Id: 1583852804.adb8703f3e0af99058b75e997984d762b1844913.floppym@gentoo
1 commit: adb8703f3e0af99058b75e997984d762b1844913
2 Author: Stephan Hartmann <stha09 <AT> googlemail <DOT> com>
3 AuthorDate: Sun Mar 8 19:08:30 2020 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Tue Mar 10 15:06:44 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adb8703f
7
8 www-client/chromium: dev channel bump to 82.0.4077.0
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com>
12 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
13 Closes: https://github.com/gentoo/gentoo/pull/14918
14
15 www-client/chromium/Manifest | 2 +-
16 ...0.4068.4.ebuild => chromium-82.0.4077.0.ebuild} | 11 +++--
17 .../chromium/files/chromium-82-clang-std.patch | 13 ++++++
18 .../files/chromium-82-gcc-incomplete-type.patch | 40 +++++++++++++++++
19 .../chromium/files/chromium-82-gcc-noexcept.patch | 13 ++++++
20 .../chromium/files/chromium-82-gcc-private.patch | 47 --------------------
21 .../chromium/files/chromium-82-gcc-template.patch | 50 ++++++++++++++++++++++
22 .../chromium/files/chromium-82-include.patch | 28 ------------
23 .../chromium/files/chromium-compiler-r12.patch | 32 +++++++-------
24 9 files changed, 140 insertions(+), 96 deletions(-)
25
26 diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
27 index dc2668f7b5e..744b666496b 100644
28 --- a/www-client/chromium/Manifest
29 +++ b/www-client/chromium/Manifest
30 @@ -1,3 +1,3 @@
31 DIST chromium-80.0.3987.132.tar.xz 796975056 BLAKE2B 0da35d3218f4f44c15f05693336a034876764ef228f173cd00cedc045ebc06972416779a39458863b47a1863ab8f21b5d2dc11c6ed33ee81649cd0316bf31524 SHA512 10bf0d1efdf2ead9e94de90971ec135f5370f8c949acfd75ca953aed706510cc3a1464f1ff3c40275921bb24953d8ce65d095e38cb0d56488ccc2c7fa27516d4
32 DIST chromium-81.0.4044.43.tar.xz 785978276 BLAKE2B 295e5a09d79db7205aea64511356f8a649ad054c4f279ab2a1dd72631b3bff2245ca6272f3eb11414eb5a612c47b988325390932d91c4e55ccc9c0883593331f SHA512 6391c9d0460646b8c241f5ec5502b801e9f500651fc73ad664215a43047ab50fa6851edeed5cbb9c1637576d8081295f4f4a67d3d7daa15769241a0055494bf6
33 -DIST chromium-82.0.4068.4.tar.xz 803352676 BLAKE2B 64356b7c840d6ba955d2b7aced1faf85e05f19c9c0b39e8bf86529b86bba2e162404820f5710e9962c4d5e1325086becc3aebb0fdc2683b06231a2a0e8d7a6ae SHA512 ceb3b50ad4b38e969cf27c386d696665d773e73c000a1cd1ee158bbff86ae94b09a5fbe128547ed496e258ce8bfaf9bbf28b0d229254400c86afbe49fc7e8d8b
34 +DIST chromium-82.0.4077.0.tar.xz 793873940 BLAKE2B 9629ca475e135e68bf99bfae5566b49c1516b2abc78f1bdfc9cb2135802c994b4bfc3860d12797abc1c89fa478ab7aa9fdb60af2f5d080cb00093a5fb42d064d SHA512 b0b039f663257617e62e5620fd19272871f3bbe33b19a6adb23882fa7bccf358d3c09495caf96e37e2670321000ecf685588df8566451364931c6a3418eca91b
35
36 diff --git a/www-client/chromium/chromium-82.0.4068.4.ebuild b/www-client/chromium/chromium-82.0.4077.0.ebuild
37 similarity index 98%
38 rename from www-client/chromium/chromium-82.0.4068.4.ebuild
39 rename to www-client/chromium/chromium-82.0.4077.0.ebuild
40 index a056ee3c4d4..019d9968c0e 100644
41 --- a/www-client/chromium/chromium-82.0.4068.4.ebuild
42 +++ b/www-client/chromium/chromium-82.0.4077.0.ebuild
43 @@ -109,7 +109,7 @@ BDEPEND="
44 : ${CHROMIUM_FORCE_CLANG=no}
45
46 if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
47 - BDEPEND+=" >=sys-devel/clang-7"
48 + BDEPEND+=" >=sys-devel/clang-9"
49 fi
50
51 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
52 @@ -144,10 +144,11 @@ PATCHES=(
53 "${FILESDIR}/chromium-78-protobuf-export.patch"
54 "${FILESDIR}/chromium-79-gcc-alignas.patch"
55 "${FILESDIR}/chromium-80-gcc-quiche.patch"
56 - "${FILESDIR}/chromium-80-gcc-blink.patch"
57 "${FILESDIR}/chromium-82-gcc-constexpr.patch"
58 - "${FILESDIR}/chromium-82-gcc-private.patch"
59 - "${FILESDIR}/chromium-82-include.patch"
60 + "${FILESDIR}/chromium-82-gcc-noexcept.patch"
61 + "${FILESDIR}/chromium-82-gcc-incomplete-type.patch"
62 + "${FILESDIR}/chromium-82-gcc-template.patch"
63 + "${FILESDIR}/chromium-82-clang-std.patch"
64 )
65
66 pre_build_checks() {
67 @@ -270,6 +271,7 @@ src_prepare() {
68 third_party/devscripts
69 third_party/devtools-frontend
70 third_party/devtools-frontend/src/front_end/third_party/fabricjs
71 + third_party/devtools-frontend/src/front_end/third_party/lighthouse
72 third_party/devtools-frontend/src/front_end/third_party/wasmparser
73 third_party/devtools-frontend/src/third_party
74 third_party/dom_distiller_js
75 @@ -352,6 +354,7 @@ src_prepare() {
76 third_party/SPIRV-Tools
77 third_party/sqlite
78 third_party/swiftshader
79 + third_party/swiftshader/third_party/astc-encoder
80 third_party/swiftshader/third_party/llvm-7.0
81 third_party/swiftshader/third_party/llvm-subzero
82 third_party/swiftshader/third_party/marl
83
84 diff --git a/www-client/chromium/files/chromium-82-clang-std.patch b/www-client/chromium/files/chromium-82-clang-std.patch
85 new file mode 100644
86 index 00000000000..1ad62fbf45d
87 --- /dev/null
88 +++ b/www-client/chromium/files/chromium-82-clang-std.patch
89 @@ -0,0 +1,13 @@
90 +diff --git a/third_party/blink/renderer/platform/bindings/v8_set_return_value.h b/third_party/blink/renderer/platform/bindings/v8_set_return_value.h
91 +index 07cae22..7871f55 100644
92 +--- a/third_party/blink/renderer/platform/bindings/v8_set_return_value.h
93 ++++ b/third_party/blink/renderer/platform/bindings/v8_set_return_value.h
94 +@@ -51,7 +51,7 @@ void V8SetReturnValue(const CallbackInfo& info, const v8::Local<S> value) {
95 +
96 + // nullptr
97 + template <typename CallbackInfo>
98 +-void V8SetReturnValue(const CallbackInfo& info, nullptr_t) {
99 ++void V8SetReturnValue(const CallbackInfo& info, std::nullptr_t) {
100 + info.GetReturnValue().SetNull();
101 + }
102 +
103
104 diff --git a/www-client/chromium/files/chromium-82-gcc-incomplete-type.patch b/www-client/chromium/files/chromium-82-gcc-incomplete-type.patch
105 new file mode 100644
106 index 00000000000..9e46ad7f51b
107 --- /dev/null
108 +++ b/www-client/chromium/files/chromium-82-gcc-incomplete-type.patch
109 @@ -0,0 +1,40 @@
110 +diff --git a/ui/accessibility/ax_tree.cc b/ui/accessibility/ax_tree.cc
111 +index 616d53f..26749e3 100644
112 +--- a/ui/accessibility/ax_tree.cc
113 ++++ b/ui/accessibility/ax_tree.cc
114 +@@ -565,15 +565,6 @@ struct AXTreeUpdateState {
115 + const AXTree& tree;
116 + };
117 +
118 +-struct AXTree::NodeSetSizePosInSetInfo {
119 +- NodeSetSizePosInSetInfo() = default;
120 +- ~NodeSetSizePosInSetInfo() = default;
121 +-
122 +- int32_t pos_in_set = 0;
123 +- int32_t set_size = 0;
124 +- base::Optional<int> lowest_hierarchical_level;
125 +-};
126 +-
127 + struct AXTree::OrderedSetContent {
128 + explicit OrderedSetContent(const AXNode* ordered_set = nullptr)
129 + : ordered_set_(ordered_set) {}
130 +diff --git a/ui/accessibility/ax_tree.h b/ui/accessibility/ax_tree.h
131 +index 3bbbe0c..e4288f5 100644
132 +--- a/ui/accessibility/ax_tree.h
133 ++++ b/ui/accessibility/ax_tree.h
134 +@@ -323,7 +323,14 @@ class AX_EXPORT AXTree : public AXNode::OwnerTree {
135 + bool enable_extra_mac_nodes_ = false;
136 +
137 + // Contains pos_in_set and set_size data for an AXNode.
138 +- struct NodeSetSizePosInSetInfo;
139 ++ struct NodeSetSizePosInSetInfo {
140 ++ NodeSetSizePosInSetInfo() = default;
141 ++ ~NodeSetSizePosInSetInfo() = default;
142 ++
143 ++ int32_t pos_in_set = 0;
144 ++ int32_t set_size = 0;
145 ++ base::Optional<int> lowest_hierarchical_level;
146 ++ };
147 +
148 + // Represents the content of an ordered set which includes the ordered set
149 + // items and the ordered set container if it exists.
150
151 diff --git a/www-client/chromium/files/chromium-82-gcc-noexcept.patch b/www-client/chromium/files/chromium-82-gcc-noexcept.patch
152 new file mode 100644
153 index 00000000000..db66934d883
154 --- /dev/null
155 +++ b/www-client/chromium/files/chromium-82-gcc-noexcept.patch
156 @@ -0,0 +1,13 @@
157 +diff --git a/ui/color/color_set.cc b/ui/color/color_set.cc
158 +index 56564d7..2798a3c 100644
159 +--- a/ui/color/color_set.cc
160 ++++ b/ui/color/color_set.cc
161 +@@ -11,7 +11,7 @@ ColorSet::ColorSet(ColorSetId id, ColorMap&& colors)
162 +
163 + ColorSet::ColorSet(ColorSet&&) noexcept = default;
164 +
165 +-ColorSet& ColorSet::operator=(ColorSet&&) noexcept = default;
166 ++ColorSet& ColorSet::operator=(ColorSet&&) = default;
167 +
168 + ColorSet::~ColorSet() = default;
169 +
170
171 diff --git a/www-client/chromium/files/chromium-82-gcc-private.patch b/www-client/chromium/files/chromium-82-gcc-private.patch
172 deleted file mode 100644
173 index 278f5b1d97a..00000000000
174 --- a/www-client/chromium/files/chromium-82-gcc-private.patch
175 +++ /dev/null
176 @@ -1,47 +0,0 @@
177 -From 1931db04cf4b3737adfb99edf86cbf68d740511b Mon Sep 17 00:00:00 2001
178 -From: Jose Dapena Paz <jdapena@××××××.com>
179 -Date: Thu, 20 Feb 2020 11:41:29 +0100
180 -Subject: [PATCH] GNU stdc++: media::MediaError default constructor should be public
181 -
182 -On building with GNU stdc++ we get this error building:
183 - gen/media/mojo/mojom/media_types.mojom.cc:1161:55: required from here
184 - /usr/include/c++/9/bits/stl_construct.h:75:7: error: ‘media::MediaError::MediaError()’ is private within this context
185 -
186 -This is because the serialization code will eventually call, in this case,
187 -the default constructor because of the implementation of stl_uninitialized
188 -that is used to create an std::vector. This is invoked from
189 -static bool mojo::ArrayTraits<std::vector<_Tp> >::Resize(std::vector<_Tp>&, size_t)
190 -and what it does is constructing a temporary vector like this:
191 - std::vector<T> temp(size);
192 -
193 -But this is requiring calling the default constructor of T (in this case
194 -MediaError) for all the elements up to size-1.
195 -
196 -Bug: 957519
197 -Change-Id: Ie3a28b9734f16c5155b9500003838510be0a748d
198 ----
199 -
200 -diff --git a/media/base/media_error.h b/media/base/media_error.h
201 -index d3ba96c..56daaec 100644
202 ---- a/media/base/media_error.h
203 -+++ b/media/base/media_error.h
204 -@@ -40,6 +40,9 @@
205 - // successful returns.
206 - class MEDIA_EXPORT MediaError {
207 - public:
208 -+ // Default constructor can be used for MediaError::Ok();
209 -+ MediaError();
210 -+
211 - // Convenience function to return |kOk|.
212 - // OK won't have a message, trace, or data associated with them, and DCHECK
213 - // if they are added.
214 -@@ -110,9 +113,6 @@
215 - }
216 -
217 - private:
218 -- // Default constructor can be used for MediaError::Ok();
219 -- MediaError();
220 --
221 - // Private helper to add the current stack frame to the error trace.
222 - void AddFrame(const base::Location& location);
223 -
224
225 diff --git a/www-client/chromium/files/chromium-82-gcc-template.patch b/www-client/chromium/files/chromium-82-gcc-template.patch
226 new file mode 100644
227 index 00000000000..90909c5692b
228 --- /dev/null
229 +++ b/www-client/chromium/files/chromium-82-gcc-template.patch
230 @@ -0,0 +1,50 @@
231 +diff --git a/content/public/browser/web_ui.h b/content/public/browser/web_ui.h
232 +index 4e6aa0e..fa6f10c 100644
233 +--- a/content/public/browser/web_ui.h
234 ++++ b/content/public/browser/web_ui.h
235 +@@ -138,22 +138,6 @@ class CONTENT_EXPORT WebUI {
236 + template <typename T>
237 + static T GetValue(const base::Value& value);
238 +
239 +- template <>
240 +- inline bool GetValue<bool>(const base::Value& value) {
241 +- return value.GetBool();
242 +- }
243 +-
244 +- template <>
245 +- inline int GetValue<int>(const base::Value& value) {
246 +- return value.GetInt();
247 +- }
248 +-
249 +- template <>
250 +- inline const std::string& GetValue<const std::string&>(
251 +- const base::Value& value) {
252 +- return value.GetString();
253 +- }
254 +-
255 + template <typename Is, typename... Args>
256 + struct Call;
257 +
258 +@@ -169,6 +153,22 @@ class CONTENT_EXPORT WebUI {
259 + };
260 + };
261 +
262 ++template <>
263 ++inline bool WebUI::GetValue<bool>(const base::Value& value) {
264 ++ return value.GetBool();
265 ++}
266 ++
267 ++template <>
268 ++inline int WebUI::GetValue<int>(const base::Value& value) {
269 ++ return value.GetInt();
270 ++}
271 ++
272 ++template <>
273 ++inline const std::string& WebUI::GetValue<const std::string&>(
274 ++ const base::Value& value) {
275 ++ return value.GetString();
276 ++}
277 ++
278 + } // namespace content
279 +
280 + #endif // CONTENT_PUBLIC_BROWSER_WEB_UI_H_
281
282 diff --git a/www-client/chromium/files/chromium-82-include.patch b/www-client/chromium/files/chromium-82-include.patch
283 deleted file mode 100644
284 index 9a39ae2e8d5..00000000000
285 --- a/www-client/chromium/files/chromium-82-include.patch
286 +++ /dev/null
287 @@ -1,28 +0,0 @@
288 -From 046deafc60a31f485a96773dc5ea5b0eb2ed15f1 Mon Sep 17 00:00:00 2001
289 -From: Jose Dapena Paz <jdapena@××××××.com>
290 -Date: Mon, 24 Feb 2020 16:24:33 +0000
291 -Subject: [PATCH] IWYU: missing include for std::string in csp_source_list.h
292 -
293 -Build error in GCC:
294 -../../services/network/public/cpp/content_security_policy/csp_source_list.h:19:6: error: ‘string’ in namespace ‘std’ does not name a type
295 -
296 -Bug: 819294
297 -Change-Id: I9c8665050cae038530a79323b65932a124adf2a1
298 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2067074
299 -Commit-Queue: Lucas Gadani <lfg@××××××××.org>
300 -Reviewed-by: Lucas Gadani <lfg@××××××××.org>
301 -Cr-Commit-Position: refs/heads/master@{#743946}
302 ----
303 -
304 -diff --git a/services/network/public/cpp/content_security_policy/csp_source_list.h b/services/network/public/cpp/content_security_policy/csp_source_list.h
305 -index 0cd3971..6df1891 100644
306 ---- a/services/network/public/cpp/content_security_policy/csp_source_list.h
307 -+++ b/services/network/public/cpp/content_security_policy/csp_source_list.h
308 -@@ -5,6 +5,7 @@
309 - #ifndef SERVICES_NETWORK_PUBLIC_CPP_CONTENT_SECURITY_POLICY_CSP_SOURCE_LIST_H_
310 - #define SERVICES_NETWORK_PUBLIC_CPP_CONTENT_SECURITY_POLICY_CSP_SOURCE_LIST_H_
311 -
312 -+#include <string>
313 - #include <vector>
314 -
315 - #include "base/component_export.h"
316
317 diff --git a/www-client/chromium/files/chromium-compiler-r12.patch b/www-client/chromium/files/chromium-compiler-r12.patch
318 index 833abe2828c..3d8117e4c06 100644
319 --- a/www-client/chromium/files/chromium-compiler-r12.patch
320 +++ b/www-client/chromium/files/chromium-compiler-r12.patch
321 @@ -1,6 +1,6 @@
322 -From 137de121a36f9349ad8435fee57940facef82878 Mon Sep 17 00:00:00 2001
323 +From 2e9a5f0e54d8968c4fab8f1cd00c225e387f0187 Mon Sep 17 00:00:00 2001
324 From: Mike Gilbert <floppym@g.o>
325 -Date: Fri, 26 Feb 2020 10:09:23 +0000
326 +Date: Fri, 6 Mar 2020 17:10:30 +0000
327 Subject: [PATCH] Disable various compiler configs
328
329 ---
330 @@ -8,7 +8,7 @@ Subject: [PATCH] Disable various compiler configs
331 1 file changed, 23 insertions(+), 44 deletions(-)
332
333 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
334 -index 85bc736..a85bd12 100644
335 +index d4597c7..4c651ac 100644
336 --- a/build/config/compiler/BUILD.gn
337 +++ b/build/config/compiler/BUILD.gn
338 @@ -261,8 +261,6 @@ config("compiler") {
339 @@ -60,7 +60,7 @@ index 85bc736..a85bd12 100644
340 # -Wunused-local-typedefs is broken in gcc,
341 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63872
342 cflags += [ "-Wno-unused-local-typedefs" ]
343 -@@ -1572,7 +1556,7 @@ config("chromium_code") {
344 +@@ -1563,7 +1547,7 @@ config("chromium_code") {
345 defines = [ "_HAS_NODISCARD" ]
346 }
347 } else {
348 @@ -69,7 +69,7 @@ index 85bc736..a85bd12 100644
349 if (treat_warnings_as_errors) {
350 cflags += [ "-Werror" ]
351
352 -@@ -1581,10 +1565,6 @@ config("chromium_code") {
353 +@@ -1572,10 +1556,6 @@ config("chromium_code") {
354 # well.
355 ldflags = [ "-Werror" ]
356 }
357 @@ -80,7 +80,7 @@ index 85bc736..a85bd12 100644
358
359 # In Chromium code, we define __STDC_foo_MACROS in order to get the
360 # C99 macros on Mac and Linux.
361 -@@ -1593,15 +1573,6 @@ config("chromium_code") {
362 +@@ -1584,15 +1564,6 @@ config("chromium_code") {
363 "__STDC_FORMAT_MACROS",
364 ]
365
366 @@ -96,7 +96,7 @@ index 85bc736..a85bd12 100644
367 if (is_mac) {
368 cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
369 cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
370 -@@ -1993,7 +1964,8 @@ config("default_stack_frames") {
371 +@@ -1984,7 +1955,8 @@ config("default_stack_frames") {
372 }
373
374 # Default "optimization on" config.
375 @@ -106,7 +106,7 @@ index 85bc736..a85bd12 100644
376 if (is_win) {
377 # Favor size over speed, /O1 must be before the common flags.
378 # /O1 implies /Os and /GF.
379 -@@ -2016,7 +1988,8 @@ config("optimize") {
380 +@@ -2005,7 +1977,8 @@ config("optimize") {
381 }
382
383 # Turn off optimizations.
384 @@ -116,7 +116,7 @@ index 85bc736..a85bd12 100644
385 if (is_win) {
386 cflags = [
387 "/Od", # Disable optimization.
388 -@@ -2050,7 +2023,8 @@ config("no_optimize") {
389 +@@ -2039,7 +2012,8 @@ config("no_optimize") {
390 # Turns up the optimization level. On Windows, this implies whole program
391 # optimization and link-time code generation which is very expensive and should
392 # be used sparingly.
393 @@ -126,7 +126,7 @@ index 85bc736..a85bd12 100644
394 if (is_nacl && is_nacl_irt) {
395 # The NaCl IRT is a special case and always wants its own config.
396 # Various components do:
397 -@@ -2089,7 +2063,8 @@ config("optimize_max") {
398 +@@ -2071,7 +2045,8 @@ config("optimize_max") {
399 #
400 # TODO(crbug.com/621335) - rework how all of these configs are related
401 # so that we don't need this disclaimer.
402 @@ -136,7 +136,7 @@ index 85bc736..a85bd12 100644
403 if (is_nacl && is_nacl_irt) {
404 # The NaCl IRT is a special case and always wants its own config.
405 # Various components do:
406 -@@ -2119,7 +2094,8 @@ config("optimize_speed") {
407 +@@ -2096,7 +2071,8 @@ config("optimize_speed") {
408 }
409 }
410
411 @@ -146,7 +146,7 @@ index 85bc736..a85bd12 100644
412 cflags = [ "-O1" ] + common_optimize_on_cflags
413 ldflags = common_optimize_on_ldflags
414 visibility = [ ":default_optimization" ]
415 -@@ -2235,7 +2211,8 @@ config("win_pdbaltpath") {
416 +@@ -2212,7 +2188,8 @@ config("win_pdbaltpath") {
417 }
418
419 # Full symbols.
420 @@ -154,9 +154,9 @@ index 85bc736..a85bd12 100644
421 +config("symbols") { }
422 +config("xsymbols") {
423 if (is_win) {
424 - if (use_goma || is_clang) {
425 - # Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
426 -@@ -2361,7 +2338,8 @@ config("symbols") {
427 + if (is_clang) {
428 + cflags = [ "/Z7" ] # Debug information in the .obj files.
429 +@@ -2318,7 +2295,8 @@ config("symbols") {
430 # Minimal symbols.
431 # This config guarantees to hold symbol for stack trace which are shown to user
432 # when crash happens in unittests running on buildbot.
433 @@ -166,7 +166,7 @@ index 85bc736..a85bd12 100644
434 if (is_win) {
435 # Functions, files, and line tables only.
436 cflags = []
437 -@@ -2416,7 +2394,8 @@ config("minimal_symbols") {
438 +@@ -2373,7 +2351,8 @@ config("minimal_symbols") {
439 }
440
441 # No symbols.