1 |
commit: 531575aa3fb1e287e9f18395b101f3884abd0ab0 |
2 |
Author: Stephan Hartmann <stha09 <AT> googlemail <DOT> com> |
3 |
AuthorDate: Mon Mar 30 11:15:02 2020 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 30 18:55:35 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=531575aa |
7 |
|
8 |
www-client/chromium: dev channel bump to 83.0.4093.3 |
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/15178 |
14 |
|
15 |
www-client/chromium/Manifest | 2 +- |
16 |
....4085.12.ebuild => chromium-83.0.4093.3.ebuild} | 4 ++ |
17 |
.../chromium/files/chromium-82-clang-std.patch | 19 ++++++- |
18 |
.../chromium/files/chromium-83-clang-std.patch | 33 +++++++++++ |
19 |
.../chromium/files/chromium-83-gcc-range.patch | 28 ++++++++++ |
20 |
.../chromium/files/chromium-83-gcc-template.patch | 65 ++++++++++++++++++++++ |
21 |
6 files changed, 148 insertions(+), 3 deletions(-) |
22 |
|
23 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
24 |
index fe862f25088..2a78bf28865 100644 |
25 |
--- a/www-client/chromium/Manifest |
26 |
+++ b/www-client/chromium/Manifest |
27 |
@@ -1,3 +1,3 @@ |
28 |
DIST chromium-80.0.3987.149.tar.xz 797049332 BLAKE2B 679efd45a48fb064e2fda9b751b112ef26f9c3419ab46d28e1490729a80b18908078bd260060656199700c391f0664e7a4d1e919ee8eb71d9c8c12b6535269f2 SHA512 5abbf8ff754937a3af566474457b5cd9bbcac0e8b1a52fd95180fcf69b12515278423887668512b3136de72ebe15048c4bd79572511f68189d1e86ace4ca30cb |
29 |
DIST chromium-81.0.4044.83.tar.xz 785906212 BLAKE2B b17bb2dabd52dc8ae5a9c99b6320ea48f278273e790c2869e2d93382bae3a8101d1bcad917b0997631831b95ce33398e0501de046edd23110107d010db70f140 SHA512 aeb8a4aeb2371a9ae2fbd0be1553569338c8e699abb3bb7d614c33254a7c6adfecb7b1becfa3f3595a2f4e04eed3c429137ad7a3816ccabf7b23388f206d1ccb |
30 |
-DIST chromium-82.0.4085.12.tar.xz 795107540 BLAKE2B 419f6e927b340679cec069c7f274d86c2d66f26f32e3d9c95501b9433888dd16dbae4104afde1f3d285730a263a5837a7ef4e9a5e30fb4876dae56db5a1d955d SHA512 d371b6a941af877d2444591f3af9f6458e6beaee99af686a92c282b6ebcd3c560113941dedf215106af57eea201890fa95dee776d5a188ee2ac5686629336410 |
31 |
+DIST chromium-83.0.4093.3.tar.xz 793608324 BLAKE2B 014eff6deacfb308eecc76a2d9a13ddf13b2eefffe044df25e2c20c3695f2c908604751ed7e794e053280fc32449381e8dfd73300201e67a9d84854f9fd851e5 SHA512 d37ae4912d3a39e4b06c91601d941ffb8a77a4b7380a603455c2839f6b8940acb8803aa32e8ae14c5033c141681ee41716a54ac2f8632240e54367a3819e091a |
32 |
|
33 |
diff --git a/www-client/chromium/chromium-82.0.4085.12.ebuild b/www-client/chromium/chromium-83.0.4093.3.ebuild |
34 |
similarity index 99% |
35 |
rename from www-client/chromium/chromium-82.0.4085.12.ebuild |
36 |
rename to www-client/chromium/chromium-83.0.4093.3.ebuild |
37 |
index 2ce3e53c208..adec560dac1 100644 |
38 |
--- a/www-client/chromium/chromium-82.0.4085.12.ebuild |
39 |
+++ b/www-client/chromium/chromium-83.0.4093.3.ebuild |
40 |
@@ -149,6 +149,9 @@ PATCHES=( |
41 |
"${FILESDIR}/chromium-82-gcc-template.patch" |
42 |
"${FILESDIR}/chromium-82-gcc-iterator.patch" |
43 |
"${FILESDIR}/chromium-82-clang-std.patch" |
44 |
+ "${FILESDIR}/chromium-83-gcc-template.patch" |
45 |
+ "${FILESDIR}/chromium-83-gcc-range.patch" |
46 |
+ "${FILESDIR}/chromium-83-clang-std.patch" |
47 |
) |
48 |
|
49 |
pre_build_checks() { |
50 |
@@ -343,6 +346,7 @@ src_prepare() { |
51 |
third_party/qcms |
52 |
third_party/rnnoise |
53 |
third_party/s2cellid |
54 |
+ third_party/schema_org |
55 |
third_party/simplejson |
56 |
third_party/skia |
57 |
third_party/skia/include/third_party/skcms |
58 |
|
59 |
diff --git a/www-client/chromium/files/chromium-82-clang-std.patch b/www-client/chromium/files/chromium-82-clang-std.patch |
60 |
index 1ad62fbf45d..b965496a29a 100644 |
61 |
--- a/www-client/chromium/files/chromium-82-clang-std.patch |
62 |
+++ b/www-client/chromium/files/chromium-82-clang-std.patch |
63 |
@@ -1,8 +1,23 @@ |
64 |
+From 25f79b67da9ca6da2089ba14ccc14333e4a108b6 Mon Sep 17 00:00:00 2001 |
65 |
+From: Stephan Hartmann <stha09@××××××××××.com> |
66 |
+Date: Mon, 30 Mar 2020 08:39:19 +0000 |
67 |
+Subject: [PATCH] libstdc++: fix namespace of nullptr_t in v8_set_return_value.h |
68 |
+ |
69 |
+nullptr_t is defined in namespace std. |
70 |
+ |
71 |
+Bug: 819294 |
72 |
+Change-Id: Ia3e8257ece1331319272ead84472eefcc7259268 |
73 |
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2126289 |
74 |
+Reviewed-by: Yuki Shiino <yukishiino@××××××××.org> |
75 |
+Commit-Queue: Yuki Shiino <yukishiino@××××××××.org> |
76 |
+Cr-Commit-Position: refs/heads/master@{#754423} |
77 |
+--- |
78 |
+ |
79 |
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 |
80 |
-index 07cae22..7871f55 100644 |
81 |
+index ed639ef..6c7ffa1 100644 |
82 |
--- a/third_party/blink/renderer/platform/bindings/v8_set_return_value.h |
83 |
+++ b/third_party/blink/renderer/platform/bindings/v8_set_return_value.h |
84 |
-@@ -51,7 +51,7 @@ void V8SetReturnValue(const CallbackInfo& info, const v8::Local<S> value) { |
85 |
+@@ -116,7 +116,7 @@ |
86 |
|
87 |
// nullptr |
88 |
template <typename CallbackInfo> |
89 |
|
90 |
diff --git a/www-client/chromium/files/chromium-83-clang-std.patch b/www-client/chromium/files/chromium-83-clang-std.patch |
91 |
new file mode 100644 |
92 |
index 00000000000..023a073d87b |
93 |
--- /dev/null |
94 |
+++ b/www-client/chromium/files/chromium-83-clang-std.patch |
95 |
@@ -0,0 +1,33 @@ |
96 |
+From 93ebdd809b725c7f13e8fc150b3186b3b6d80d43 Mon Sep 17 00:00:00 2001 |
97 |
+From: Stephan Hartmann <stha09@××××××××××.com> |
98 |
+Date: Mon, 30 Mar 2020 16:49:31 +0000 |
99 |
+Subject: [PATCH] libstdc++: fix namespace of nullptr_t in array_buffer_view_helpers.h |
100 |
+ |
101 |
+nullptr_t is defined in namespace std. |
102 |
+ |
103 |
+Bug: 819294 |
104 |
+Change-Id: I16fd876b84aff4f3c0ef6d4654b8ad5015e52d27 |
105 |
+--- |
106 |
+ |
107 |
+diff --git a/third_party/blink/renderer/core/typed_arrays/array_buffer_view_helpers.h b/third_party/blink/renderer/core/typed_arrays/array_buffer_view_helpers.h |
108 |
+index a6b8547..5fa03cb 100644 |
109 |
+--- a/third_party/blink/renderer/core/typed_arrays/array_buffer_view_helpers.h |
110 |
++++ b/third_party/blink/renderer/core/typed_arrays/array_buffer_view_helpers.h |
111 |
+@@ -36,7 +36,7 @@ |
112 |
+ template <typename U, std::enable_if_t<std::is_base_of<T, U>::value, int> = 0> |
113 |
+ NotShared(const NotShared<U>& other) : typed_array_(other.Get()) {} |
114 |
+ |
115 |
+- explicit NotShared(nullptr_t) {} |
116 |
++ explicit NotShared(std::nullptr_t) {} |
117 |
+ explicit NotShared(T* typed_array) : typed_array_(typed_array) { |
118 |
+ DCHECK(!typed_array || !typed_array->IsShared()); |
119 |
+ } |
120 |
+@@ -95,7 +95,7 @@ |
121 |
+ template <typename U, std::enable_if_t<std::is_base_of<T, U>::value, int> = 0> |
122 |
+ MaybeShared(const MaybeShared<U>& other) : typed_array_(other.Get()) {} |
123 |
+ |
124 |
+- explicit MaybeShared(nullptr_t) {} |
125 |
++ explicit MaybeShared(std::nullptr_t) {} |
126 |
+ // [AllowShared] array buffer view may be a view of non-shared array buffer, |
127 |
+ // so we don't check if the buffer is SharedArrayBuffer or not. |
128 |
+ // https://heycam.github.io/webidl/#AllowShared |
129 |
|
130 |
diff --git a/www-client/chromium/files/chromium-83-gcc-range.patch b/www-client/chromium/files/chromium-83-gcc-range.patch |
131 |
new file mode 100644 |
132 |
index 00000000000..f8fb287894f |
133 |
--- /dev/null |
134 |
+++ b/www-client/chromium/files/chromium-83-gcc-range.patch |
135 |
@@ -0,0 +1,28 @@ |
136 |
+From 895f0d24db74516e2653672a4b5e57757eeba75a Mon Sep 17 00:00:00 2001 |
137 |
+From: Stephan Hartmann <stha09@××××××××××.com> |
138 |
+Date: Sun, 29 Mar 2020 21:03:23 +0000 |
139 |
+Subject: [PATCH] GCC: fix out-of-range constant in status_codes.h |
140 |
+ |
141 |
+Constant 0x99999999 is not within range of int32_t. |
142 |
+ |
143 |
+Bug: 819294 |
144 |
+Change-Id: I133b9bb0f1f57a6e1d81f96f39f348b6ea1c7f11 |
145 |
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2126227 |
146 |
+Commit-Queue: Ted Meyer <tmathmeyer@××××××××.org> |
147 |
+Reviewed-by: Ted Meyer <tmathmeyer@××××××××.org> |
148 |
+Cr-Commit-Position: refs/heads/master@{#754364} |
149 |
+--- |
150 |
+ |
151 |
+diff --git a/media/base/status_codes.h b/media/base/status_codes.h |
152 |
+index ccac030..219defb 100644 |
153 |
+--- a/media/base/status_codes.h |
154 |
++++ b/media/base/status_codes.h |
155 |
+@@ -69,7 +69,7 @@ |
156 |
+ kVaapiFailedAcceleratorCreation = 0x00000509, |
157 |
+ |
158 |
+ // Special codes |
159 |
+- kGenericErrorPleaseRemove = 0x99999999, |
160 |
++ kGenericErrorPleaseRemove = 0x79999999, |
161 |
+ kCodeOnlyForTesting = std::numeric_limits<StatusCodeType>::max(), |
162 |
+ kMaxValue = kCodeOnlyForTesting, |
163 |
+ }; |
164 |
|
165 |
diff --git a/www-client/chromium/files/chromium-83-gcc-template.patch b/www-client/chromium/files/chromium-83-gcc-template.patch |
166 |
new file mode 100644 |
167 |
index 00000000000..0c5c20ea19d |
168 |
--- /dev/null |
169 |
+++ b/www-client/chromium/files/chromium-83-gcc-template.patch |
170 |
@@ -0,0 +1,65 @@ |
171 |
+From 7f1503a80edc5ccd73559b227a242eeb9c1bea93 Mon Sep 17 00:00:00 2001 |
172 |
+From: Stephan Hartmann <stha09@××××××××××.com> |
173 |
+Date: Mon, 30 Mar 2020 07:26:49 +0000 |
174 |
+Subject: [PATCH] GCC: fix template specialization in WTF::VectorMover |
175 |
+ |
176 |
+GCC complains that explicit specialization in non-namespace scope |
177 |
+is happening for MoveOverlappingImpl. However, secialization is |
178 |
+not really necessary here with templates and can be moved |
179 |
+into MoveOverlappingImpl method without changing generated code. |
180 |
+ |
181 |
+Bug: 819294 |
182 |
+Change-Id: I90b893b9701748302f7b900fbcc2c341685fe0d3 |
183 |
+--- |
184 |
+ |
185 |
+diff --git a/third_party/blink/renderer/platform/wtf/vector.h b/third_party/blink/renderer/platform/wtf/vector.h |
186 |
+index 632d308..82aaf96 100644 |
187 |
+--- a/third_party/blink/renderer/platform/wtf/vector.h |
188 |
++++ b/third_party/blink/renderer/platform/wtf/vector.h |
189 |
+@@ -205,30 +205,23 @@ |
190 |
+ } |
191 |
+ } |
192 |
+ |
193 |
+- template <bool = Allocator::kIsGarbageCollected> |
194 |
+- static void MoveOverlappingImpl(const T* src, const T* src_end, T* dst); |
195 |
+- template <> |
196 |
+- static void MoveOverlappingImpl<false>(const T* src, |
197 |
+- const T* src_end, |
198 |
+- T* dst) { |
199 |
+- memmove(dst, src, |
200 |
+- reinterpret_cast<const char*>(src_end) - |
201 |
+- reinterpret_cast<const char*>(src)); |
202 |
+- } |
203 |
+- template <> |
204 |
+- static void MoveOverlappingImpl<true>(const T* src, |
205 |
+- const T* src_end, |
206 |
+- T* dst) { |
207 |
+- if (src == dst) |
208 |
+- return; |
209 |
+- if (dst < src) { |
210 |
+- for (; src < src_end; ++src, ++dst) |
211 |
+- AtomicWriteMemcpy<sizeof(T)>(dst, src); |
212 |
++ static void MoveOverlappingImpl(const T* src, const T* src_end, T* dst) { |
213 |
++ if (Allocator::kIsGarbageCollected) { |
214 |
++ if (src == dst) |
215 |
++ return; |
216 |
++ if (dst < src) { |
217 |
++ for (; src < src_end; ++src, ++dst) |
218 |
++ AtomicWriteMemcpy<sizeof(T)>(dst, src); |
219 |
++ } else { |
220 |
++ --src_end; |
221 |
++ T* dst_end = dst + (src_end - src); |
222 |
++ for (; src_end >= src; --src_end, --dst_end) |
223 |
++ AtomicWriteMemcpy<sizeof(T)>(dst_end, src_end); |
224 |
++ } |
225 |
+ } else { |
226 |
+- --src_end; |
227 |
+- T* dst_end = dst + (src_end - src); |
228 |
+- for (; src_end >= src; --src_end, --dst_end) |
229 |
+- AtomicWriteMemcpy<sizeof(T)>(dst_end, src_end); |
230 |
++ memmove(dst, src, |
231 |
++ reinterpret_cast<const char*>(src_end) - |
232 |
++ reinterpret_cast<const char*>(src)); |
233 |
+ } |
234 |
+ } |
235 |
+ |