1 |
commit: a18dfb2bc7b05084f42d203433a8fbc74998f86b |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 15 20:25:18 2019 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 15 20:26:24 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18dfb2b |
7 |
|
8 |
www-client/chromium: beta channel bump (73.0.3683.27) |
9 |
|
10 |
Package-Manager: Portage-2.3.59_p2, Repoman-2.3.12_p67 |
11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
12 |
|
13 |
www-client/chromium/Manifest | 1 + |
14 |
www-client/chromium/chromium-73.0.3683.27.ebuild | 714 ++++++++++++++++++++++ |
15 |
www-client/chromium/files/chromium-73-gcc-0.patch | 108 ++++ |
16 |
www-client/chromium/files/chromium-73-gcc-1.patch | 99 +++ |
17 |
www-client/chromium/files/chromium-73-gcc-2.patch | 51 ++ |
18 |
www-client/chromium/files/chromium-73-gcc-3.patch | 69 +++ |
19 |
www-client/chromium/files/chromium-73-gcc-4.patch | 59 ++ |
20 |
www-client/chromium/files/chromium-73-gcc-5.patch | 65 ++ |
21 |
8 files changed, 1166 insertions(+) |
22 |
|
23 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
24 |
index c121766ff19..4686a5d13a5 100644 |
25 |
--- a/www-client/chromium/Manifest |
26 |
+++ b/www-client/chromium/Manifest |
27 |
@@ -1,2 +1,3 @@ |
28 |
DIST chromium-72.0.3626.96.tar.xz 686361344 BLAKE2B 92a001d99d418b0305235af9109719d9179f8bee53ad79e1ac089a1bc32b493ddcd3e26419e37b68e912f7b09deb51efefd325b82abb1fa281fe207e3a1f9a89 SHA512 949dde41053dba7408ab96d6fc56668efa46248a7a5a4690642f3de696c25fc9d5a746d82b106f4083bf4a1a5676eea06060c616375f74379a051a6bde4faea0 |
29 |
+DIST chromium-73.0.3683.27.tar.xz 710016024 BLAKE2B 1346c418fdf749b22beb598c37b4c125f8a5f07169155e05c9633d86872d7009416671d2155b4ef42713e1b22ae52c78ec295a7da7e0bd5ffcdb5f3ef79851fa SHA512 91fc8a6876b3508718dfa68ca6be9a8eb660d3447363d34da7ddf80cd9fe04ee97124f9c9dec484139155bcc7661f7cec4fe334b876b64eb06c5a8742c08b035 |
30 |
DIST chromium-webrtc-includes-r1.patch.xz 57820 BLAKE2B 8e113680254b4834abda72c335a8f0af7211c5982c91e52372945f9a57c5558bd6772300ffefb475b450c40ffe66cd627aba34d33af101fe402815c2a16fe6c8 SHA512 cd4562ec32a044925afc65d9cba62310acc515db7cab0ee3aa0f3afe11672b3e7046ca937d8739c4feca436af7d9cf0f7860716a397c8aa5d5ae647b5eaf1ac0 |
31 |
|
32 |
diff --git a/www-client/chromium/chromium-73.0.3683.27.ebuild b/www-client/chromium/chromium-73.0.3683.27.ebuild |
33 |
new file mode 100644 |
34 |
index 00000000000..551c1a943fd |
35 |
--- /dev/null |
36 |
+++ b/www-client/chromium/chromium-73.0.3683.27.ebuild |
37 |
@@ -0,0 +1,714 @@ |
38 |
+# Copyright 1999-2019 Gentoo Authors |
39 |
+# Distributed under the terms of the GNU General Public License v2 |
40 |
+ |
41 |
+EAPI=7 |
42 |
+PYTHON_COMPAT=( python2_7 ) |
43 |
+ |
44 |
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he |
45 |
+ hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr |
46 |
+ sv sw ta te th tr uk vi zh-CN zh-TW" |
47 |
+ |
48 |
+inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils |
49 |
+ |
50 |
+DESCRIPTION="Open-source version of Google Chrome web browser" |
51 |
+HOMEPAGE="http://chromium.org/" |
52 |
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" |
53 |
+ |
54 |
+LICENSE="BSD" |
55 |
+SLOT="0" |
56 |
+KEYWORDS="~amd64 ~x86" |
57 |
+IUSE="+closure-compile component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine" |
58 |
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" |
59 |
+ |
60 |
+COMMON_DEPEND=" |
61 |
+ >=app-accessibility/at-spi2-atk-2.26:2 |
62 |
+ app-arch/bzip2:= |
63 |
+ cups? ( >=net-print/cups-1.3.11:= ) |
64 |
+ >=dev-libs/atk-2.26 |
65 |
+ dev-libs/expat:= |
66 |
+ dev-libs/glib:2 |
67 |
+ system-icu? ( >=dev-libs/icu-59:= ) |
68 |
+ >=dev-libs/libxml2-2.9.4-r3:=[icu] |
69 |
+ dev-libs/libxslt:= |
70 |
+ dev-libs/nspr:= |
71 |
+ >=dev-libs/nss-3.26:= |
72 |
+ >=dev-libs/re2-0.2016.11.01:= |
73 |
+ gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) |
74 |
+ >=media-libs/alsa-lib-1.0.19:= |
75 |
+ media-libs/fontconfig:= |
76 |
+ media-libs/freetype:= |
77 |
+ >=media-libs/harfbuzz-2.0.0:0=[icu(-)] |
78 |
+ media-libs/libjpeg-turbo:= |
79 |
+ media-libs/libpng:= |
80 |
+ system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) |
81 |
+ >=media-libs/openh264-1.6.0:= |
82 |
+ pulseaudio? ( media-sound/pulseaudio:= ) |
83 |
+ system-ffmpeg? ( |
84 |
+ >=media-video/ffmpeg-4:= |
85 |
+ || ( |
86 |
+ media-video/ffmpeg[-samba] |
87 |
+ >=net-fs/samba-4.5.10-r1[-debug(-)] |
88 |
+ ) |
89 |
+ !=net-fs/samba-4.5.12-r0 |
90 |
+ media-libs/opus:= |
91 |
+ ) |
92 |
+ sys-apps/dbus:= |
93 |
+ sys-apps/pciutils:= |
94 |
+ virtual/udev |
95 |
+ x11-libs/cairo:= |
96 |
+ x11-libs/gdk-pixbuf:2 |
97 |
+ x11-libs/gtk+:3[X] |
98 |
+ x11-libs/libX11:= |
99 |
+ x11-libs/libXcomposite:= |
100 |
+ x11-libs/libXcursor:= |
101 |
+ x11-libs/libXdamage:= |
102 |
+ x11-libs/libXext:= |
103 |
+ x11-libs/libXfixes:= |
104 |
+ >=x11-libs/libXi-1.6.0:= |
105 |
+ x11-libs/libXrandr:= |
106 |
+ x11-libs/libXrender:= |
107 |
+ x11-libs/libXScrnSaver:= |
108 |
+ x11-libs/libXtst:= |
109 |
+ x11-libs/pango:= |
110 |
+ app-arch/snappy:= |
111 |
+ media-libs/flac:= |
112 |
+ >=media-libs/libwebp-0.4.0:= |
113 |
+ sys-libs/zlib:=[minizip] |
114 |
+ kerberos? ( virtual/krb5 ) |
115 |
+" |
116 |
+# For nvidia-drivers blocker, see bug #413637 . |
117 |
+RDEPEND="${COMMON_DEPEND} |
118 |
+ !<www-plugins/chrome-binary-plugins-57 |
119 |
+ x11-misc/xdg-utils |
120 |
+ virtual/opengl |
121 |
+ virtual/ttf-fonts |
122 |
+ selinux? ( sec-policy/selinux-chromium ) |
123 |
+ tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) |
124 |
+ widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] ) |
125 |
+" |
126 |
+# dev-vcs/git - https://bugs.gentoo.org/593476 |
127 |
+# sys-apps/sandbox - https://crbug.com/586444 |
128 |
+DEPEND="${COMMON_DEPEND} |
129 |
+" |
130 |
+BDEPEND=" |
131 |
+ >=app-arch/gzip-1.7 |
132 |
+ !arm? ( |
133 |
+ dev-lang/yasm |
134 |
+ ) |
135 |
+ dev-lang/perl |
136 |
+ dev-util/gn |
137 |
+ dev-vcs/git |
138 |
+ >=dev-util/gperf-3.0.3 |
139 |
+ >=dev-util/ninja-1.7.2 |
140 |
+ >=net-libs/nodejs-7.6.0[inspector] |
141 |
+ sys-apps/hwids[usb(+)] |
142 |
+ >=sys-devel/bison-2.4.3 |
143 |
+ sys-devel/flex |
144 |
+ closure-compile? ( virtual/jre ) |
145 |
+ virtual/pkgconfig |
146 |
+" |
147 |
+ |
148 |
+: ${CHROMIUM_FORCE_CLANG=no} |
149 |
+ |
150 |
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then |
151 |
+ BDEPEND+=" >=sys-devel/clang-5" |
152 |
+fi |
153 |
+ |
154 |
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then |
155 |
+ EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; |
156 |
+fi |
157 |
+ |
158 |
+DISABLE_AUTOFORMATTING="yes" |
159 |
+DOC_CONTENTS=" |
160 |
+Some web pages may require additional fonts to display properly. |
161 |
+Try installing some of the following packages if some characters |
162 |
+are not displayed properly: |
163 |
+- media-fonts/arphicfonts |
164 |
+- media-fonts/droid |
165 |
+- media-fonts/ipamonafont |
166 |
+- media-fonts/noto |
167 |
+- media-fonts/ja-ipafonts |
168 |
+- media-fonts/takao-fonts |
169 |
+- media-fonts/wqy-microhei |
170 |
+- media-fonts/wqy-zenhei |
171 |
+ |
172 |
+To fix broken icons on the Downloads page, you should install an icon |
173 |
+theme that covers the appropriate MIME types, and configure this as your |
174 |
+GTK+ icon theme. |
175 |
+" |
176 |
+ |
177 |
+PATCHES=( |
178 |
+ "${FILESDIR}/chromium-compiler-r7.patch" |
179 |
+ "${FILESDIR}/chromium-widevine-r4.patch" |
180 |
+ "${FILESDIR}/chromium-73-gcc-0.patch" |
181 |
+ "${FILESDIR}/chromium-73-gcc-1.patch" |
182 |
+ "${FILESDIR}/chromium-73-gcc-2.patch" |
183 |
+ "${FILESDIR}/chromium-73-gcc-3.patch" |
184 |
+ "${FILESDIR}/chromium-73-gcc-4.patch" |
185 |
+ "${FILESDIR}/chromium-73-gcc-5.patch" |
186 |
+) |
187 |
+ |
188 |
+pre_build_checks() { |
189 |
+ #if [[ ${MERGE_TYPE} != binary ]]; then |
190 |
+ # local -x CPP="$(tc-getCXX) -E" |
191 |
+ # if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then |
192 |
+ # # bugs: #601654 |
193 |
+ # die "At least clang 3.9.1 is required" |
194 |
+ # fi |
195 |
+ # if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then |
196 |
+ # # bugs: #535730, #525374, #518668, #600288, #627356 |
197 |
+ # die "At least gcc 5.0 is required" |
198 |
+ # fi |
199 |
+ #fi |
200 |
+ |
201 |
+ # Check build requirements, bug #541816 and bug #471810 . |
202 |
+ CHECKREQS_MEMORY="3G" |
203 |
+ CHECKREQS_DISK_BUILD="5G" |
204 |
+ if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then |
205 |
+ CHECKREQS_DISK_BUILD="25G" |
206 |
+ if ! use component-build; then |
207 |
+ CHECKREQS_MEMORY="16G" |
208 |
+ fi |
209 |
+ fi |
210 |
+ check-reqs_pkg_setup |
211 |
+} |
212 |
+ |
213 |
+pkg_pretend() { |
214 |
+ pre_build_checks |
215 |
+} |
216 |
+ |
217 |
+pkg_setup() { |
218 |
+ pre_build_checks |
219 |
+ |
220 |
+ chromium_suid_sandbox_check_kernel_config |
221 |
+} |
222 |
+ |
223 |
+src_prepare() { |
224 |
+ # Calling this here supports resumption via FEATURES=keepwork |
225 |
+ python_setup |
226 |
+ |
227 |
+ default |
228 |
+ |
229 |
+ mkdir -p third_party/node/linux/node-linux-x64/bin || die |
230 |
+ ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die |
231 |
+ |
232 |
+ local keeplibs=( |
233 |
+ base/third_party/dmg_fp |
234 |
+ base/third_party/dynamic_annotations |
235 |
+ base/third_party/icu |
236 |
+ base/third_party/nspr |
237 |
+ base/third_party/superfasthash |
238 |
+ base/third_party/symbolize |
239 |
+ base/third_party/valgrind |
240 |
+ base/third_party/xdg_mime |
241 |
+ base/third_party/xdg_user_dirs |
242 |
+ buildtools/third_party/libc++ |
243 |
+ buildtools/third_party/libc++abi |
244 |
+ chrome/third_party/mozilla_security_manager |
245 |
+ courgette/third_party |
246 |
+ net/third_party/mozilla_security_manager |
247 |
+ net/third_party/nss |
248 |
+ net/third_party/quic |
249 |
+ net/third_party/uri_template |
250 |
+ third_party/abseil-cpp |
251 |
+ third_party/angle |
252 |
+ third_party/angle/src/common/third_party/base |
253 |
+ third_party/angle/src/common/third_party/smhasher |
254 |
+ third_party/angle/src/common/third_party/xxhash |
255 |
+ third_party/angle/src/third_party/compiler |
256 |
+ third_party/angle/src/third_party/libXNVCtrl |
257 |
+ third_party/angle/src/third_party/trace_event |
258 |
+ third_party/angle/third_party/glslang |
259 |
+ third_party/angle/third_party/spirv-headers |
260 |
+ third_party/angle/third_party/spirv-tools |
261 |
+ third_party/angle/third_party/vulkan-headers |
262 |
+ third_party/angle/third_party/vulkan-loader |
263 |
+ third_party/angle/third_party/vulkan-tools |
264 |
+ third_party/angle/third_party/vulkan-validation-layers |
265 |
+ third_party/apple_apsl |
266 |
+ third_party/blink |
267 |
+ third_party/boringssl |
268 |
+ third_party/boringssl/src/third_party/fiat |
269 |
+ third_party/breakpad |
270 |
+ third_party/breakpad/breakpad/src/third_party/curl |
271 |
+ third_party/brotli |
272 |
+ third_party/cacheinvalidation |
273 |
+ third_party/catapult |
274 |
+ third_party/catapult/common/py_vulcanize/third_party/rcssmin |
275 |
+ third_party/catapult/common/py_vulcanize/third_party/rjsmin |
276 |
+ third_party/catapult/third_party/beautifulsoup4 |
277 |
+ third_party/catapult/third_party/html5lib-python |
278 |
+ third_party/catapult/third_party/polymer |
279 |
+ third_party/catapult/third_party/six |
280 |
+ third_party/catapult/tracing/third_party/d3 |
281 |
+ third_party/catapult/tracing/third_party/gl-matrix |
282 |
+ third_party/catapult/tracing/third_party/jszip |
283 |
+ third_party/catapult/tracing/third_party/mannwhitneyu |
284 |
+ third_party/catapult/tracing/third_party/oboe |
285 |
+ third_party/catapult/tracing/third_party/pako |
286 |
+ third_party/ced |
287 |
+ third_party/cld_3 |
288 |
+ third_party/closure_compiler |
289 |
+ third_party/crashpad |
290 |
+ third_party/crashpad/crashpad/third_party/zlib |
291 |
+ third_party/crc32c |
292 |
+ third_party/cros_system_api |
293 |
+ third_party/devscripts |
294 |
+ third_party/dom_distiller_js |
295 |
+ third_party/fips181 |
296 |
+ third_party/flatbuffers |
297 |
+ third_party/flot |
298 |
+ third_party/freetype |
299 |
+ third_party/google_input_tools |
300 |
+ third_party/google_input_tools/third_party/closure_library |
301 |
+ third_party/google_input_tools/third_party/closure_library/third_party/closure |
302 |
+ third_party/googletest |
303 |
+ third_party/hunspell |
304 |
+ third_party/iccjpeg |
305 |
+ third_party/inspector_protocol |
306 |
+ third_party/jinja2 |
307 |
+ third_party/jsoncpp |
308 |
+ third_party/jstemplate |
309 |
+ third_party/khronos |
310 |
+ third_party/leveldatabase |
311 |
+ third_party/libXNVCtrl |
312 |
+ third_party/libaddressinput |
313 |
+ third_party/libaom |
314 |
+ third_party/libaom/source/libaom/third_party/vector |
315 |
+ third_party/libaom/source/libaom/third_party/x86inc |
316 |
+ third_party/libjingle |
317 |
+ third_party/libphonenumber |
318 |
+ third_party/libsecret |
319 |
+ third_party/libsrtp |
320 |
+ third_party/libsync |
321 |
+ third_party/libudev |
322 |
+ third_party/libwebm |
323 |
+ third_party/libxml/chromium |
324 |
+ third_party/libyuv |
325 |
+ third_party/llvm |
326 |
+ third_party/lss |
327 |
+ third_party/lzma_sdk |
328 |
+ third_party/markupsafe |
329 |
+ third_party/mesa |
330 |
+ third_party/metrics_proto |
331 |
+ third_party/modp_b64 |
332 |
+ third_party/nasm |
333 |
+ third_party/node |
334 |
+ third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2 |
335 |
+ third_party/openmax_dl |
336 |
+ third_party/ots |
337 |
+ third_party/pdfium |
338 |
+ third_party/pdfium/third_party/agg23 |
339 |
+ third_party/pdfium/third_party/base |
340 |
+ third_party/pdfium/third_party/bigint |
341 |
+ third_party/pdfium/third_party/freetype |
342 |
+ third_party/pdfium/third_party/lcms |
343 |
+ third_party/pdfium/third_party/libopenjpeg20 |
344 |
+ third_party/pdfium/third_party/libpng16 |
345 |
+ third_party/pdfium/third_party/libtiff |
346 |
+ third_party/pdfium/third_party/skia_shared |
347 |
+ third_party/perfetto |
348 |
+ third_party/ply |
349 |
+ third_party/polymer |
350 |
+ third_party/protobuf |
351 |
+ third_party/protobuf/third_party/six |
352 |
+ third_party/pyjson5 |
353 |
+ third_party/qcms |
354 |
+ third_party/rnnoise |
355 |
+ third_party/s2cellid |
356 |
+ third_party/sfntly |
357 |
+ third_party/simplejson |
358 |
+ third_party/skia |
359 |
+ third_party/skia/include/third_party/vulkan |
360 |
+ third_party/skia/third_party/gif |
361 |
+ third_party/skia/third_party/skcms |
362 |
+ third_party/skia/third_party/vulkan |
363 |
+ third_party/smhasher |
364 |
+ third_party/spirv-headers |
365 |
+ third_party/SPIRV-Tools |
366 |
+ third_party/sqlite |
367 |
+ third_party/swiftshader |
368 |
+ third_party/swiftshader/third_party/llvm-subzero |
369 |
+ third_party/swiftshader/third_party/subzero |
370 |
+ third_party/unrar |
371 |
+ third_party/usrsctp |
372 |
+ third_party/vulkan |
373 |
+ third_party/web-animations-js |
374 |
+ third_party/webdriver |
375 |
+ third_party/webrtc |
376 |
+ third_party/webrtc/common_audio/third_party/fft4g |
377 |
+ third_party/webrtc/common_audio/third_party/spl_sqrt_floor |
378 |
+ third_party/webrtc/modules/third_party/fft |
379 |
+ third_party/webrtc/modules/third_party/g711 |
380 |
+ third_party/webrtc/modules/third_party/g722 |
381 |
+ third_party/webrtc/rtc_base/third_party/base64 |
382 |
+ third_party/webrtc/rtc_base/third_party/sigslot |
383 |
+ third_party/widevine |
384 |
+ third_party/woff2 |
385 |
+ third_party/zlib/google |
386 |
+ url/third_party/mozilla |
387 |
+ v8/src/third_party/siphash |
388 |
+ v8/src/third_party/valgrind |
389 |
+ v8/src/third_party/utf8-decoder |
390 |
+ v8/third_party/inspector_protocol |
391 |
+ v8/third_party/v8 |
392 |
+ |
393 |
+ # gyp -> gn leftovers |
394 |
+ base/third_party/libevent |
395 |
+ third_party/adobe |
396 |
+ third_party/speech-dispatcher |
397 |
+ third_party/usb_ids |
398 |
+ third_party/xdg-utils |
399 |
+ third_party/yasm/run_yasm.py |
400 |
+ ) |
401 |
+ if ! use system-ffmpeg; then |
402 |
+ keeplibs+=( third_party/ffmpeg third_party/opus ) |
403 |
+ fi |
404 |
+ if ! use system-icu; then |
405 |
+ keeplibs+=( third_party/icu ) |
406 |
+ fi |
407 |
+ if ! use system-libvpx; then |
408 |
+ keeplibs+=( third_party/libvpx ) |
409 |
+ keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc ) |
410 |
+ fi |
411 |
+ if use tcmalloc; then |
412 |
+ keeplibs+=( third_party/tcmalloc ) |
413 |
+ fi |
414 |
+ |
415 |
+ # Remove most bundled libraries. Some are still needed. |
416 |
+ build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die |
417 |
+} |
418 |
+ |
419 |
+src_configure() { |
420 |
+ # Calling this here supports resumption via FEATURES=keepwork |
421 |
+ python_setup |
422 |
+ |
423 |
+ local myconf_gn="" |
424 |
+ |
425 |
+ # Make sure the build system will use the right tools, bug #340795. |
426 |
+ tc-export AR CC CXX NM |
427 |
+ |
428 |
+ if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then |
429 |
+ # Force clang since gcc is pretty broken at the moment. |
430 |
+ CC=${CHOST}-clang |
431 |
+ CXX=${CHOST}-clang++ |
432 |
+ strip-unsupported-flags |
433 |
+ fi |
434 |
+ |
435 |
+ if tc-is-clang; then |
436 |
+ myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" |
437 |
+ else |
438 |
+ myconf_gn+=" is_clang=false" |
439 |
+ fi |
440 |
+ |
441 |
+ # Define a custom toolchain for GN |
442 |
+ myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" |
443 |
+ |
444 |
+ if tc-is-cross-compiler; then |
445 |
+ tc-export BUILD_{AR,CC,CXX,NM} |
446 |
+ myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\"" |
447 |
+ myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\"" |
448 |
+ else |
449 |
+ myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" |
450 |
+ fi |
451 |
+ |
452 |
+ # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. |
453 |
+ myconf_gn+=" is_debug=false" |
454 |
+ |
455 |
+ # Component build isn't generally intended for use by end users. It's mostly useful |
456 |
+ # for development and debugging. |
457 |
+ myconf_gn+=" is_component_build=$(usex component-build true false)" |
458 |
+ |
459 |
+ # https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md |
460 |
+ myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)" |
461 |
+ |
462 |
+ myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")" |
463 |
+ |
464 |
+ # Disable nacl, we can't build without pnacl (http://crbug.com/269560). |
465 |
+ myconf_gn+=" enable_nacl=false" |
466 |
+ |
467 |
+ # Use system-provided libraries. |
468 |
+ # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733). |
469 |
+ # TODO: use_system_hunspell (upstream changes needed). |
470 |
+ # TODO: use_system_libsrtp (bug #459932). |
471 |
+ # TODO: use_system_protobuf (bug #525560). |
472 |
+ # TODO: use_system_ssl (http://crbug.com/58087). |
473 |
+ # TODO: use_system_sqlite (http://crbug.com/22208). |
474 |
+ |
475 |
+ # libevent: https://bugs.gentoo.org/593458 |
476 |
+ local gn_system_libraries=( |
477 |
+ flac |
478 |
+ fontconfig |
479 |
+ freetype |
480 |
+ # Need harfbuzz_from_pkgconfig target |
481 |
+ #harfbuzz-ng |
482 |
+ libdrm |
483 |
+ libjpeg |
484 |
+ libpng |
485 |
+ libwebp |
486 |
+ libxml |
487 |
+ libxslt |
488 |
+ openh264 |
489 |
+ re2 |
490 |
+ snappy |
491 |
+ yasm |
492 |
+ zlib |
493 |
+ ) |
494 |
+ if use system-ffmpeg; then |
495 |
+ gn_system_libraries+=( ffmpeg opus ) |
496 |
+ fi |
497 |
+ if use system-icu; then |
498 |
+ gn_system_libraries+=( icu ) |
499 |
+ fi |
500 |
+ if use system-libvpx; then |
501 |
+ gn_system_libraries+=( libvpx ) |
502 |
+ fi |
503 |
+ build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die |
504 |
+ |
505 |
+ # See dependency logic in third_party/BUILD.gn |
506 |
+ myconf_gn+=" use_system_harfbuzz=true" |
507 |
+ |
508 |
+ # Optional dependencies. |
509 |
+ myconf_gn+=" closure_compile=$(usex closure-compile true false)" |
510 |
+ myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)" |
511 |
+ myconf_gn+=" enable_widevine=$(usex widevine true false)" |
512 |
+ myconf_gn+=" use_cups=$(usex cups true false)" |
513 |
+ myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)" |
514 |
+ myconf_gn+=" use_kerberos=$(usex kerberos true false)" |
515 |
+ myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)" |
516 |
+ |
517 |
+ # TODO: link_pulseaudio=true for GN. |
518 |
+ |
519 |
+ myconf_gn+=" fieldtrial_testing_like_official_build=true" |
520 |
+ |
521 |
+ # Never use bundled gold binary. Disable gold linker flags for now. |
522 |
+ # Do not use bundled clang. |
523 |
+ # Trying to use gold results in linker crash. |
524 |
+ myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false" |
525 |
+ |
526 |
+ # Disable forced lld, bug 641556 |
527 |
+ myconf_gn+=" use_lld=false" |
528 |
+ |
529 |
+ ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" |
530 |
+ myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)" |
531 |
+ myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\"" |
532 |
+ |
533 |
+ # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . |
534 |
+ # Note: these are for Gentoo use ONLY. For your own distribution, |
535 |
+ # please get your own set of keys. Feel free to contact chromium@g.o |
536 |
+ # for more info. |
537 |
+ local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc" |
538 |
+ local google_default_client_id="329227923882.apps.googleusercontent.com" |
539 |
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" |
540 |
+ myconf_gn+=" google_api_key=\"${google_api_key}\"" |
541 |
+ myconf_gn+=" google_default_client_id=\"${google_default_client_id}\"" |
542 |
+ myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\"" |
543 |
+ |
544 |
+ local myarch="$(tc-arch)" |
545 |
+ |
546 |
+ # Avoid CFLAGS problems, bug #352457, bug #390147. |
547 |
+ if ! use custom-cflags; then |
548 |
+ replace-flags "-Os" "-O2" |
549 |
+ strip-flags |
550 |
+ |
551 |
+ # Prevent linker from running out of address space, bug #471810 . |
552 |
+ if use x86; then |
553 |
+ filter-flags "-g*" |
554 |
+ fi |
555 |
+ |
556 |
+ # Prevent libvpx build failures. Bug 530248, 544702, 546984. |
557 |
+ if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then |
558 |
+ filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 |
559 |
+ fi |
560 |
+ fi |
561 |
+ |
562 |
+ if [[ $myarch = amd64 ]] ; then |
563 |
+ myconf_gn+=" target_cpu=\"x64\"" |
564 |
+ ffmpeg_target_arch=x64 |
565 |
+ elif [[ $myarch = x86 ]] ; then |
566 |
+ myconf_gn+=" target_cpu=\"x86\"" |
567 |
+ ffmpeg_target_arch=ia32 |
568 |
+ |
569 |
+ # This is normally defined by compiler_cpu_abi in |
570 |
+ # build/config/compiler/BUILD.gn, but we patch that part out. |
571 |
+ append-flags -msse2 -mfpmath=sse -mmmx |
572 |
+ elif [[ $myarch = arm64 ]] ; then |
573 |
+ myconf_gn+=" target_cpu=\"arm64\"" |
574 |
+ ffmpeg_target_arch=arm64 |
575 |
+ elif [[ $myarch = arm ]] ; then |
576 |
+ myconf_gn+=" target_cpu=\"arm\"" |
577 |
+ ffmpeg_target_arch=$(usex neon arm-neon arm) |
578 |
+ else |
579 |
+ die "Failed to determine target arch, got '$myarch'." |
580 |
+ fi |
581 |
+ |
582 |
+ # Make sure that -Werror doesn't get added to CFLAGS by the build system. |
583 |
+ # Depending on GCC version the warnings are different and we don't want |
584 |
+ # the build to fail because of that. |
585 |
+ myconf_gn+=" treat_warnings_as_errors=false" |
586 |
+ |
587 |
+ # Disable fatal linker warnings, bug 506268. |
588 |
+ myconf_gn+=" fatal_linker_warnings=false" |
589 |
+ |
590 |
+ # https://bugs.gentoo.org/588596 |
591 |
+ #append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) |
592 |
+ |
593 |
+ # Bug 491582. |
594 |
+ export TMPDIR="${WORKDIR}/temp" |
595 |
+ mkdir -p -m 755 "${TMPDIR}" || die |
596 |
+ |
597 |
+ # https://bugs.gentoo.org/654216 |
598 |
+ addpredict /dev/dri/ #nowarn |
599 |
+ |
600 |
+ #if ! use system-ffmpeg; then |
601 |
+ if false; then |
602 |
+ local build_ffmpeg_args="" |
603 |
+ if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then |
604 |
+ build_ffmpeg_args+=" --disable-asm" |
605 |
+ fi |
606 |
+ |
607 |
+ # Re-configure bundled ffmpeg. See bug #491378 for example reasons. |
608 |
+ einfo "Configuring bundled ffmpeg..." |
609 |
+ pushd third_party/ffmpeg > /dev/null || die |
610 |
+ chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ |
611 |
+ --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die |
612 |
+ chromium/scripts/copy_config.sh || die |
613 |
+ chromium/scripts/generate_gn.py || die |
614 |
+ popd > /dev/null || die |
615 |
+ fi |
616 |
+ |
617 |
+ einfo "Configuring Chromium..." |
618 |
+ set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release |
619 |
+ echo "$@" |
620 |
+ "$@" || die |
621 |
+} |
622 |
+ |
623 |
+src_compile() { |
624 |
+ # Final link uses lots of file descriptors. |
625 |
+ ulimit -n 2048 |
626 |
+ |
627 |
+ # Calling this here supports resumption via FEATURES=keepwork |
628 |
+ python_setup |
629 |
+ |
630 |
+ #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die |
631 |
+ |
632 |
+ # Work around broken deps |
633 |
+ eninja -C out/Release gen/ui/accessibility/ax_enums.mojom{,-shared}.h |
634 |
+ |
635 |
+ # Build mksnapshot and pax-mark it. |
636 |
+ local x |
637 |
+ for x in mksnapshot v8_context_snapshot_generator; do |
638 |
+ if tc-is-cross-compiler; then |
639 |
+ eninja -C out/Release "host/${x}" |
640 |
+ pax-mark m "out/Release/host/${x}" |
641 |
+ else |
642 |
+ eninja -C out/Release "${x}" |
643 |
+ pax-mark m "out/Release/${x}" |
644 |
+ fi |
645 |
+ done |
646 |
+ |
647 |
+ # Even though ninja autodetects number of CPUs, we respect |
648 |
+ # user's options, for debugging with -j 1 or any other reason. |
649 |
+ eninja -C out/Release chrome chromedriver |
650 |
+ use suid && eninja -C out/Release chrome_sandbox |
651 |
+ |
652 |
+ pax-mark m out/Release/chrome |
653 |
+} |
654 |
+ |
655 |
+src_install() { |
656 |
+ local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" |
657 |
+ exeinto "${CHROMIUM_HOME}" |
658 |
+ doexe out/Release/chrome |
659 |
+ |
660 |
+ if use suid; then |
661 |
+ newexe out/Release/chrome_sandbox chrome-sandbox |
662 |
+ fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" |
663 |
+ fi |
664 |
+ |
665 |
+ doexe out/Release/chromedriver |
666 |
+ |
667 |
+ local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) |
668 |
+ sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die |
669 |
+ doexe chromium-launcher.sh |
670 |
+ |
671 |
+ # It is important that we name the target "chromium-browser", |
672 |
+ # xdg-utils expect it; bug #355517. |
673 |
+ dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser |
674 |
+ # keep the old symlink around for consistency |
675 |
+ dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium |
676 |
+ |
677 |
+ dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver |
678 |
+ |
679 |
+ # Allow users to override command-line options, bug #357629. |
680 |
+ insinto /etc/chromium |
681 |
+ newins "${FILESDIR}/chromium.default" "default" |
682 |
+ |
683 |
+ pushd out/Release/locales > /dev/null || die |
684 |
+ chromium_remove_language_paks |
685 |
+ popd |
686 |
+ |
687 |
+ insinto "${CHROMIUM_HOME}" |
688 |
+ doins out/Release/*.bin |
689 |
+ doins out/Release/*.pak |
690 |
+ doins out/Release/*.so |
691 |
+ |
692 |
+ if ! use system-icu; then |
693 |
+ doins out/Release/icudtl.dat |
694 |
+ fi |
695 |
+ |
696 |
+ doins -r out/Release/locales |
697 |
+ doins -r out/Release/resources |
698 |
+ |
699 |
+ if [[ -d out/Release/swiftshader ]]; then |
700 |
+ insinto "${CHROMIUM_HOME}/swiftshader" |
701 |
+ doins out/Release/swiftshader/*.so |
702 |
+ fi |
703 |
+ |
704 |
+ # Install icons and desktop entry. |
705 |
+ local branding size |
706 |
+ for size in 16 22 24 32 48 64 128 256 ; do |
707 |
+ case ${size} in |
708 |
+ 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; |
709 |
+ *) branding="chrome/app/theme/chromium" ;; |
710 |
+ esac |
711 |
+ newicon -s ${size} "${branding}/product_logo_${size}.png" \ |
712 |
+ chromium-browser.png |
713 |
+ done |
714 |
+ |
715 |
+ local mime_types="text/html;text/xml;application/xhtml+xml;" |
716 |
+ mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 |
717 |
+ mime_types+="x-scheme-handler/ftp;" # bug #412185 |
718 |
+ mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 |
719 |
+ make_desktop_entry \ |
720 |
+ chromium-browser \ |
721 |
+ "Chromium" \ |
722 |
+ chromium-browser \ |
723 |
+ "Network;WebBrowser" \ |
724 |
+ "MimeType=${mime_types}\nStartupWMClass=chromium-browser" |
725 |
+ sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die |
726 |
+ |
727 |
+ # Install GNOME default application entry (bug #303100). |
728 |
+ insinto /usr/share/gnome-control-center/default-apps |
729 |
+ newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml |
730 |
+ |
731 |
+ readme.gentoo_create_doc |
732 |
+} |
733 |
+ |
734 |
+pkg_postrm() { |
735 |
+ if type gtk-update-icon-cache &>/dev/null; then |
736 |
+ ebegin "Updating GTK icon cache" |
737 |
+ gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor" |
738 |
+ eend $? |
739 |
+ fi |
740 |
+ xdg_desktop_database_update |
741 |
+} |
742 |
+ |
743 |
+pkg_postinst() { |
744 |
+ if type gtk-update-icon-cache &>/dev/null; then |
745 |
+ ebegin "Updating GTK icon cache" |
746 |
+ gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor" |
747 |
+ eend $? |
748 |
+ fi |
749 |
+ xdg_desktop_database_update |
750 |
+ readme.gentoo_print_elog |
751 |
+} |
752 |
|
753 |
diff --git a/www-client/chromium/files/chromium-73-gcc-0.patch b/www-client/chromium/files/chromium-73-gcc-0.patch |
754 |
new file mode 100644 |
755 |
index 00000000000..5a50700fd93 |
756 |
--- /dev/null |
757 |
+++ b/www-client/chromium/files/chromium-73-gcc-0.patch |
758 |
@@ -0,0 +1,108 @@ |
759 |
+From 2c3b57cafbbb38c13a519c9d2fda8b65691d9564 Mon Sep 17 00:00:00 2001 |
760 |
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
761 |
+Date: Thu, 7 Feb 2019 22:55:37 +0000 |
762 |
+Subject: [PATCH] allocator shim: Swap ALIGN_LINKAGE and SHIM_ALWAYS_EXPORT's |
763 |
+ positions |
764 |
+MIME-Version: 1.0 |
765 |
+Content-Type: text/plain; charset=UTF-8 |
766 |
+Content-Transfer-Encoding: 8bit |
767 |
+ |
768 |
+This fixes the GCC build. GCC seems to be stricter with the position of the |
769 |
+linkage specification, so just swap the terms to prevent an error that looks |
770 |
+like: |
771 |
+ |
772 |
+In file included from ../../base/allocator/allocator_shim.cc:333: |
773 |
+../../base/allocator/allocator_shim_override_cpp_symbols.h:39:30: error: expected unqualified-id before string constant |
774 |
+ #define ALIGN_LINKAGE extern "C" |
775 |
+ ^~~ |
776 |
+../../base/allocator/allocator_shim_override_cpp_symbols.h:99:20: note: in expansion of macro ‘ALIGN_LINKAGE’ |
777 |
+ SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW(std::size_t size, |
778 |
+ ^~~~~~~~~~~~~ |
779 |
+ |
780 |
+Bug: 819294 |
781 |
+Change-Id: I0aa16ea88cead42e83796a1c86afad8b447ddc50 |
782 |
+Reviewed-on: https://chromium-review.googlesource.com/c/1458256 |
783 |
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
784 |
+Reviewed-by: Thomas Anderson <thomasanderson@××××××××.org> |
785 |
+Reviewed-by: Primiano Tucci <primiano@××××××××.org> |
786 |
+Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
787 |
+Cr-Commit-Position: refs/heads/master@{#630084} |
788 |
+--- |
789 |
+ .../allocator_shim_override_cpp_symbols.h | 20 +++++++++---------- |
790 |
+ 1 file changed, 10 insertions(+), 10 deletions(-) |
791 |
+ |
792 |
+diff --git a/base/allocator/allocator_shim_override_cpp_symbols.h b/base/allocator/allocator_shim_override_cpp_symbols.h |
793 |
+index 1228f5e33d28..01d25b7f6437 100644 |
794 |
+--- a/base/allocator/allocator_shim_override_cpp_symbols.h |
795 |
++++ b/base/allocator/allocator_shim_override_cpp_symbols.h |
796 |
+@@ -96,57 +96,57 @@ SHIM_ALWAYS_EXPORT void operator delete[](void* p, size_t) __THROW { |
797 |
+ ShimCppDelete(p); |
798 |
+ } |
799 |
+ |
800 |
+-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW(std::size_t size, |
801 |
++ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void* ALIGN_NEW(std::size_t size, |
802 |
+ ALIGN_VAL_T alignment) { |
803 |
+ return ShimCppAlignedNew(size, static_cast<size_t>(alignment)); |
804 |
+ } |
805 |
+ |
806 |
+-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW_NOTHROW( |
807 |
++ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void* ALIGN_NEW_NOTHROW( |
808 |
+ std::size_t size, |
809 |
+ ALIGN_VAL_T alignment, |
810 |
+ const std::nothrow_t&) __THROW { |
811 |
+ return ShimCppAlignedNew(size, static_cast<size_t>(alignment)); |
812 |
+ } |
813 |
+ |
814 |
+-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void ALIGN_DEL(void* p, ALIGN_VAL_T) __THROW { |
815 |
++ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void ALIGN_DEL(void* p, ALIGN_VAL_T) __THROW { |
816 |
+ ShimCppDelete(p); |
817 |
+ } |
818 |
+ |
819 |
+-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void ALIGN_DEL_SIZED(void* p, |
820 |
++ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void ALIGN_DEL_SIZED(void* p, |
821 |
+ std::size_t size, |
822 |
+ ALIGN_VAL_T) __THROW { |
823 |
+ ShimCppDelete(p); |
824 |
+ } |
825 |
+ |
826 |
+-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void |
827 |
++ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void |
828 |
+ ALIGN_DEL_NOTHROW(void* p, ALIGN_VAL_T, const std::nothrow_t&) __THROW { |
829 |
+ ShimCppDelete(p); |
830 |
+ } |
831 |
+ |
832 |
+-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW_ARR(std::size_t size, |
833 |
++ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void* ALIGN_NEW_ARR(std::size_t size, |
834 |
+ ALIGN_VAL_T alignment) { |
835 |
+ return ShimCppAlignedNew(size, static_cast<size_t>(alignment)); |
836 |
+ } |
837 |
+ |
838 |
+-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW_ARR_NOTHROW( |
839 |
++ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void* ALIGN_NEW_ARR_NOTHROW( |
840 |
+ std::size_t size, |
841 |
+ ALIGN_VAL_T alignment, |
842 |
+ const std::nothrow_t&) __THROW { |
843 |
+ return ShimCppAlignedNew(size, static_cast<size_t>(alignment)); |
844 |
+ } |
845 |
+ |
846 |
+-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void ALIGN_DEL_ARR(void* p, |
847 |
++ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void ALIGN_DEL_ARR(void* p, |
848 |
+ ALIGN_VAL_T) __THROW { |
849 |
+ ShimCppDelete(p); |
850 |
+ } |
851 |
+ |
852 |
+-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void ALIGN_DEL_ARR_SIZED(void* p, |
853 |
++ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void ALIGN_DEL_ARR_SIZED(void* p, |
854 |
+ std::size_t size, |
855 |
+ ALIGN_VAL_T) __THROW { |
856 |
+ ShimCppDelete(p); |
857 |
+ } |
858 |
+ |
859 |
+-SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void |
860 |
++ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void |
861 |
+ ALIGN_DEL_ARR_NOTHROW(void* p, ALIGN_VAL_T, const std::nothrow_t&) __THROW { |
862 |
+ ShimCppDelete(p); |
863 |
+ } |
864 |
+-- |
865 |
+2.20.1 |
866 |
+ |
867 |
|
868 |
diff --git a/www-client/chromium/files/chromium-73-gcc-1.patch b/www-client/chromium/files/chromium-73-gcc-1.patch |
869 |
new file mode 100644 |
870 |
index 00000000000..c3f8e42d061 |
871 |
--- /dev/null |
872 |
+++ b/www-client/chromium/files/chromium-73-gcc-1.patch |
873 |
@@ -0,0 +1,99 @@ |
874 |
+From 130a5ae24a02daba8729ba2216bcaf3dbfacea69 Mon Sep 17 00:00:00 2001 |
875 |
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
876 |
+Date: Fri, 8 Feb 2019 16:58:38 +0000 |
877 |
+Subject: [PATCH] media::learning: Make LabelledExample's move assignment |
878 |
+ operator noexcept |
879 |
+MIME-Version: 1.0 |
880 |
+Content-Type: text/plain; charset=UTF-8 |
881 |
+Content-Transfer-Encoding: 8bit |
882 |
+ |
883 |
+The GCC build is currently broken with an error like this: |
884 |
+ |
885 |
+ ../../media/learning/common/labelled_example.cc:20:1: error: function ‘media::learning::LabelledExample::LabelledExample(media::learning::LabelledExample&&)’ defaulted on its redeclaration with an exception-specification that differs from the implicit exception-specification ‘’ |
886 |
+ LabelledExample::LabelledExample(LabelledExample&& rhs) noexcept = default; |
887 |
+ ^~~~~~~~~~~~~~~ |
888 |
+ |
889 |
+With GCC, having that noexcept marker requires all members to be marked with |
890 |
+noexcept themselves, and TargetValue was missing some assignment operators |
891 |
+and noexcept markers. |
892 |
+ |
893 |
+clang is fine because we pass -fno-exceptions and it disables the same error |
894 |
+there, while GCC continues to raise it (bug 843143 and its corresponding CL |
895 |
+have a longer discussion on this issue). |
896 |
+ |
897 |
+Bug: 819294 |
898 |
+Change-Id: Ide30932fc466ccb52d6883a82777e703dae48798 |
899 |
+Reviewed-on: https://chromium-review.googlesource.com/c/1458210 |
900 |
+Commit-Queue: Frank Liberato <liberato@××××××××.org> |
901 |
+Reviewed-by: Frank Liberato <liberato@××××××××.org> |
902 |
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
903 |
+Cr-Commit-Position: refs/heads/master@{#630355} |
904 |
+--- |
905 |
+ media/learning/common/labelled_example.cc | 3 ++- |
906 |
+ media/learning/common/labelled_example.h | 2 +- |
907 |
+ media/learning/common/value.cc | 6 ++++++ |
908 |
+ media/learning/common/value.h | 4 ++++ |
909 |
+ 4 files changed, 13 insertions(+), 2 deletions(-) |
910 |
+ |
911 |
+diff --git a/media/learning/common/labelled_example.cc b/media/learning/common/labelled_example.cc |
912 |
+index 76d08509298e..43e834f9f3cf 100644 |
913 |
+--- a/media/learning/common/labelled_example.cc |
914 |
++++ b/media/learning/common/labelled_example.cc |
915 |
+@@ -59,7 +59,8 @@ bool LabelledExample::operator<(const LabelledExample& rhs) const { |
916 |
+ LabelledExample& LabelledExample::operator=(const LabelledExample& rhs) = |
917 |
+ default; |
918 |
+ |
919 |
+-LabelledExample& LabelledExample::operator=(LabelledExample&& rhs) = default; |
920 |
++LabelledExample& LabelledExample::operator=(LabelledExample&& rhs) noexcept = |
921 |
++ default; |
922 |
+ |
923 |
+ TrainingData::TrainingData() = default; |
924 |
+ |
925 |
+diff --git a/media/learning/common/labelled_example.h b/media/learning/common/labelled_example.h |
926 |
+index 4f43c54e7a76..365abc3c0ebf 100644 |
927 |
+--- a/media/learning/common/labelled_example.h |
928 |
++++ b/media/learning/common/labelled_example.h |
929 |
+@@ -40,7 +40,7 @@ struct COMPONENT_EXPORT(LEARNING_COMMON) LabelledExample { |
930 |
+ bool operator<(const LabelledExample& rhs) const; |
931 |
+ |
932 |
+ LabelledExample& operator=(const LabelledExample& rhs); |
933 |
+- LabelledExample& operator=(LabelledExample&& rhs); |
934 |
++ LabelledExample& operator=(LabelledExample&& rhs) noexcept; |
935 |
+ |
936 |
+ // Observed feature values. |
937 |
+ // Note that to interpret these values, you probably need to have the |
938 |
+diff --git a/media/learning/common/value.cc b/media/learning/common/value.cc |
939 |
+index 9c9395c25d4e..12ea399d24c3 100644 |
940 |
+--- a/media/learning/common/value.cc |
941 |
++++ b/media/learning/common/value.cc |
942 |
+@@ -23,6 +23,12 @@ Value::Value(const std::string& x) : value_(base::PersistentHash(x)) {} |
943 |
+ |
944 |
+ Value::Value(const Value& other) : value_(other.value_) {} |
945 |
+ |
946 |
++Value::Value(Value&& rhs) noexcept = default; |
947 |
++ |
948 |
++Value& Value::operator=(const Value& rhs) = default; |
949 |
++ |
950 |
++Value& Value::operator=(Value&& rhs) noexcept = default; |
951 |
++ |
952 |
+ bool Value::operator==(const Value& rhs) const { |
953 |
+ return value_ == rhs.value_; |
954 |
+ } |
955 |
+diff --git a/media/learning/common/value.h b/media/learning/common/value.h |
956 |
+index 0e64da961f34..62f4953f691c 100644 |
957 |
+--- a/media/learning/common/value.h |
958 |
++++ b/media/learning/common/value.h |
959 |
+@@ -38,6 +38,10 @@ class COMPONENT_EXPORT(LEARNING_COMMON) Value { |
960 |
+ explicit Value(const std::string& x); |
961 |
+ |
962 |
+ Value(const Value& other); |
963 |
++ Value(Value&&) noexcept; |
964 |
++ |
965 |
++ Value& operator=(const Value&); |
966 |
++ Value& operator=(Value&&) noexcept; |
967 |
+ |
968 |
+ bool operator==(const Value& rhs) const; |
969 |
+ bool operator!=(const Value& rhs) const; |
970 |
+-- |
971 |
+2.20.1 |
972 |
+ |
973 |
|
974 |
diff --git a/www-client/chromium/files/chromium-73-gcc-2.patch b/www-client/chromium/files/chromium-73-gcc-2.patch |
975 |
new file mode 100644 |
976 |
index 00000000000..9d1f05a4d62 |
977 |
--- /dev/null |
978 |
+++ b/www-client/chromium/files/chromium-73-gcc-2.patch |
979 |
@@ -0,0 +1,51 @@ |
980 |
+From a5ba6f9bb7665040045dc0f8087407096630ad7b Mon Sep 17 00:00:00 2001 |
981 |
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
982 |
+Date: Fri, 8 Feb 2019 02:57:28 +0000 |
983 |
+Subject: [PATCH] color_utils: Use std::sqrt() instead of std::sqrtf() |
984 |
+MIME-Version: 1.0 |
985 |
+Content-Type: text/plain; charset=UTF-8 |
986 |
+Content-Transfer-Encoding: 8bit |
987 |
+ |
988 |
+This fixes the build with libstdc++: |
989 |
+ |
990 |
+ ../../ui/gfx/color_utils.cc: In function ‘SkColor color_utils::SetDarkestColorForTesting(SkColor)’: |
991 |
+ ../../ui/gfx/color_utils.cc:434:12: error: ‘sqrtf’ is not a member of ‘std’ |
992 |
+ std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f; |
993 |
+ ^~~~~ |
994 |
+ ../../ui/gfx/color_utils.cc:434:12: note: suggested alternative: ‘sqrt’ |
995 |
+ std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f; |
996 |
+ ^~~~~ |
997 |
+ sqrt |
998 |
+ |
999 |
+sqrtf() is not formally part of C++14 as far as I can see even though libc++ |
1000 |
+has it in <cmath>. Additionally, we're only dealing with floats in all parts |
1001 |
+of the expression above, so using the float sqrt() overload should be |
1002 |
+harmless anyway. |
1003 |
+ |
1004 |
+Bug: 819294 |
1005 |
+Change-Id: If6c7bf31819df97a761e6963def6d6506154c34d |
1006 |
+Reviewed-on: https://chromium-review.googlesource.com/c/1458193 |
1007 |
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
1008 |
+Reviewed-by: Peter Kasting <pkasting@××××××××.org> |
1009 |
+Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
1010 |
+Cr-Commit-Position: refs/heads/master@{#630140} |
1011 |
+--- |
1012 |
+ ui/gfx/color_utils.cc | 2 +- |
1013 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
1014 |
+ |
1015 |
+diff --git a/ui/gfx/color_utils.cc b/ui/gfx/color_utils.cc |
1016 |
+index c868cd54bac3..92ba1407d594 100644 |
1017 |
+--- a/ui/gfx/color_utils.cc |
1018 |
++++ b/ui/gfx/color_utils.cc |
1019 |
+@@ -431,7 +431,7 @@ SkColor SetDarkestColorForTesting(SkColor color) { |
1020 |
+ // GetContrastRatio(kWhiteLuminance, g_luminance_midpoint). The formula below |
1021 |
+ // can be verified by plugging it into how GetContrastRatio() operates. |
1022 |
+ g_luminance_midpoint = |
1023 |
+- std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f; |
1024 |
++ std::sqrt((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f; |
1025 |
+ |
1026 |
+ return previous_darkest_color; |
1027 |
+ } |
1028 |
+-- |
1029 |
+2.20.1 |
1030 |
+ |
1031 |
|
1032 |
diff --git a/www-client/chromium/files/chromium-73-gcc-3.patch b/www-client/chromium/files/chromium-73-gcc-3.patch |
1033 |
new file mode 100644 |
1034 |
index 00000000000..9cc6cf2fab6 |
1035 |
--- /dev/null |
1036 |
+++ b/www-client/chromium/files/chromium-73-gcc-3.patch |
1037 |
@@ -0,0 +1,69 @@ |
1038 |
+From c33e832cc145c696d2157796c7640e659740dafa Mon Sep 17 00:00:00 2001 |
1039 |
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
1040 |
+Date: Fri, 8 Feb 2019 08:44:00 +0000 |
1041 |
+Subject: [PATCH] quic_flags_impl: Fix GCC build after #618558 |
1042 |
+MIME-Version: 1.0 |
1043 |
+Content-Type: text/plain; charset=UTF-8 |
1044 |
+Content-Transfer-Encoding: 8bit |
1045 |
+ |
1046 |
+Due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84849, having |
1047 |
+base::NoDestructor<T<U>> and passing an initializer list of Us does not |
1048 |
+work if this is not done explicitly, as GCC incorrectly fails to determine |
1049 |
+which constructor overload to use: |
1050 |
+ |
1051 |
+ ../../net/third_party/quic/platform/impl/quic_flags_impl.cc: In member function ‘bool quic::TypedQuicFlagHelper<T>::SetFlag(const string&) const [with T = bool; std::__cxx11::string = std::__cxx11::basic_string<char>]’: |
1052 |
+ ../../net/third_party/quic/platform/impl/quic_flags_impl.cc:156:41: error: call of overloaded ‘NoDestructor(<brace-enclosed initializer list>)’ is ambiguous |
1053 |
+ {"", "1", "t", "true", "y", "yes"}); |
1054 |
+ ^ |
1055 |
+ In file included from ../../net/third_party/quic/platform/impl/quic_flags_impl.h:16, |
1056 |
+ from ../../net/third_party/quic/platform/impl/quic_flags_impl.cc:5: |
1057 |
+ ../../base/no_destructor.h:62:3: note: candidate: ‘base::NoDestructor<T>::NoDestructor(const base::NoDestructor<T>&) [with T = std::set<std::__cxx11::basic_string<char> >]’ <deleted> |
1058 |
+ NoDestructor(const NoDestructor&) = delete; |
1059 |
+ ^~~~~~~~~~~~ |
1060 |
+ ../../base/no_destructor.h:60:12: note: candidate: ‘base::NoDestructor<T>::NoDestructor(T&&) [with T = std::set<std::__cxx11::basic_string<char> >]’ |
1061 |
+ explicit NoDestructor(T&& x) { new (storage_) T(std::move(x)); } |
1062 |
+ ^~~~~~~~~~~~ |
1063 |
+ ../../base/no_destructor.h:59:12: note: candidate: ‘base::NoDestructor<T>::NoDestructor(const T&) [with T = std::set<std::__cxx11::basic_string<char> >]’ |
1064 |
+ explicit NoDestructor(const T& x) { new (storage_) T(x); } |
1065 |
+ ^~~~~~~~~~~~ |
1066 |
+ |
1067 |
+Explicitly use an std::initializer_list to make the build work everywhere. |
1068 |
+ |
1069 |
+Bug: 819294 |
1070 |
+Change-Id: I775be20e3766a88a656b58c94c40869cb1bee2a8 |
1071 |
+Reviewed-on: https://chromium-review.googlesource.com/c/1458214 |
1072 |
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
1073 |
+Reviewed-by: Ryan Hamilton <rch@××××××××.org> |
1074 |
+Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
1075 |
+Cr-Commit-Position: refs/heads/master@{#630249} |
1076 |
+--- |
1077 |
+ net/third_party/quic/platform/impl/quic_flags_impl.cc | 5 +++-- |
1078 |
+ 1 file changed, 3 insertions(+), 2 deletions(-) |
1079 |
+ |
1080 |
+diff --git a/net/third_party/quic/platform/impl/quic_flags_impl.cc b/net/third_party/quic/platform/impl/quic_flags_impl.cc |
1081 |
+index 5e6962d1e770..3fa45fc6892d 100644 |
1082 |
+--- a/net/third_party/quic/platform/impl/quic_flags_impl.cc |
1083 |
++++ b/net/third_party/quic/platform/impl/quic_flags_impl.cc |
1084 |
+@@ -5,6 +5,7 @@ |
1085 |
+ #include "net/third_party/quic/platform/impl/quic_flags_impl.h" |
1086 |
+ |
1087 |
+ #include <algorithm> |
1088 |
++#include <initializer_list> |
1089 |
+ #include <iostream> |
1090 |
+ #include <set> |
1091 |
+ |
1092 |
+@@ -153,9 +154,9 @@ std::string QuicFlagRegistry::GetHelp() const { |
1093 |
+ template <> |
1094 |
+ bool TypedQuicFlagHelper<bool>::SetFlag(const std::string& s) const { |
1095 |
+ static const base::NoDestructor<std::set<std::string>> kTrueValues( |
1096 |
+- {"", "1", "t", "true", "y", "yes"}); |
1097 |
++ std::initializer_list<std::string>({"", "1", "t", "true", "y", "yes"})); |
1098 |
+ static const base::NoDestructor<std::set<std::string>> kFalseValues( |
1099 |
+- {"0", "f", "false", "n", "no"}); |
1100 |
++ std::initializer_list<std::string>({"0", "f", "false", "n", "no"})); |
1101 |
+ if (kTrueValues->find(base::ToLowerASCII(s)) != kTrueValues->end()) { |
1102 |
+ *flag_ = true; |
1103 |
+ return true; |
1104 |
+-- |
1105 |
+2.20.1 |
1106 |
+ |
1107 |
|
1108 |
diff --git a/www-client/chromium/files/chromium-73-gcc-4.patch b/www-client/chromium/files/chromium-73-gcc-4.patch |
1109 |
new file mode 100644 |
1110 |
index 00000000000..df7d6301f7e |
1111 |
--- /dev/null |
1112 |
+++ b/www-client/chromium/files/chromium-73-gcc-4.patch |
1113 |
@@ -0,0 +1,59 @@ |
1114 |
+From bdd76190e54e6a0e11343dd19e4bf1d06956fa48 Mon Sep 17 00:00:00 2001 |
1115 |
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
1116 |
+Date: Wed, 13 Feb 2019 01:02:27 +0000 |
1117 |
+Subject: [PATCH] BaseRenderingContext2D: Use base::CheckMul and simplify code |
1118 |
+ in putImageData() |
1119 |
+MIME-Version: 1.0 |
1120 |
+Content-Type: text/plain; charset=UTF-8 |
1121 |
+Content-Transfer-Encoding: 8bit |
1122 |
+ |
1123 |
+Follow-up to commit e0b3253a56 ("Fix image conversion truncation issues"). |
1124 |
+The current code does not build with GCC due to |
1125 |
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89287: |
1126 |
+ |
1127 |
+ ../../third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc: In member function ‘void blink::BaseRenderingContext2D::putImageData(blink::ImageData*, int, int, int, int, int, int, blink::ExceptionState&)’: |
1128 |
+ ../../third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc:1777:44: error: default type conversion can't deduce template argument for ‘template<class Dst, typename std::enable_if<base::internal::IsNumericRangeContained<Dst, long unsigned int, void>::value, void>::type* <anonymous> > constexpr base::internal::StrictNumeric<T>::operator Dst() const [with Dst = Dst; typename std::enable_if<base::internal::IsNumericRangeContained<Dst, T>::value>::type* <anonymous> = <enumerator>; T = long unsigned int]’ |
1129 |
+ new uint8_t[data_length.ValueOrDie()]); |
1130 |
+ ^ |
1131 |
+ |
1132 |
+Work around it by using the more idiomatic base::CheckMul() with |
1133 |
+AssignIfValid, so that we can have |data_length| be a size_t again and not |
1134 |
+leave it to the compiler to figure out the type we want when creating the |
1135 |
+|converted_pixels| array. |
1136 |
+ |
1137 |
+Bug: 819294 |
1138 |
+Change-Id: Id124cc4f3d749b45def4708e21e4badafd708578 |
1139 |
+Reviewed-on: https://chromium-review.googlesource.com/c/1467201 |
1140 |
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
1141 |
+Commit-Queue: Kentaro Hara <haraken@××××××××.org> |
1142 |
+Reviewed-by: Kentaro Hara <haraken@××××××××.org> |
1143 |
+Cr-Commit-Position: refs/heads/master@{#631472} |
1144 |
+--- |
1145 |
+ .../canvas/canvas2d/base_rendering_context_2d.cc | 10 +++++----- |
1146 |
+ 1 file changed, 5 insertions(+), 5 deletions(-) |
1147 |
+ |
1148 |
+diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc |
1149 |
+index d9fa696c9a9d..34a8a202bfd3 100644 |
1150 |
+--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc |
1151 |
++++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc |
1152 |
+@@ -1769,12 +1769,12 @@ void BaseRenderingContext2D::putImageData(ImageData* data, |
1153 |
+ CanvasColorParams(ColorParams().ColorSpace(), PixelFormat(), kNonOpaque); |
1154 |
+ if (data_color_params.NeedsColorConversion(context_color_params) || |
1155 |
+ PixelFormat() == kF16CanvasPixelFormat) { |
1156 |
+- base::CheckedNumeric<size_t> data_length = data->Size().Area(); |
1157 |
+- data_length *= context_color_params.BytesPerPixel(); |
1158 |
+- if (!data_length.IsValid()) |
1159 |
++ size_t data_length; |
1160 |
++ if (!base::CheckMul(data->Size().Area(), |
1161 |
++ context_color_params.BytesPerPixel()) |
1162 |
++ .AssignIfValid(&data_length)) |
1163 |
+ return; |
1164 |
+- std::unique_ptr<uint8_t[]> converted_pixels( |
1165 |
+- new uint8_t[data_length.ValueOrDie()]); |
1166 |
++ std::unique_ptr<uint8_t[]> converted_pixels(new uint8_t[data_length]); |
1167 |
+ if (data->ImageDataInCanvasColorSettings( |
1168 |
+ ColorParams().ColorSpace(), PixelFormat(), converted_pixels.get(), |
1169 |
+ kRGBAColorType)) { |
1170 |
+-- |
1171 |
+2.20.1 |
1172 |
+ |
1173 |
|
1174 |
diff --git a/www-client/chromium/files/chromium-73-gcc-5.patch b/www-client/chromium/files/chromium-73-gcc-5.patch |
1175 |
new file mode 100644 |
1176 |
index 00000000000..033861e2bfb |
1177 |
--- /dev/null |
1178 |
+++ b/www-client/chromium/files/chromium-73-gcc-5.patch |
1179 |
@@ -0,0 +1,65 @@ |
1180 |
+From 78b0f0dfa9e6f3c37b71102c01def92f1ab8c330 Mon Sep 17 00:00:00 2001 |
1181 |
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
1182 |
+Date: Wed, 13 Feb 2019 23:28:46 +0000 |
1183 |
+Subject: [PATCH] CastActivityManager: Do not make DoLaunchSessionParams' move |
1184 |
+ constructor noexcept |
1185 |
+MIME-Version: 1.0 |
1186 |
+Content-Type: text/plain; charset=UTF-8 |
1187 |
+Content-Transfer-Encoding: 8bit |
1188 |
+ |
1189 |
+This fixes the GCC build: |
1190 |
+ |
1191 |
+ ../../chrome/browser/media/router/providers/cast/cast_activity_manager.cc:806:1: error: function ‘media_router::CastActivityManager::DoLaunchSessionParams::DoLaunchSessionParams(media_router::CastActivityManager::DoLaunchSessionParams&&)’ defaulted on its redeclaration with an exception-specification that differs from the implicit exception-specification ‘’ |
1192 |
+ CastActivityManager::DoLaunchSessionParams::DoLaunchSessionParams( |
1193 |
+ ^~~~~~~~~~~~~~~~~~~ |
1194 |
+ |
1195 |
+With GCC, having that noexcept marker requires all members to be marked with |
1196 |
+noexcept themselves, and MediaRoute, CastMediaSource and url::Origin need |
1197 |
+the right annotations. Just making DoLaunchSessionParams not noexcept is the |
1198 |
+least intrusive solution for now. |
1199 |
+ |
1200 |
+clang is fine because we pass -fno-exceptions and it disables the same error |
1201 |
+there, while GCC continues to raise it (bug 843143 and its corresponding CL |
1202 |
+have a longer discussion on this issue). |
1203 |
+ |
1204 |
+Bug: 819294 |
1205 |
+Change-Id: Ia3a5fb60b5e74e68bd35cfa50e2fcc728b64e5eb |
1206 |
+Reviewed-on: https://chromium-review.googlesource.com/c/1469942 |
1207 |
+Commit-Queue: mark a. foltz <mfoltz@××××××××.org> |
1208 |
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
1209 |
+Reviewed-by: mark a. foltz <mfoltz@××××××××.org> |
1210 |
+Cr-Commit-Position: refs/heads/master@{#631962} |
1211 |
+--- |
1212 |
+ .../media/router/providers/cast/cast_activity_manager.cc | 2 +- |
1213 |
+ .../browser/media/router/providers/cast/cast_activity_manager.h | 2 +- |
1214 |
+ 2 files changed, 2 insertions(+), 2 deletions(-) |
1215 |
+ |
1216 |
+diff --git a/chrome/browser/media/router/providers/cast/cast_activity_manager.cc b/chrome/browser/media/router/providers/cast/cast_activity_manager.cc |
1217 |
+index b7ee9695f69a..8569e0cd30a3 100644 |
1218 |
+--- a/chrome/browser/media/router/providers/cast/cast_activity_manager.cc |
1219 |
++++ b/chrome/browser/media/router/providers/cast/cast_activity_manager.cc |
1220 |
+@@ -804,7 +804,7 @@ CastActivityManager::DoLaunchSessionParams::DoLaunchSessionParams( |
1221 |
+ callback(std::move(callback)) {} |
1222 |
+ |
1223 |
+ CastActivityManager::DoLaunchSessionParams::DoLaunchSessionParams( |
1224 |
+- DoLaunchSessionParams&& other) noexcept = default; |
1225 |
++ DoLaunchSessionParams&& other) = default; |
1226 |
+ |
1227 |
+ CastActivityManager::DoLaunchSessionParams::~DoLaunchSessionParams() = default; |
1228 |
+ |
1229 |
+diff --git a/chrome/browser/media/router/providers/cast/cast_activity_manager.h b/chrome/browser/media/router/providers/cast/cast_activity_manager.h |
1230 |
+index 325bffc725ee..08fe0ccca603 100644 |
1231 |
+--- a/chrome/browser/media/router/providers/cast/cast_activity_manager.h |
1232 |
++++ b/chrome/browser/media/router/providers/cast/cast_activity_manager.h |
1233 |
+@@ -295,7 +295,7 @@ class CastActivityManager : public cast_channel::CastMessageHandler::Observer, |
1234 |
+ const url::Origin& origin, |
1235 |
+ int tab_id, |
1236 |
+ mojom::MediaRouteProvider::CreateRouteCallback callback); |
1237 |
+- DoLaunchSessionParams(DoLaunchSessionParams&& other) noexcept; |
1238 |
++ DoLaunchSessionParams(DoLaunchSessionParams&& other); |
1239 |
+ ~DoLaunchSessionParams(); |
1240 |
+ DoLaunchSessionParams& operator=(DoLaunchSessionParams&&) = delete; |
1241 |
+ |
1242 |
+-- |
1243 |
+2.20.1 |
1244 |
+ |