1 |
commit: f22f0bf9d1674811ed99d19334245e6288b00086 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 10 06:28:01 2019 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 10 06:29:26 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f22f0bf9 |
7 |
|
8 |
www-client/chromium: stable channel bump (72.0.3626.96) |
9 |
|
10 |
Package-Manager: Portage-2.3.58, Repoman-2.3.12_p63 |
11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
12 |
|
13 |
www-client/chromium/Manifest | 4 +- |
14 |
www-client/chromium/chromium-71.0.3578.98.ebuild | 714 -------------------- |
15 |
www-client/chromium/chromium-72.0.3595.2.ebuild | 715 --------------------- |
16 |
...3626.28.ebuild => chromium-72.0.3626.96.ebuild} | 41 +- |
17 |
www-client/chromium/files/chromium-70-gcc-0.patch | 70 -- |
18 |
www-client/chromium/files/chromium-70-gcc-1.patch | 98 --- |
19 |
www-client/chromium/files/chromium-70-gcc-2.patch | 37 -- |
20 |
.../chromium/files/chromium-compiler-r4.patch | 168 ----- |
21 |
.../chromium/files/chromium-pdfium-stdlib-r0.patch | 30 - |
22 |
9 files changed, 23 insertions(+), 1854 deletions(-) |
23 |
|
24 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
25 |
index 1b44e81cd23..86cd01aa831 100644 |
26 |
--- a/www-client/chromium/Manifest |
27 |
+++ b/www-client/chromium/Manifest |
28 |
@@ -1,5 +1,5 @@ |
29 |
DIST chromium-71.0.3578.80.tar.xz 633878288 BLAKE2B be6dcb4c1123830f8f0413e52e46c6e3356356cbfadcaa77c3960f22a6f1f2f5a7a2e7da415b7c19b75d6cd4b881d45a8aeaa7c311547ac58fc34c87fdf23891 SHA512 79b0f5ebe71a34d9f5215df1b4e47071f2337bb480fbec591011653acdfe524419bd10efdeab334ac34c07bc4eb2c485d60a9c3b2f053a721271130ff98af516 |
30 |
-DIST chromium-71.0.3578.98.tar.xz 633860888 BLAKE2B f232fa3ecef45b3e7d0c9876c2d9133ed0a51f2241c3b354592ea62817b7660e7a91869f0d7f1aee60384e9b87644b837af36ff5d802cee986346778946ce0be SHA512 dbeb90e16c6c05422c1f43e8fe747d60dab49c1fffdd0f33824ca24429f3871bda649eb1e6402470d3d9bb701e47d55d2fff4f46530e3f43e72f516d1837aad6 |
31 |
-DIST chromium-72.0.3595.2.tar.xz 658797888 BLAKE2B 7f0274693e8fac283d75c7e7ff6f672a10937454d989e9aa728b4a9646fe92bd8aaa8c154913d71dd86fd7ced595c1b2475248a9fb521984049af04f289f3f43 SHA512 7d5130e45e28ccf7389c64ca24a12ffc84922ca40d2c0e9a2d9caf27eb40a08cfdda8a902c6d747f864071b6eec752287fe2654f62e7e6c5c42c1334c5f35766 |
32 |
DIST chromium-72.0.3626.28.tar.xz 686169316 BLAKE2B 6ee2bfd35e8d48a7122f0a8b85777733bdaf2c6c56b00eb6cf3ee14afede25a45919b6ce6267fb54ae9040d0b676d084d6db5026918b07bc3e26f825d6298c35 SHA512 474452f6d41f900118d88f3aaf435cd332567f7a55c2af449e775668a78ee285ab7c011ca41237fa2b13f4b3076ec0cfb5448cfe9018092614e60c0ad7c12252 |
33 |
+DIST chromium-72.0.3626.96.tar.xz 686361344 BLAKE2B 92a001d99d418b0305235af9109719d9179f8bee53ad79e1ac089a1bc32b493ddcd3e26419e37b68e912f7b09deb51efefd325b82abb1fa281fe207e3a1f9a89 SHA512 949dde41053dba7408ab96d6fc56668efa46248a7a5a4690642f3de696c25fc9d5a746d82b106f4083bf4a1a5676eea06060c616375f74379a051a6bde4faea0 |
34 |
+DIST chromium-webrtc-includes-r1.patch.xz 57820 BLAKE2B 8e113680254b4834abda72c335a8f0af7211c5982c91e52372945f9a57c5558bd6772300ffefb475b450c40ffe66cd627aba34d33af101fe402815c2a16fe6c8 SHA512 cd4562ec32a044925afc65d9cba62310acc515db7cab0ee3aa0f3afe11672b3e7046ca937d8739c4feca436af7d9cf0f7860716a397c8aa5d5ae647b5eaf1ac0 |
35 |
DIST chromium-webrtc-includes.patch.xz 57908 BLAKE2B e977da6fb10bd3fdd12fef75ad669c4e7cb15f8e518a18c52dec7a4e27f0d5444dffc880b4aed30ccef8b620d82946be08c0b5b63ceaec0554e9f80b867b9750 SHA512 440c5ede645d13ec74c08c755a46298f5fcf10c9cbe6d88621ae89a2b27ae41be9954f4e3c1798525cc97aac01e5021b878a06c5625628c4c071cec84f3dfe8a |
36 |
|
37 |
diff --git a/www-client/chromium/chromium-71.0.3578.98.ebuild b/www-client/chromium/chromium-71.0.3578.98.ebuild |
38 |
deleted file mode 100644 |
39 |
index 88e3484e883..00000000000 |
40 |
--- a/www-client/chromium/chromium-71.0.3578.98.ebuild |
41 |
+++ /dev/null |
42 |
@@ -1,714 +0,0 @@ |
43 |
-# Copyright 1999-2019 Gentoo Authors |
44 |
-# Distributed under the terms of the GNU General Public License v2 |
45 |
- |
46 |
-EAPI=7 |
47 |
-PYTHON_COMPAT=( python2_7 ) |
48 |
- |
49 |
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he |
50 |
- 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 |
51 |
- sv sw ta te th tr uk vi zh-CN zh-TW" |
52 |
- |
53 |
-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 |
54 |
- |
55 |
-DESCRIPTION="Open-source version of Google Chrome web browser" |
56 |
-HOMEPAGE="http://chromium.org/" |
57 |
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" |
58 |
- |
59 |
-LICENSE="BSD" |
60 |
-SLOT="0" |
61 |
-KEYWORDS="~amd64 ~x86" |
62 |
-IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine" |
63 |
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" |
64 |
- |
65 |
-COMMON_DEPEND=" |
66 |
- >=app-accessibility/at-spi2-atk-2.26:2 |
67 |
- app-arch/bzip2:= |
68 |
- cups? ( >=net-print/cups-1.3.11:= ) |
69 |
- >=dev-libs/atk-2.26 |
70 |
- dev-libs/expat:= |
71 |
- dev-libs/glib:2 |
72 |
- system-icu? ( >=dev-libs/icu-59:= ) |
73 |
- >=dev-libs/libxml2-2.9.4-r3:=[icu] |
74 |
- dev-libs/libxslt:= |
75 |
- dev-libs/nspr:= |
76 |
- >=dev-libs/nss-3.26:= |
77 |
- >=dev-libs/re2-0.2016.11.01:= |
78 |
- gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) |
79 |
- >=media-libs/alsa-lib-1.0.19:= |
80 |
- media-libs/fontconfig:= |
81 |
- media-libs/freetype:= |
82 |
- >=media-libs/harfbuzz-2.0.0:0=[icu(-)] |
83 |
- media-libs/libjpeg-turbo:= |
84 |
- media-libs/libpng:= |
85 |
- system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) |
86 |
- >=media-libs/openh264-1.6.0:= |
87 |
- pulseaudio? ( media-sound/pulseaudio:= ) |
88 |
- system-ffmpeg? ( |
89 |
- >=media-video/ffmpeg-4:= |
90 |
- || ( |
91 |
- media-video/ffmpeg[-samba] |
92 |
- >=net-fs/samba-4.5.10-r1[-debug(-)] |
93 |
- ) |
94 |
- !=net-fs/samba-4.5.12-r0 |
95 |
- media-libs/opus:= |
96 |
- ) |
97 |
- sys-apps/dbus:= |
98 |
- sys-apps/pciutils:= |
99 |
- virtual/udev |
100 |
- x11-libs/cairo:= |
101 |
- x11-libs/gdk-pixbuf:2 |
102 |
- x11-libs/gtk+:3[X] |
103 |
- x11-libs/libX11:= |
104 |
- x11-libs/libXcomposite:= |
105 |
- x11-libs/libXcursor:= |
106 |
- x11-libs/libXdamage:= |
107 |
- x11-libs/libXext:= |
108 |
- x11-libs/libXfixes:= |
109 |
- >=x11-libs/libXi-1.6.0:= |
110 |
- x11-libs/libXrandr:= |
111 |
- x11-libs/libXrender:= |
112 |
- x11-libs/libXScrnSaver:= |
113 |
- x11-libs/libXtst:= |
114 |
- x11-libs/pango:= |
115 |
- app-arch/snappy:= |
116 |
- media-libs/flac:= |
117 |
- >=media-libs/libwebp-0.4.0:= |
118 |
- sys-libs/zlib:=[minizip] |
119 |
- kerberos? ( virtual/krb5 ) |
120 |
-" |
121 |
-# For nvidia-drivers blocker, see bug #413637 . |
122 |
-RDEPEND="${COMMON_DEPEND} |
123 |
- !<www-plugins/chrome-binary-plugins-57 |
124 |
- x11-misc/xdg-utils |
125 |
- virtual/opengl |
126 |
- virtual/ttf-fonts |
127 |
- selinux? ( sec-policy/selinux-chromium ) |
128 |
- tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) |
129 |
- widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] ) |
130 |
-" |
131 |
-# dev-vcs/git - https://bugs.gentoo.org/593476 |
132 |
-# sys-apps/sandbox - https://crbug.com/586444 |
133 |
-DEPEND="${COMMON_DEPEND} |
134 |
-" |
135 |
-BDEPEND=" |
136 |
- >=app-arch/gzip-1.7 |
137 |
- !arm? ( |
138 |
- dev-lang/yasm |
139 |
- ) |
140 |
- dev-lang/perl |
141 |
- dev-util/gn |
142 |
- >=dev-util/gperf-3.0.3 |
143 |
- >=dev-util/ninja-1.7.2 |
144 |
- >=net-libs/nodejs-7.6.0[inspector] |
145 |
- sys-apps/hwids[usb(+)] |
146 |
- >=sys-devel/bison-2.4.3 |
147 |
- sys-devel/flex |
148 |
- virtual/pkgconfig |
149 |
- dev-vcs/git |
150 |
-" |
151 |
- |
152 |
-: ${CHROMIUM_FORCE_CLANG=no} |
153 |
- |
154 |
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then |
155 |
- BDEPEND+=" >=sys-devel/clang-5" |
156 |
-fi |
157 |
- |
158 |
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then |
159 |
- EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; |
160 |
-fi |
161 |
- |
162 |
-DISABLE_AUTOFORMATTING="yes" |
163 |
-DOC_CONTENTS=" |
164 |
-Some web pages may require additional fonts to display properly. |
165 |
-Try installing some of the following packages if some characters |
166 |
-are not displayed properly: |
167 |
-- media-fonts/arphicfonts |
168 |
-- media-fonts/droid |
169 |
-- media-fonts/ipamonafont |
170 |
-- media-fonts/noto |
171 |
-- media-fonts/ja-ipafonts |
172 |
-- media-fonts/takao-fonts |
173 |
-- media-fonts/wqy-microhei |
174 |
-- media-fonts/wqy-zenhei |
175 |
- |
176 |
-To fix broken icons on the Downloads page, you should install an icon |
177 |
-theme that covers the appropriate MIME types, and configure this as your |
178 |
-GTK+ icon theme. |
179 |
-" |
180 |
- |
181 |
-PATCHES=( |
182 |
- "${FILESDIR}/chromium-compiler-r6.patch" |
183 |
- "${FILESDIR}/chromium-widevine-r3.patch" |
184 |
- "${FILESDIR}/chromium-webrtc-r0.patch" |
185 |
- "${FILESDIR}/chromium-memcpy-r0.patch" |
186 |
- "${FILESDIR}/chromium-math.h-r0.patch" |
187 |
- "${FILESDIR}/chromium-stdint.patch" |
188 |
- "${FILESDIR}/chromium-harfbuzz-r0.patch" |
189 |
- "${FILESDIR}/chromium-71-gcc-0.patch" |
190 |
-) |
191 |
- |
192 |
-pre_build_checks() { |
193 |
- #if [[ ${MERGE_TYPE} != binary ]]; then |
194 |
- # local -x CPP="$(tc-getCXX) -E" |
195 |
- # if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then |
196 |
- # # bugs: #601654 |
197 |
- # die "At least clang 3.9.1 is required" |
198 |
- # fi |
199 |
- # if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then |
200 |
- # # bugs: #535730, #525374, #518668, #600288, #627356 |
201 |
- # die "At least gcc 5.0 is required" |
202 |
- # fi |
203 |
- #fi |
204 |
- |
205 |
- # Check build requirements, bug #541816 and bug #471810 . |
206 |
- CHECKREQS_MEMORY="3G" |
207 |
- CHECKREQS_DISK_BUILD="5G" |
208 |
- if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then |
209 |
- CHECKREQS_DISK_BUILD="25G" |
210 |
- if ! use component-build; then |
211 |
- CHECKREQS_MEMORY="16G" |
212 |
- fi |
213 |
- fi |
214 |
- check-reqs_pkg_setup |
215 |
-} |
216 |
- |
217 |
-pkg_pretend() { |
218 |
- pre_build_checks |
219 |
-} |
220 |
- |
221 |
-pkg_setup() { |
222 |
- pre_build_checks |
223 |
- |
224 |
- chromium_suid_sandbox_check_kernel_config |
225 |
-} |
226 |
- |
227 |
-src_prepare() { |
228 |
- # Calling this here supports resumption via FEATURES=keepwork |
229 |
- python_setup |
230 |
- |
231 |
- default |
232 |
- |
233 |
- mkdir -p third_party/node/linux/node-linux-x64/bin || die |
234 |
- ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die |
235 |
- |
236 |
- local keeplibs=( |
237 |
- base/third_party/dmg_fp |
238 |
- base/third_party/dynamic_annotations |
239 |
- base/third_party/icu |
240 |
- base/third_party/nspr |
241 |
- base/third_party/superfasthash |
242 |
- base/third_party/symbolize |
243 |
- base/third_party/valgrind |
244 |
- base/third_party/xdg_mime |
245 |
- base/third_party/xdg_user_dirs |
246 |
- buildtools/third_party/libc++ |
247 |
- buildtools/third_party/libc++abi |
248 |
- chrome/third_party/mozilla_security_manager |
249 |
- courgette/third_party |
250 |
- net/third_party/http2 |
251 |
- net/third_party/mozilla_security_manager |
252 |
- net/third_party/nss |
253 |
- net/third_party/quic |
254 |
- net/third_party/spdy |
255 |
- net/third_party/uri_template |
256 |
- third_party/WebKit |
257 |
- third_party/abseil-cpp |
258 |
- third_party/analytics |
259 |
- third_party/angle |
260 |
- third_party/angle/src/common/third_party/base |
261 |
- third_party/angle/src/common/third_party/smhasher |
262 |
- third_party/angle/src/third_party/compiler |
263 |
- third_party/angle/src/third_party/libXNVCtrl |
264 |
- third_party/angle/src/third_party/trace_event |
265 |
- third_party/angle/third_party/glslang |
266 |
- third_party/angle/third_party/spirv-headers |
267 |
- third_party/angle/third_party/spirv-tools |
268 |
- third_party/angle/third_party/vulkan-headers |
269 |
- third_party/angle/third_party/vulkan-loader |
270 |
- third_party/angle/third_party/vulkan-tools |
271 |
- third_party/angle/third_party/vulkan-validation-layers |
272 |
- third_party/apple_apsl |
273 |
- third_party/blink |
274 |
- third_party/boringssl |
275 |
- third_party/boringssl/src/third_party/fiat |
276 |
- third_party/breakpad |
277 |
- third_party/breakpad/breakpad/src/third_party/curl |
278 |
- third_party/brotli |
279 |
- third_party/cacheinvalidation |
280 |
- third_party/catapult |
281 |
- third_party/catapult/common/py_vulcanize/third_party/rcssmin |
282 |
- third_party/catapult/common/py_vulcanize/third_party/rjsmin |
283 |
- third_party/catapult/third_party/beautifulsoup4 |
284 |
- third_party/catapult/third_party/html5lib-python |
285 |
- third_party/catapult/third_party/polymer |
286 |
- third_party/catapult/third_party/six |
287 |
- third_party/catapult/tracing/third_party/d3 |
288 |
- third_party/catapult/tracing/third_party/gl-matrix |
289 |
- third_party/catapult/tracing/third_party/jszip |
290 |
- third_party/catapult/tracing/third_party/mannwhitneyu |
291 |
- third_party/catapult/tracing/third_party/oboe |
292 |
- third_party/catapult/tracing/third_party/pako |
293 |
- third_party/ced |
294 |
- third_party/cld_3 |
295 |
- third_party/crashpad |
296 |
- third_party/crashpad/crashpad/third_party/zlib |
297 |
- third_party/crc32c |
298 |
- third_party/cros_system_api |
299 |
- third_party/devscripts |
300 |
- third_party/dom_distiller_js |
301 |
- third_party/fips181 |
302 |
- third_party/flatbuffers |
303 |
- third_party/flot |
304 |
- third_party/freetype |
305 |
- third_party/glslang-angle |
306 |
- third_party/google_input_tools |
307 |
- third_party/google_input_tools/third_party/closure_library |
308 |
- third_party/google_input_tools/third_party/closure_library/third_party/closure |
309 |
- third_party/googletest |
310 |
- third_party/hunspell |
311 |
- third_party/iccjpeg |
312 |
- third_party/inspector_protocol |
313 |
- third_party/jinja2 |
314 |
- third_party/jsoncpp |
315 |
- third_party/jstemplate |
316 |
- third_party/khronos |
317 |
- third_party/leveldatabase |
318 |
- third_party/libXNVCtrl |
319 |
- third_party/libaddressinput |
320 |
- third_party/libaom |
321 |
- third_party/libaom/source/libaom/third_party/vector |
322 |
- third_party/libaom/source/libaom/third_party/x86inc |
323 |
- third_party/libjingle |
324 |
- third_party/libphonenumber |
325 |
- third_party/libsecret |
326 |
- third_party/libsrtp |
327 |
- third_party/libsync |
328 |
- third_party/libudev |
329 |
- third_party/libwebm |
330 |
- third_party/libxml/chromium |
331 |
- third_party/libyuv |
332 |
- third_party/llvm |
333 |
- third_party/lss |
334 |
- third_party/lzma_sdk |
335 |
- third_party/markupsafe |
336 |
- third_party/mesa |
337 |
- third_party/metrics_proto |
338 |
- third_party/modp_b64 |
339 |
- third_party/node |
340 |
- third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2 |
341 |
- third_party/openmax_dl |
342 |
- third_party/ots |
343 |
- third_party/pdfium |
344 |
- third_party/pdfium/third_party/agg23 |
345 |
- third_party/pdfium/third_party/base |
346 |
- third_party/pdfium/third_party/bigint |
347 |
- third_party/pdfium/third_party/freetype |
348 |
- third_party/pdfium/third_party/lcms |
349 |
- third_party/pdfium/third_party/libopenjpeg20 |
350 |
- third_party/pdfium/third_party/libpng16 |
351 |
- third_party/pdfium/third_party/libtiff |
352 |
- third_party/pdfium/third_party/skia_shared |
353 |
- third_party/perfetto |
354 |
- third_party/ply |
355 |
- third_party/polymer |
356 |
- third_party/protobuf |
357 |
- third_party/protobuf/third_party/six |
358 |
- third_party/pyjson5 |
359 |
- third_party/qcms |
360 |
- third_party/rnnoise |
361 |
- third_party/s2cellid |
362 |
- third_party/sfntly |
363 |
- third_party/simplejson |
364 |
- third_party/skia |
365 |
- third_party/skia/third_party/gif |
366 |
- third_party/skia/third_party/skcms |
367 |
- third_party/skia/third_party/vulkan |
368 |
- third_party/smhasher |
369 |
- third_party/spirv-headers |
370 |
- third_party/SPIRV-Tools |
371 |
- third_party/spirv-tools-angle |
372 |
- third_party/sqlite |
373 |
- third_party/swiftshader |
374 |
- third_party/swiftshader/third_party/llvm-subzero |
375 |
- third_party/swiftshader/third_party/subzero |
376 |
- third_party/unrar |
377 |
- third_party/usrsctp |
378 |
- third_party/vulkan |
379 |
- third_party/vulkan-validation-layers |
380 |
- third_party/web-animations-js |
381 |
- third_party/webdriver |
382 |
- third_party/webrtc |
383 |
- third_party/webrtc/common_audio/third_party/fft4g |
384 |
- third_party/webrtc/common_audio/third_party/spl_sqrt_floor |
385 |
- third_party/webrtc/modules/third_party/fft |
386 |
- third_party/webrtc/modules/third_party/g711 |
387 |
- third_party/webrtc/modules/third_party/g722 |
388 |
- third_party/webrtc/rtc_base/third_party/base64 |
389 |
- third_party/webrtc/rtc_base/third_party/sigslot |
390 |
- third_party/widevine |
391 |
- third_party/woff2 |
392 |
- third_party/zlib/google |
393 |
- url/third_party/mozilla |
394 |
- v8/src/third_party/valgrind |
395 |
- v8/src/third_party/utf8-decoder |
396 |
- v8/third_party/inspector_protocol |
397 |
- v8/third_party/v8 |
398 |
- |
399 |
- # gyp -> gn leftovers |
400 |
- base/third_party/libevent |
401 |
- third_party/adobe |
402 |
- third_party/speech-dispatcher |
403 |
- third_party/usb_ids |
404 |
- third_party/xdg-utils |
405 |
- third_party/yasm/run_yasm.py |
406 |
- ) |
407 |
- if ! use system-ffmpeg; then |
408 |
- keeplibs+=( third_party/ffmpeg third_party/opus ) |
409 |
- fi |
410 |
- if ! use system-icu; then |
411 |
- keeplibs+=( third_party/icu ) |
412 |
- fi |
413 |
- if ! use system-libvpx; then |
414 |
- keeplibs+=( third_party/libvpx ) |
415 |
- keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc ) |
416 |
- fi |
417 |
- if use tcmalloc; then |
418 |
- keeplibs+=( third_party/tcmalloc ) |
419 |
- fi |
420 |
- |
421 |
- # Remove most bundled libraries. Some are still needed. |
422 |
- build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die |
423 |
-} |
424 |
- |
425 |
-src_configure() { |
426 |
- # Calling this here supports resumption via FEATURES=keepwork |
427 |
- python_setup |
428 |
- |
429 |
- local myconf_gn="" |
430 |
- |
431 |
- # Make sure the build system will use the right tools, bug #340795. |
432 |
- tc-export AR CC CXX NM |
433 |
- |
434 |
- if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then |
435 |
- # Force clang since gcc is pretty broken at the moment. |
436 |
- CC=${CHOST}-clang |
437 |
- CXX=${CHOST}-clang++ |
438 |
- strip-unsupported-flags |
439 |
- fi |
440 |
- |
441 |
- if tc-is-clang; then |
442 |
- myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" |
443 |
- else |
444 |
- myconf_gn+=" is_clang=false" |
445 |
- fi |
446 |
- |
447 |
- # Define a custom toolchain for GN |
448 |
- myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" |
449 |
- |
450 |
- if tc-is-cross-compiler; then |
451 |
- tc-export BUILD_{AR,CC,CXX,NM} |
452 |
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\"" |
453 |
- myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\"" |
454 |
- else |
455 |
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" |
456 |
- fi |
457 |
- |
458 |
- # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. |
459 |
- myconf_gn+=" is_debug=false" |
460 |
- |
461 |
- # Component build isn't generally intended for use by end users. It's mostly useful |
462 |
- # for development and debugging. |
463 |
- myconf_gn+=" is_component_build=$(usex component-build true false)" |
464 |
- |
465 |
- # https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md |
466 |
- myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)" |
467 |
- |
468 |
- myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")" |
469 |
- |
470 |
- # Disable nacl, we can't build without pnacl (http://crbug.com/269560). |
471 |
- myconf_gn+=" enable_nacl=false" |
472 |
- |
473 |
- # Use system-provided libraries. |
474 |
- # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733). |
475 |
- # TODO: use_system_hunspell (upstream changes needed). |
476 |
- # TODO: use_system_libsrtp (bug #459932). |
477 |
- # TODO: use_system_protobuf (bug #525560). |
478 |
- # TODO: use_system_ssl (http://crbug.com/58087). |
479 |
- # TODO: use_system_sqlite (http://crbug.com/22208). |
480 |
- |
481 |
- # libevent: https://bugs.gentoo.org/593458 |
482 |
- local gn_system_libraries=( |
483 |
- flac |
484 |
- fontconfig |
485 |
- freetype |
486 |
- # Need harfbuzz_from_pkgconfig target |
487 |
- #harfbuzz-ng |
488 |
- libdrm |
489 |
- libjpeg |
490 |
- libpng |
491 |
- libwebp |
492 |
- libxml |
493 |
- libxslt |
494 |
- openh264 |
495 |
- re2 |
496 |
- snappy |
497 |
- yasm |
498 |
- zlib |
499 |
- ) |
500 |
- if use system-ffmpeg; then |
501 |
- gn_system_libraries+=( ffmpeg opus ) |
502 |
- fi |
503 |
- if use system-icu; then |
504 |
- gn_system_libraries+=( icu ) |
505 |
- fi |
506 |
- if use system-libvpx; then |
507 |
- gn_system_libraries+=( libvpx ) |
508 |
- fi |
509 |
- build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die |
510 |
- |
511 |
- # See dependency logic in third_party/BUILD.gn |
512 |
- myconf_gn+=" use_system_harfbuzz=true" |
513 |
- |
514 |
- # Optional dependencies. |
515 |
- myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)" |
516 |
- myconf_gn+=" enable_widevine=$(usex widevine true false)" |
517 |
- myconf_gn+=" use_cups=$(usex cups true false)" |
518 |
- myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)" |
519 |
- myconf_gn+=" use_kerberos=$(usex kerberos true false)" |
520 |
- myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)" |
521 |
- |
522 |
- # TODO: link_pulseaudio=true for GN. |
523 |
- |
524 |
- myconf_gn+=" fieldtrial_testing_like_official_build=true" |
525 |
- |
526 |
- # Never use bundled gold binary. Disable gold linker flags for now. |
527 |
- # Do not use bundled clang. |
528 |
- # Trying to use gold results in linker crash. |
529 |
- myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false" |
530 |
- |
531 |
- # Disable forced lld, bug 641556 |
532 |
- myconf_gn+=" use_lld=false" |
533 |
- |
534 |
- ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" |
535 |
- myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)" |
536 |
- myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\"" |
537 |
- |
538 |
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . |
539 |
- # Note: these are for Gentoo use ONLY. For your own distribution, |
540 |
- # please get your own set of keys. Feel free to contact chromium@g.o |
541 |
- # for more info. |
542 |
- local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc" |
543 |
- local google_default_client_id="329227923882.apps.googleusercontent.com" |
544 |
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" |
545 |
- myconf_gn+=" google_api_key=\"${google_api_key}\"" |
546 |
- myconf_gn+=" google_default_client_id=\"${google_default_client_id}\"" |
547 |
- myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\"" |
548 |
- |
549 |
- local myarch="$(tc-arch)" |
550 |
- |
551 |
- # Avoid CFLAGS problems, bug #352457, bug #390147. |
552 |
- if ! use custom-cflags; then |
553 |
- replace-flags "-Os" "-O2" |
554 |
- strip-flags |
555 |
- |
556 |
- # Prevent linker from running out of address space, bug #471810 . |
557 |
- if use x86; then |
558 |
- filter-flags "-g*" |
559 |
- fi |
560 |
- |
561 |
- # Prevent libvpx build failures. Bug 530248, 544702, 546984. |
562 |
- if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then |
563 |
- filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 |
564 |
- fi |
565 |
- fi |
566 |
- |
567 |
- if [[ $myarch = amd64 ]] ; then |
568 |
- myconf_gn+=" target_cpu=\"x64\"" |
569 |
- ffmpeg_target_arch=x64 |
570 |
- elif [[ $myarch = x86 ]] ; then |
571 |
- myconf_gn+=" target_cpu=\"x86\"" |
572 |
- ffmpeg_target_arch=ia32 |
573 |
- |
574 |
- # This is normally defined by compiler_cpu_abi in |
575 |
- # build/config/compiler/BUILD.gn, but we patch that part out. |
576 |
- append-flags -msse2 -mfpmath=sse -mmmx |
577 |
- elif [[ $myarch = arm64 ]] ; then |
578 |
- myconf_gn+=" target_cpu=\"arm64\"" |
579 |
- ffmpeg_target_arch=arm64 |
580 |
- elif [[ $myarch = arm ]] ; then |
581 |
- myconf_gn+=" target_cpu=\"arm\"" |
582 |
- ffmpeg_target_arch=$(usex neon arm-neon arm) |
583 |
- else |
584 |
- die "Failed to determine target arch, got '$myarch'." |
585 |
- fi |
586 |
- |
587 |
- # Make sure that -Werror doesn't get added to CFLAGS by the build system. |
588 |
- # Depending on GCC version the warnings are different and we don't want |
589 |
- # the build to fail because of that. |
590 |
- myconf_gn+=" treat_warnings_as_errors=false" |
591 |
- |
592 |
- # Disable fatal linker warnings, bug 506268. |
593 |
- myconf_gn+=" fatal_linker_warnings=false" |
594 |
- |
595 |
- # https://bugs.gentoo.org/588596 |
596 |
- #append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) |
597 |
- |
598 |
- # Bug 491582. |
599 |
- export TMPDIR="${WORKDIR}/temp" |
600 |
- mkdir -p -m 755 "${TMPDIR}" || die |
601 |
- |
602 |
- # https://bugs.gentoo.org/654216 |
603 |
- addpredict /dev/dri/ #nowarn |
604 |
- |
605 |
- #if ! use system-ffmpeg; then |
606 |
- if false; then |
607 |
- local build_ffmpeg_args="" |
608 |
- if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then |
609 |
- build_ffmpeg_args+=" --disable-asm" |
610 |
- fi |
611 |
- |
612 |
- # Re-configure bundled ffmpeg. See bug #491378 for example reasons. |
613 |
- einfo "Configuring bundled ffmpeg..." |
614 |
- pushd third_party/ffmpeg > /dev/null || die |
615 |
- chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ |
616 |
- --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die |
617 |
- chromium/scripts/copy_config.sh || die |
618 |
- chromium/scripts/generate_gn.py || die |
619 |
- popd > /dev/null || die |
620 |
- fi |
621 |
- |
622 |
- einfo "Configuring Chromium..." |
623 |
- set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release |
624 |
- echo "$@" |
625 |
- "$@" || die |
626 |
-} |
627 |
- |
628 |
-src_compile() { |
629 |
- # Final link uses lots of file descriptors. |
630 |
- ulimit -n 2048 |
631 |
- |
632 |
- # Calling this here supports resumption via FEATURES=keepwork |
633 |
- python_setup |
634 |
- |
635 |
- #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die |
636 |
- |
637 |
- # Work around broken deps |
638 |
- eninja -C out/Release gen/ui/accessibility/ax_enums.mojom{,-shared}.h |
639 |
- |
640 |
- # Build mksnapshot and pax-mark it. |
641 |
- local x |
642 |
- for x in mksnapshot v8_context_snapshot_generator; do |
643 |
- if tc-is-cross-compiler; then |
644 |
- eninja -C out/Release "host/${x}" |
645 |
- pax-mark m "out/Release/host/${x}" |
646 |
- else |
647 |
- eninja -C out/Release "${x}" |
648 |
- pax-mark m "out/Release/${x}" |
649 |
- fi |
650 |
- done |
651 |
- |
652 |
- # Even though ninja autodetects number of CPUs, we respect |
653 |
- # user's options, for debugging with -j 1 or any other reason. |
654 |
- eninja -C out/Release chrome chromedriver |
655 |
- use suid && eninja -C out/Release chrome_sandbox |
656 |
- |
657 |
- pax-mark m out/Release/chrome |
658 |
-} |
659 |
- |
660 |
-src_install() { |
661 |
- local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" |
662 |
- exeinto "${CHROMIUM_HOME}" |
663 |
- doexe out/Release/chrome |
664 |
- |
665 |
- if use suid; then |
666 |
- newexe out/Release/chrome_sandbox chrome-sandbox |
667 |
- fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" |
668 |
- fi |
669 |
- |
670 |
- doexe out/Release/chromedriver |
671 |
- |
672 |
- local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) |
673 |
- sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die |
674 |
- doexe chromium-launcher.sh |
675 |
- |
676 |
- # It is important that we name the target "chromium-browser", |
677 |
- # xdg-utils expect it; bug #355517. |
678 |
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser |
679 |
- # keep the old symlink around for consistency |
680 |
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium |
681 |
- |
682 |
- dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver |
683 |
- |
684 |
- # Allow users to override command-line options, bug #357629. |
685 |
- insinto /etc/chromium |
686 |
- newins "${FILESDIR}/chromium.default" "default" |
687 |
- |
688 |
- pushd out/Release/locales > /dev/null || die |
689 |
- chromium_remove_language_paks |
690 |
- popd |
691 |
- |
692 |
- insinto "${CHROMIUM_HOME}" |
693 |
- doins out/Release/*.bin |
694 |
- doins out/Release/*.pak |
695 |
- doins out/Release/*.so |
696 |
- |
697 |
- if ! use system-icu; then |
698 |
- doins out/Release/icudtl.dat |
699 |
- fi |
700 |
- |
701 |
- doins -r out/Release/locales |
702 |
- doins -r out/Release/resources |
703 |
- |
704 |
- if [[ -d out/Release/swiftshader ]]; then |
705 |
- insinto "${CHROMIUM_HOME}/swiftshader" |
706 |
- doins out/Release/swiftshader/*.so |
707 |
- fi |
708 |
- |
709 |
- # Install icons and desktop entry. |
710 |
- local branding size |
711 |
- for size in 16 22 24 32 48 64 128 256 ; do |
712 |
- case ${size} in |
713 |
- 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; |
714 |
- *) branding="chrome/app/theme/chromium" ;; |
715 |
- esac |
716 |
- newicon -s ${size} "${branding}/product_logo_${size}.png" \ |
717 |
- chromium-browser.png |
718 |
- done |
719 |
- |
720 |
- local mime_types="text/html;text/xml;application/xhtml+xml;" |
721 |
- mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 |
722 |
- mime_types+="x-scheme-handler/ftp;" # bug #412185 |
723 |
- mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 |
724 |
- make_desktop_entry \ |
725 |
- chromium-browser \ |
726 |
- "Chromium" \ |
727 |
- chromium-browser \ |
728 |
- "Network;WebBrowser" \ |
729 |
- "MimeType=${mime_types}\nStartupWMClass=chromium-browser" |
730 |
- sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die |
731 |
- |
732 |
- # Install GNOME default application entry (bug #303100). |
733 |
- insinto /usr/share/gnome-control-center/default-apps |
734 |
- newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml |
735 |
- |
736 |
- readme.gentoo_create_doc |
737 |
-} |
738 |
- |
739 |
-pkg_postrm() { |
740 |
- if type gtk-update-icon-cache &>/dev/null; then |
741 |
- ebegin "Updating GTK icon cache" |
742 |
- gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor" |
743 |
- eend $? |
744 |
- fi |
745 |
- xdg_desktop_database_update |
746 |
-} |
747 |
- |
748 |
-pkg_postinst() { |
749 |
- if type gtk-update-icon-cache &>/dev/null; then |
750 |
- ebegin "Updating GTK icon cache" |
751 |
- gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor" |
752 |
- eend $? |
753 |
- fi |
754 |
- xdg_desktop_database_update |
755 |
- readme.gentoo_print_elog |
756 |
-} |
757 |
|
758 |
diff --git a/www-client/chromium/chromium-72.0.3595.2.ebuild b/www-client/chromium/chromium-72.0.3595.2.ebuild |
759 |
deleted file mode 100644 |
760 |
index 7005f32011c..00000000000 |
761 |
--- a/www-client/chromium/chromium-72.0.3595.2.ebuild |
762 |
+++ /dev/null |
763 |
@@ -1,715 +0,0 @@ |
764 |
-# Copyright 1999-2018 Gentoo Authors |
765 |
-# Distributed under the terms of the GNU General Public License v2 |
766 |
- |
767 |
-EAPI=7 |
768 |
-PYTHON_COMPAT=( python2_7 ) |
769 |
- |
770 |
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he |
771 |
- 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 |
772 |
- sv sw ta te th tr uk vi zh-CN zh-TW" |
773 |
- |
774 |
-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 |
775 |
- |
776 |
-DESCRIPTION="Open-source version of Google Chrome web browser" |
777 |
-HOMEPAGE="http://chromium.org/" |
778 |
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" |
779 |
- |
780 |
-LICENSE="BSD" |
781 |
-SLOT="0" |
782 |
-KEYWORDS="~amd64 ~x86" |
783 |
-IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine" |
784 |
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" |
785 |
- |
786 |
-COMMON_DEPEND=" |
787 |
- >=app-accessibility/at-spi2-atk-2.26:2 |
788 |
- app-arch/bzip2:= |
789 |
- cups? ( >=net-print/cups-1.3.11:= ) |
790 |
- >=dev-libs/atk-2.26 |
791 |
- dev-libs/expat:= |
792 |
- dev-libs/glib:2 |
793 |
- system-icu? ( >=dev-libs/icu-59:= ) |
794 |
- >=dev-libs/libxml2-2.9.4-r3:=[icu] |
795 |
- dev-libs/libxslt:= |
796 |
- dev-libs/nspr:= |
797 |
- >=dev-libs/nss-3.26:= |
798 |
- >=dev-libs/re2-0.2016.11.01:= |
799 |
- gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) |
800 |
- >=media-libs/alsa-lib-1.0.19:= |
801 |
- media-libs/fontconfig:= |
802 |
- media-libs/freetype:= |
803 |
- >=media-libs/harfbuzz-2.0.0:0=[icu(-)] |
804 |
- media-libs/libjpeg-turbo:= |
805 |
- media-libs/libpng:= |
806 |
- system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) |
807 |
- >=media-libs/openh264-1.6.0:= |
808 |
- pulseaudio? ( media-sound/pulseaudio:= ) |
809 |
- system-ffmpeg? ( |
810 |
- >=media-video/ffmpeg-4:= |
811 |
- || ( |
812 |
- media-video/ffmpeg[-samba] |
813 |
- >=net-fs/samba-4.5.10-r1[-debug(-)] |
814 |
- ) |
815 |
- !=net-fs/samba-4.5.12-r0 |
816 |
- media-libs/opus:= |
817 |
- ) |
818 |
- sys-apps/dbus:= |
819 |
- sys-apps/pciutils:= |
820 |
- virtual/udev |
821 |
- x11-libs/cairo:= |
822 |
- x11-libs/gdk-pixbuf:2 |
823 |
- x11-libs/gtk+:3[X] |
824 |
- x11-libs/libX11:= |
825 |
- x11-libs/libXcomposite:= |
826 |
- x11-libs/libXcursor:= |
827 |
- x11-libs/libXdamage:= |
828 |
- x11-libs/libXext:= |
829 |
- x11-libs/libXfixes:= |
830 |
- >=x11-libs/libXi-1.6.0:= |
831 |
- x11-libs/libXrandr:= |
832 |
- x11-libs/libXrender:= |
833 |
- x11-libs/libXScrnSaver:= |
834 |
- x11-libs/libXtst:= |
835 |
- x11-libs/pango:= |
836 |
- app-arch/snappy:= |
837 |
- media-libs/flac:= |
838 |
- >=media-libs/libwebp-0.4.0:= |
839 |
- sys-libs/zlib:=[minizip] |
840 |
- kerberos? ( virtual/krb5 ) |
841 |
-" |
842 |
-# For nvidia-drivers blocker, see bug #413637 . |
843 |
-RDEPEND="${COMMON_DEPEND} |
844 |
- !<www-plugins/chrome-binary-plugins-57 |
845 |
- x11-misc/xdg-utils |
846 |
- virtual/opengl |
847 |
- virtual/ttf-fonts |
848 |
- selinux? ( sec-policy/selinux-chromium ) |
849 |
- tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) |
850 |
- widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] ) |
851 |
-" |
852 |
-# dev-vcs/git - https://bugs.gentoo.org/593476 |
853 |
-# sys-apps/sandbox - https://crbug.com/586444 |
854 |
-DEPEND="${COMMON_DEPEND} |
855 |
-" |
856 |
-BDEPEND=" |
857 |
- >=app-arch/gzip-1.7 |
858 |
- !arm? ( |
859 |
- dev-lang/yasm |
860 |
- ) |
861 |
- dev-lang/perl |
862 |
- dev-util/gn |
863 |
- >=dev-util/gperf-3.0.3 |
864 |
- >=dev-util/ninja-1.7.2 |
865 |
- >=net-libs/nodejs-7.6.0[inspector] |
866 |
- sys-apps/hwids[usb(+)] |
867 |
- >=sys-devel/bison-2.4.3 |
868 |
- sys-devel/flex |
869 |
- virtual/pkgconfig |
870 |
- dev-vcs/git |
871 |
-" |
872 |
- |
873 |
-: ${CHROMIUM_FORCE_CLANG=no} |
874 |
- |
875 |
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then |
876 |
- BDEPEND+=" >=sys-devel/clang-5" |
877 |
-fi |
878 |
- |
879 |
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then |
880 |
- EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; |
881 |
-fi |
882 |
- |
883 |
-DISABLE_AUTOFORMATTING="yes" |
884 |
-DOC_CONTENTS=" |
885 |
-Some web pages may require additional fonts to display properly. |
886 |
-Try installing some of the following packages if some characters |
887 |
-are not displayed properly: |
888 |
-- media-fonts/arphicfonts |
889 |
-- media-fonts/droid |
890 |
-- media-fonts/ipamonafont |
891 |
-- media-fonts/noto |
892 |
-- media-fonts/ja-ipafonts |
893 |
-- media-fonts/takao-fonts |
894 |
-- media-fonts/wqy-microhei |
895 |
-- media-fonts/wqy-zenhei |
896 |
- |
897 |
-To fix broken icons on the Downloads page, you should install an icon |
898 |
-theme that covers the appropriate MIME types, and configure this as your |
899 |
-GTK+ icon theme. |
900 |
-" |
901 |
- |
902 |
-PATCHES=( |
903 |
- "${FILESDIR}/chromium-compiler-r7.patch" |
904 |
- "${FILESDIR}/chromium-widevine-r3.patch" |
905 |
- "${FILESDIR}/chromium-webrtc-r0.patch" |
906 |
- "${FILESDIR}/chromium-memcpy-r0.patch" |
907 |
- "${FILESDIR}/chromium-math.h-r0.patch" |
908 |
- "${FILESDIR}/chromium-stdint.patch" |
909 |
- "${FILESDIR}/chromium-harfbuzz-r0.patch" |
910 |
-) |
911 |
- |
912 |
-pre_build_checks() { |
913 |
- #if [[ ${MERGE_TYPE} != binary ]]; then |
914 |
- # local -x CPP="$(tc-getCXX) -E" |
915 |
- # if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then |
916 |
- # # bugs: #601654 |
917 |
- # die "At least clang 3.9.1 is required" |
918 |
- # fi |
919 |
- # if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then |
920 |
- # # bugs: #535730, #525374, #518668, #600288, #627356 |
921 |
- # die "At least gcc 5.0 is required" |
922 |
- # fi |
923 |
- #fi |
924 |
- |
925 |
- # Check build requirements, bug #541816 and bug #471810 . |
926 |
- CHECKREQS_MEMORY="3G" |
927 |
- CHECKREQS_DISK_BUILD="5G" |
928 |
- if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then |
929 |
- CHECKREQS_DISK_BUILD="25G" |
930 |
- if ! use component-build; then |
931 |
- CHECKREQS_MEMORY="16G" |
932 |
- fi |
933 |
- fi |
934 |
- check-reqs_pkg_setup |
935 |
-} |
936 |
- |
937 |
-pkg_pretend() { |
938 |
- pre_build_checks |
939 |
-} |
940 |
- |
941 |
-pkg_setup() { |
942 |
- pre_build_checks |
943 |
- |
944 |
- chromium_suid_sandbox_check_kernel_config |
945 |
-} |
946 |
- |
947 |
-src_prepare() { |
948 |
- # Calling this here supports resumption via FEATURES=keepwork |
949 |
- python_setup |
950 |
- |
951 |
- default |
952 |
- |
953 |
- mkdir -p third_party/node/linux/node-linux-x64/bin || die |
954 |
- ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die |
955 |
- |
956 |
- local keeplibs=( |
957 |
- base/third_party/dmg_fp |
958 |
- base/third_party/dynamic_annotations |
959 |
- base/third_party/icu |
960 |
- base/third_party/nspr |
961 |
- base/third_party/superfasthash |
962 |
- base/third_party/symbolize |
963 |
- base/third_party/valgrind |
964 |
- base/third_party/xdg_mime |
965 |
- base/third_party/xdg_user_dirs |
966 |
- buildtools/third_party/libc++ |
967 |
- buildtools/third_party/libc++abi |
968 |
- chrome/third_party/mozilla_security_manager |
969 |
- courgette/third_party |
970 |
- net/third_party/http2 |
971 |
- net/third_party/mozilla_security_manager |
972 |
- net/third_party/nss |
973 |
- net/third_party/quic |
974 |
- net/third_party/spdy |
975 |
- net/third_party/uri_template |
976 |
- third_party/WebKit |
977 |
- third_party/abseil-cpp |
978 |
- third_party/analytics |
979 |
- third_party/angle |
980 |
- third_party/angle/src/common/third_party/base |
981 |
- third_party/angle/src/common/third_party/smhasher |
982 |
- third_party/angle/src/third_party/compiler |
983 |
- third_party/angle/src/third_party/libXNVCtrl |
984 |
- third_party/angle/src/third_party/trace_event |
985 |
- third_party/angle/third_party/glslang |
986 |
- third_party/angle/third_party/spirv-headers |
987 |
- third_party/angle/third_party/spirv-tools |
988 |
- third_party/angle/third_party/vulkan-headers |
989 |
- third_party/angle/third_party/vulkan-loader |
990 |
- third_party/angle/third_party/vulkan-tools |
991 |
- third_party/angle/third_party/vulkan-validation-layers |
992 |
- third_party/apple_apsl |
993 |
- third_party/blink |
994 |
- third_party/boringssl |
995 |
- third_party/boringssl/src/third_party/fiat |
996 |
- third_party/breakpad |
997 |
- third_party/breakpad/breakpad/src/third_party/curl |
998 |
- third_party/brotli |
999 |
- third_party/cacheinvalidation |
1000 |
- third_party/catapult |
1001 |
- third_party/catapult/common/py_vulcanize/third_party/rcssmin |
1002 |
- third_party/catapult/common/py_vulcanize/third_party/rjsmin |
1003 |
- third_party/catapult/third_party/beautifulsoup4 |
1004 |
- third_party/catapult/third_party/html5lib-python |
1005 |
- third_party/catapult/third_party/polymer |
1006 |
- third_party/catapult/third_party/six |
1007 |
- third_party/catapult/tracing/third_party/d3 |
1008 |
- third_party/catapult/tracing/third_party/gl-matrix |
1009 |
- third_party/catapult/tracing/third_party/jszip |
1010 |
- third_party/catapult/tracing/third_party/mannwhitneyu |
1011 |
- third_party/catapult/tracing/third_party/oboe |
1012 |
- third_party/catapult/tracing/third_party/pako |
1013 |
- third_party/ced |
1014 |
- third_party/cld_3 |
1015 |
- third_party/closure_compiler |
1016 |
- third_party/crashpad |
1017 |
- third_party/crashpad/crashpad/third_party/zlib |
1018 |
- third_party/crc32c |
1019 |
- third_party/cros_system_api |
1020 |
- third_party/devscripts |
1021 |
- third_party/dom_distiller_js |
1022 |
- third_party/fips181 |
1023 |
- third_party/flatbuffers |
1024 |
- third_party/flot |
1025 |
- third_party/freetype |
1026 |
- third_party/glslang-angle |
1027 |
- third_party/google_input_tools |
1028 |
- third_party/google_input_tools/third_party/closure_library |
1029 |
- third_party/google_input_tools/third_party/closure_library/third_party/closure |
1030 |
- third_party/googletest |
1031 |
- third_party/hunspell |
1032 |
- third_party/iccjpeg |
1033 |
- third_party/inspector_protocol |
1034 |
- third_party/jinja2 |
1035 |
- third_party/jsoncpp |
1036 |
- third_party/jstemplate |
1037 |
- third_party/khronos |
1038 |
- third_party/leveldatabase |
1039 |
- third_party/libXNVCtrl |
1040 |
- third_party/libaddressinput |
1041 |
- third_party/libaom |
1042 |
- third_party/libaom/source/libaom/third_party/vector |
1043 |
- third_party/libaom/source/libaom/third_party/x86inc |
1044 |
- third_party/libjingle |
1045 |
- third_party/libphonenumber |
1046 |
- third_party/libsecret |
1047 |
- third_party/libsrtp |
1048 |
- third_party/libsync |
1049 |
- third_party/libudev |
1050 |
- third_party/libwebm |
1051 |
- third_party/libxml/chromium |
1052 |
- third_party/libyuv |
1053 |
- third_party/llvm |
1054 |
- third_party/lss |
1055 |
- third_party/lzma_sdk |
1056 |
- third_party/markupsafe |
1057 |
- third_party/mesa |
1058 |
- third_party/metrics_proto |
1059 |
- third_party/modp_b64 |
1060 |
- third_party/node |
1061 |
- third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2 |
1062 |
- third_party/openmax_dl |
1063 |
- third_party/ots |
1064 |
- third_party/pdfium |
1065 |
- third_party/pdfium/third_party/agg23 |
1066 |
- third_party/pdfium/third_party/base |
1067 |
- third_party/pdfium/third_party/bigint |
1068 |
- third_party/pdfium/third_party/freetype |
1069 |
- third_party/pdfium/third_party/lcms |
1070 |
- third_party/pdfium/third_party/libopenjpeg20 |
1071 |
- third_party/pdfium/third_party/libpng16 |
1072 |
- third_party/pdfium/third_party/libtiff |
1073 |
- third_party/pdfium/third_party/skia_shared |
1074 |
- third_party/perfetto |
1075 |
- third_party/ply |
1076 |
- third_party/polymer |
1077 |
- third_party/protobuf |
1078 |
- third_party/protobuf/third_party/six |
1079 |
- third_party/pyjson5 |
1080 |
- third_party/qcms |
1081 |
- third_party/rnnoise |
1082 |
- third_party/s2cellid |
1083 |
- third_party/sfntly |
1084 |
- third_party/simplejson |
1085 |
- third_party/skia |
1086 |
- third_party/skia/third_party/gif |
1087 |
- third_party/skia/third_party/skcms |
1088 |
- third_party/skia/third_party/vulkan |
1089 |
- third_party/smhasher |
1090 |
- third_party/spirv-headers |
1091 |
- third_party/SPIRV-Tools |
1092 |
- third_party/spirv-tools-angle |
1093 |
- third_party/sqlite |
1094 |
- third_party/swiftshader |
1095 |
- third_party/swiftshader/third_party/llvm-subzero |
1096 |
- third_party/swiftshader/third_party/subzero |
1097 |
- third_party/unrar |
1098 |
- third_party/usrsctp |
1099 |
- third_party/vulkan |
1100 |
- third_party/vulkan-validation-layers |
1101 |
- third_party/web-animations-js |
1102 |
- third_party/webdriver |
1103 |
- third_party/webrtc |
1104 |
- third_party/webrtc/common_audio/third_party/fft4g |
1105 |
- third_party/webrtc/common_audio/third_party/spl_sqrt_floor |
1106 |
- third_party/webrtc/modules/third_party/fft |
1107 |
- third_party/webrtc/modules/third_party/g711 |
1108 |
- third_party/webrtc/modules/third_party/g722 |
1109 |
- third_party/webrtc/rtc_base/third_party/base64 |
1110 |
- third_party/webrtc/rtc_base/third_party/sigslot |
1111 |
- third_party/widevine |
1112 |
- third_party/woff2 |
1113 |
- third_party/zlib/google |
1114 |
- url/third_party/mozilla |
1115 |
- v8/src/third_party/valgrind |
1116 |
- v8/src/third_party/utf8-decoder |
1117 |
- v8/third_party/inspector_protocol |
1118 |
- v8/third_party/v8 |
1119 |
- |
1120 |
- # gyp -> gn leftovers |
1121 |
- base/third_party/libevent |
1122 |
- third_party/adobe |
1123 |
- third_party/speech-dispatcher |
1124 |
- third_party/usb_ids |
1125 |
- third_party/xdg-utils |
1126 |
- third_party/yasm/run_yasm.py |
1127 |
- ) |
1128 |
- if ! use system-ffmpeg; then |
1129 |
- keeplibs+=( third_party/ffmpeg third_party/opus ) |
1130 |
- fi |
1131 |
- if ! use system-icu; then |
1132 |
- keeplibs+=( third_party/icu ) |
1133 |
- fi |
1134 |
- if ! use system-libvpx; then |
1135 |
- keeplibs+=( third_party/libvpx ) |
1136 |
- keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc ) |
1137 |
- fi |
1138 |
- if use tcmalloc; then |
1139 |
- keeplibs+=( third_party/tcmalloc ) |
1140 |
- fi |
1141 |
- |
1142 |
- # Remove most bundled libraries. Some are still needed. |
1143 |
- build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die |
1144 |
-} |
1145 |
- |
1146 |
-src_configure() { |
1147 |
- # Calling this here supports resumption via FEATURES=keepwork |
1148 |
- python_setup |
1149 |
- |
1150 |
- local myconf_gn="" |
1151 |
- |
1152 |
- # Make sure the build system will use the right tools, bug #340795. |
1153 |
- tc-export AR CC CXX NM |
1154 |
- |
1155 |
- if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then |
1156 |
- # Force clang since gcc is pretty broken at the moment. |
1157 |
- CC=${CHOST}-clang |
1158 |
- CXX=${CHOST}-clang++ |
1159 |
- strip-unsupported-flags |
1160 |
- fi |
1161 |
- |
1162 |
- if tc-is-clang; then |
1163 |
- myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" |
1164 |
- else |
1165 |
- myconf_gn+=" is_clang=false" |
1166 |
- fi |
1167 |
- |
1168 |
- # Define a custom toolchain for GN |
1169 |
- myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" |
1170 |
- |
1171 |
- if tc-is-cross-compiler; then |
1172 |
- tc-export BUILD_{AR,CC,CXX,NM} |
1173 |
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\"" |
1174 |
- myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\"" |
1175 |
- else |
1176 |
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" |
1177 |
- fi |
1178 |
- |
1179 |
- # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. |
1180 |
- myconf_gn+=" is_debug=false" |
1181 |
- |
1182 |
- # Component build isn't generally intended for use by end users. It's mostly useful |
1183 |
- # for development and debugging. |
1184 |
- myconf_gn+=" is_component_build=$(usex component-build true false)" |
1185 |
- |
1186 |
- # https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md |
1187 |
- myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)" |
1188 |
- |
1189 |
- myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")" |
1190 |
- |
1191 |
- # Disable nacl, we can't build without pnacl (http://crbug.com/269560). |
1192 |
- myconf_gn+=" enable_nacl=false" |
1193 |
- |
1194 |
- # Use system-provided libraries. |
1195 |
- # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733). |
1196 |
- # TODO: use_system_hunspell (upstream changes needed). |
1197 |
- # TODO: use_system_libsrtp (bug #459932). |
1198 |
- # TODO: use_system_protobuf (bug #525560). |
1199 |
- # TODO: use_system_ssl (http://crbug.com/58087). |
1200 |
- # TODO: use_system_sqlite (http://crbug.com/22208). |
1201 |
- |
1202 |
- # libevent: https://bugs.gentoo.org/593458 |
1203 |
- local gn_system_libraries=( |
1204 |
- flac |
1205 |
- fontconfig |
1206 |
- freetype |
1207 |
- # Need harfbuzz_from_pkgconfig target |
1208 |
- #harfbuzz-ng |
1209 |
- libdrm |
1210 |
- libjpeg |
1211 |
- libpng |
1212 |
- libwebp |
1213 |
- libxml |
1214 |
- libxslt |
1215 |
- openh264 |
1216 |
- re2 |
1217 |
- snappy |
1218 |
- yasm |
1219 |
- zlib |
1220 |
- ) |
1221 |
- if use system-ffmpeg; then |
1222 |
- gn_system_libraries+=( ffmpeg opus ) |
1223 |
- fi |
1224 |
- if use system-icu; then |
1225 |
- gn_system_libraries+=( icu ) |
1226 |
- fi |
1227 |
- if use system-libvpx; then |
1228 |
- gn_system_libraries+=( libvpx ) |
1229 |
- fi |
1230 |
- build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die |
1231 |
- |
1232 |
- # See dependency logic in third_party/BUILD.gn |
1233 |
- myconf_gn+=" use_system_harfbuzz=true" |
1234 |
- |
1235 |
- # Optional dependencies. |
1236 |
- myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)" |
1237 |
- myconf_gn+=" enable_widevine=$(usex widevine true false)" |
1238 |
- myconf_gn+=" use_cups=$(usex cups true false)" |
1239 |
- myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)" |
1240 |
- myconf_gn+=" use_kerberos=$(usex kerberos true false)" |
1241 |
- myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)" |
1242 |
- |
1243 |
- # TODO: link_pulseaudio=true for GN. |
1244 |
- |
1245 |
- myconf_gn+=" fieldtrial_testing_like_official_build=true" |
1246 |
- |
1247 |
- # Never use bundled gold binary. Disable gold linker flags for now. |
1248 |
- # Do not use bundled clang. |
1249 |
- # Trying to use gold results in linker crash. |
1250 |
- myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false" |
1251 |
- |
1252 |
- # Disable forced lld, bug 641556 |
1253 |
- myconf_gn+=" use_lld=false" |
1254 |
- |
1255 |
- ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" |
1256 |
- myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)" |
1257 |
- myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\"" |
1258 |
- |
1259 |
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . |
1260 |
- # Note: these are for Gentoo use ONLY. For your own distribution, |
1261 |
- # please get your own set of keys. Feel free to contact chromium@g.o |
1262 |
- # for more info. |
1263 |
- local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc" |
1264 |
- local google_default_client_id="329227923882.apps.googleusercontent.com" |
1265 |
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" |
1266 |
- myconf_gn+=" google_api_key=\"${google_api_key}\"" |
1267 |
- myconf_gn+=" google_default_client_id=\"${google_default_client_id}\"" |
1268 |
- myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\"" |
1269 |
- |
1270 |
- local myarch="$(tc-arch)" |
1271 |
- if [[ $myarch = amd64 ]] ; then |
1272 |
- myconf_gn+=" target_cpu=\"x64\"" |
1273 |
- ffmpeg_target_arch=x64 |
1274 |
- elif [[ $myarch = x86 ]] ; then |
1275 |
- myconf_gn+=" target_cpu=\"x86\"" |
1276 |
- ffmpeg_target_arch=ia32 |
1277 |
- |
1278 |
- # This is normally defined by compiler_cpu_abi in |
1279 |
- # build/config/compiler/BUILD.gn, but we patch that part out. |
1280 |
- append-flags -msse2 -mfpmath=sse -mmmx |
1281 |
- elif [[ $myarch = arm64 ]] ; then |
1282 |
- myconf_gn+=" target_cpu=\"arm64\"" |
1283 |
- ffmpeg_target_arch=arm64 |
1284 |
- elif [[ $myarch = arm ]] ; then |
1285 |
- myconf_gn+=" target_cpu=\"arm\"" |
1286 |
- ffmpeg_target_arch=$(usex neon arm-neon arm) |
1287 |
- else |
1288 |
- die "Failed to determine target arch, got '$myarch'." |
1289 |
- fi |
1290 |
- |
1291 |
- # Make sure that -Werror doesn't get added to CFLAGS by the build system. |
1292 |
- # Depending on GCC version the warnings are different and we don't want |
1293 |
- # the build to fail because of that. |
1294 |
- myconf_gn+=" treat_warnings_as_errors=false" |
1295 |
- |
1296 |
- # Disable fatal linker warnings, bug 506268. |
1297 |
- myconf_gn+=" fatal_linker_warnings=false" |
1298 |
- |
1299 |
- # Avoid CFLAGS problems, bug #352457, bug #390147. |
1300 |
- if ! use custom-cflags; then |
1301 |
- replace-flags "-Os" "-O2" |
1302 |
- strip-flags |
1303 |
- |
1304 |
- # Prevent linker from running out of address space, bug #471810 . |
1305 |
- if use x86; then |
1306 |
- filter-flags "-g*" |
1307 |
- fi |
1308 |
- |
1309 |
- # Prevent libvpx build failures. Bug 530248, 544702, 546984. |
1310 |
- if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then |
1311 |
- filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 |
1312 |
- fi |
1313 |
- fi |
1314 |
- |
1315 |
- # https://bugs.gentoo.org/588596 |
1316 |
- #append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) |
1317 |
- |
1318 |
- # Bug 491582. |
1319 |
- export TMPDIR="${WORKDIR}/temp" |
1320 |
- mkdir -p -m 755 "${TMPDIR}" || die |
1321 |
- |
1322 |
- # https://bugs.gentoo.org/654216 |
1323 |
- addpredict /dev/dri/ #nowarn |
1324 |
- |
1325 |
- #if ! use system-ffmpeg; then |
1326 |
- if false; then |
1327 |
- local build_ffmpeg_args="" |
1328 |
- if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then |
1329 |
- build_ffmpeg_args+=" --disable-asm" |
1330 |
- fi |
1331 |
- |
1332 |
- # Re-configure bundled ffmpeg. See bug #491378 for example reasons. |
1333 |
- einfo "Configuring bundled ffmpeg..." |
1334 |
- pushd third_party/ffmpeg > /dev/null || die |
1335 |
- chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ |
1336 |
- --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die |
1337 |
- chromium/scripts/copy_config.sh || die |
1338 |
- chromium/scripts/generate_gn.py || die |
1339 |
- popd > /dev/null || die |
1340 |
- fi |
1341 |
- |
1342 |
- einfo "Configuring Chromium..." |
1343 |
- set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release |
1344 |
- echo "$@" |
1345 |
- "$@" || die |
1346 |
-} |
1347 |
- |
1348 |
-src_compile() { |
1349 |
- # Final link uses lots of file descriptors. |
1350 |
- ulimit -n 2048 |
1351 |
- |
1352 |
- # Calling this here supports resumption via FEATURES=keepwork |
1353 |
- python_setup |
1354 |
- |
1355 |
- #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die |
1356 |
- |
1357 |
- # Work around broken deps |
1358 |
- eninja -C out/Release gen/ui/accessibility/ax_enums.mojom{,-shared}.h |
1359 |
- |
1360 |
-if false; then |
1361 |
- # Build mksnapshot and pax-mark it. |
1362 |
- local x |
1363 |
- for x in mksnapshot v8_context_snapshot_generator; do |
1364 |
- if tc-is-cross-compiler; then |
1365 |
- eninja -C out/Release "host/${x}" |
1366 |
- pax-mark m "out/Release/host/${x}" |
1367 |
- else |
1368 |
- eninja -C out/Release "${x}" |
1369 |
- pax-mark m "out/Release/${x}" |
1370 |
- fi |
1371 |
- done |
1372 |
-fi |
1373 |
- |
1374 |
- # Even though ninja autodetects number of CPUs, we respect |
1375 |
- # user's options, for debugging with -j 1 or any other reason. |
1376 |
- eninja -C out/Release chrome chromedriver |
1377 |
- use suid && eninja -C out/Release chrome_sandbox |
1378 |
- |
1379 |
- pax-mark m out/Release/chrome |
1380 |
-} |
1381 |
- |
1382 |
-src_install() { |
1383 |
- local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" |
1384 |
- exeinto "${CHROMIUM_HOME}" |
1385 |
- doexe out/Release/chrome |
1386 |
- |
1387 |
- if use suid; then |
1388 |
- newexe out/Release/chrome_sandbox chrome-sandbox |
1389 |
- fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" |
1390 |
- fi |
1391 |
- |
1392 |
- doexe out/Release/chromedriver |
1393 |
- |
1394 |
- local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) |
1395 |
- sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die |
1396 |
- doexe chromium-launcher.sh |
1397 |
- |
1398 |
- # It is important that we name the target "chromium-browser", |
1399 |
- # xdg-utils expect it; bug #355517. |
1400 |
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser |
1401 |
- # keep the old symlink around for consistency |
1402 |
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium |
1403 |
- |
1404 |
- dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver |
1405 |
- |
1406 |
- # Allow users to override command-line options, bug #357629. |
1407 |
- insinto /etc/chromium |
1408 |
- newins "${FILESDIR}/chromium.default" "default" |
1409 |
- |
1410 |
- pushd out/Release/locales > /dev/null || die |
1411 |
- chromium_remove_language_paks |
1412 |
- popd |
1413 |
- |
1414 |
- insinto "${CHROMIUM_HOME}" |
1415 |
- doins out/Release/*.bin |
1416 |
- doins out/Release/*.pak |
1417 |
- doins out/Release/*.so |
1418 |
- |
1419 |
- if ! use system-icu; then |
1420 |
- doins out/Release/icudtl.dat |
1421 |
- fi |
1422 |
- |
1423 |
- doins -r out/Release/locales |
1424 |
- doins -r out/Release/resources |
1425 |
- |
1426 |
- if [[ -d out/Release/swiftshader ]]; then |
1427 |
- insinto "${CHROMIUM_HOME}/swiftshader" |
1428 |
- doins out/Release/swiftshader/*.so |
1429 |
- fi |
1430 |
- |
1431 |
- # Install icons and desktop entry. |
1432 |
- local branding size |
1433 |
- for size in 16 22 24 32 48 64 128 256 ; do |
1434 |
- case ${size} in |
1435 |
- 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; |
1436 |
- *) branding="chrome/app/theme/chromium" ;; |
1437 |
- esac |
1438 |
- newicon -s ${size} "${branding}/product_logo_${size}.png" \ |
1439 |
- chromium-browser.png |
1440 |
- done |
1441 |
- |
1442 |
- local mime_types="text/html;text/xml;application/xhtml+xml;" |
1443 |
- mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 |
1444 |
- mime_types+="x-scheme-handler/ftp;" # bug #412185 |
1445 |
- mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 |
1446 |
- make_desktop_entry \ |
1447 |
- chromium-browser \ |
1448 |
- "Chromium" \ |
1449 |
- chromium-browser \ |
1450 |
- "Network;WebBrowser" \ |
1451 |
- "MimeType=${mime_types}\nStartupWMClass=chromium-browser" |
1452 |
- sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die |
1453 |
- |
1454 |
- # Install GNOME default application entry (bug #303100). |
1455 |
- insinto /usr/share/gnome-control-center/default-apps |
1456 |
- newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml |
1457 |
- |
1458 |
- readme.gentoo_create_doc |
1459 |
-} |
1460 |
- |
1461 |
-pkg_postrm() { |
1462 |
- if type gtk-update-icon-cache &>/dev/null; then |
1463 |
- ebegin "Updating GTK icon cache" |
1464 |
- gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor" |
1465 |
- eend $? |
1466 |
- fi |
1467 |
- xdg_desktop_database_update |
1468 |
-} |
1469 |
- |
1470 |
-pkg_postinst() { |
1471 |
- if type gtk-update-icon-cache &>/dev/null; then |
1472 |
- ebegin "Updating GTK icon cache" |
1473 |
- gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor" |
1474 |
- eend $? |
1475 |
- fi |
1476 |
- xdg_desktop_database_update |
1477 |
- readme.gentoo_print_elog |
1478 |
-} |
1479 |
|
1480 |
diff --git a/www-client/chromium/chromium-72.0.3626.28.ebuild b/www-client/chromium/chromium-72.0.3626.96.ebuild |
1481 |
similarity index 99% |
1482 |
rename from www-client/chromium/chromium-72.0.3626.28.ebuild |
1483 |
rename to www-client/chromium/chromium-72.0.3626.96.ebuild |
1484 |
index 6943618d3e1..e5b46a12319 100644 |
1485 |
--- a/www-client/chromium/chromium-72.0.3626.28.ebuild |
1486 |
+++ b/www-client/chromium/chromium-72.0.3626.96.ebuild |
1487 |
@@ -1,4 +1,4 @@ |
1488 |
-# Copyright 1999-2018 Gentoo Authors |
1489 |
+# Copyright 1999-2019 Gentoo Authors |
1490 |
# Distributed under the terms of the GNU General Public License v2 |
1491 |
|
1492 |
EAPI=7 |
1493 |
@@ -13,7 +13,7 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util |
1494 |
DESCRIPTION="Open-source version of Google Chrome web browser" |
1495 |
HOMEPAGE="http://chromium.org/" |
1496 |
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz |
1497 |
- https://dev.gentoo.org/~floppym/dist/chromium-webrtc-includes.patch.xz" |
1498 |
+ https://dev.gentoo.org/~floppym/dist/chromium-webrtc-includes-r1.patch.xz" |
1499 |
|
1500 |
LICENSE="BSD" |
1501 |
SLOT="0" |
1502 |
@@ -140,7 +140,7 @@ GTK+ icon theme. |
1503 |
|
1504 |
PATCHES=( |
1505 |
"${FILESDIR}/chromium-compiler-r7.patch" |
1506 |
- "${FILESDIR}/chromium-widevine-r3.patch" |
1507 |
+ "${FILESDIR}/chromium-widevine-r4.patch" |
1508 |
"${FILESDIR}/chromium-webrtc-r0.patch" |
1509 |
"${FILESDIR}/chromium-memcpy-r0.patch" |
1510 |
"${FILESDIR}/chromium-math.h-r0.patch" |
1511 |
@@ -189,7 +189,7 @@ src_prepare() { |
1512 |
default |
1513 |
|
1514 |
pushd third_party/webrtc >/dev/null || die |
1515 |
- eapply "${WORKDIR}"/chromium-webrtc-includes.patch |
1516 |
+ eapply "${WORKDIR}"/chromium-webrtc-includes-r1.patch |
1517 |
popd >/dev/null || die |
1518 |
|
1519 |
mkdir -p third_party/node/linux/node-linux-x64/bin || die |
1520 |
@@ -507,6 +507,23 @@ src_configure() { |
1521 |
myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\"" |
1522 |
|
1523 |
local myarch="$(tc-arch)" |
1524 |
+ |
1525 |
+ # Avoid CFLAGS problems, bug #352457, bug #390147. |
1526 |
+ if ! use custom-cflags; then |
1527 |
+ replace-flags "-Os" "-O2" |
1528 |
+ strip-flags |
1529 |
+ |
1530 |
+ # Prevent linker from running out of address space, bug #471810 . |
1531 |
+ if use x86; then |
1532 |
+ filter-flags "-g*" |
1533 |
+ fi |
1534 |
+ |
1535 |
+ # Prevent libvpx build failures. Bug 530248, 544702, 546984. |
1536 |
+ if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then |
1537 |
+ filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 |
1538 |
+ fi |
1539 |
+ fi |
1540 |
+ |
1541 |
if [[ $myarch = amd64 ]] ; then |
1542 |
myconf_gn+=" target_cpu=\"x64\"" |
1543 |
ffmpeg_target_arch=x64 |
1544 |
@@ -535,22 +552,6 @@ src_configure() { |
1545 |
# Disable fatal linker warnings, bug 506268. |
1546 |
myconf_gn+=" fatal_linker_warnings=false" |
1547 |
|
1548 |
- # Avoid CFLAGS problems, bug #352457, bug #390147. |
1549 |
- if ! use custom-cflags; then |
1550 |
- replace-flags "-Os" "-O2" |
1551 |
- strip-flags |
1552 |
- |
1553 |
- # Prevent linker from running out of address space, bug #471810 . |
1554 |
- if use x86; then |
1555 |
- filter-flags "-g*" |
1556 |
- fi |
1557 |
- |
1558 |
- # Prevent libvpx build failures. Bug 530248, 544702, 546984. |
1559 |
- if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then |
1560 |
- filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 |
1561 |
- fi |
1562 |
- fi |
1563 |
- |
1564 |
# https://bugs.gentoo.org/588596 |
1565 |
#append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) |
1566 |
|
1567 |
|
1568 |
diff --git a/www-client/chromium/files/chromium-70-gcc-0.patch b/www-client/chromium/files/chromium-70-gcc-0.patch |
1569 |
deleted file mode 100644 |
1570 |
index 7005d373254..00000000000 |
1571 |
--- a/www-client/chromium/files/chromium-70-gcc-0.patch |
1572 |
+++ /dev/null |
1573 |
@@ -1,70 +0,0 @@ |
1574 |
-From e98f8ef8b2f236ecbb01df8c39e6ee1c8fbe8d7d Mon Sep 17 00:00:00 2001 |
1575 |
-From: Maksim Sisov <msisov@××××××.com> |
1576 |
-Date: Thu, 13 Sep 2018 15:17:29 +0000 |
1577 |
-Subject: [PATCH] ScrollPaintPropertyNode: Rename SnapContainerData() to |
1578 |
- GetSnapContainerData() |
1579 |
- |
1580 |
-GCC is stricter than clang when it comes to class members' names and how |
1581 |
-they can change the meaning of a previously existing symbol with the same |
1582 |
-name. |
1583 |
- |
1584 |
-Here is a short error message: |
1585 |
- |
1586 |
-error: changes meaning of 'SnapContainerData' from 'using SnapContainerData = |
1587 |
-class cc::SnapContainerData' [-fpermissive] using SnapContainerData = |
1588 |
-cc::SnapContainerData; |
1589 |
- |
1590 |
-Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_slimming_paint_v2;master.tryserver.blink:linux_trusty_blink_rel |
1591 |
-Change-Id: I0de5460f17b13484253e1ff0538b111c9a3b0d13 |
1592 |
-Reviewed-on: https://chromium-review.googlesource.com/1213180 |
1593 |
-Commit-Queue: Maksim Sisov <msisov@××××××.com> |
1594 |
-Reviewed-by: Philip Rogers <pdr@××××××××.org> |
1595 |
-Cr-Commit-Position: refs/heads/master@{#591015} |
1596 |
---- |
1597 |
- .../renderer/core/paint/paint_property_tree_update_tests.cc | 2 +- |
1598 |
- .../platform/graphics/compositing/property_tree_manager.cc | 2 +- |
1599 |
- .../platform/graphics/paint/scroll_paint_property_node.h | 2 +- |
1600 |
- 3 files changed, 3 insertions(+), 3 deletions(-) |
1601 |
- |
1602 |
-diff --git a/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc b/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc |
1603 |
-index 0d999d45076f..1fe1815a5659 100644 |
1604 |
---- a/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc |
1605 |
-+++ b/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc |
1606 |
-@@ -1310,7 +1310,7 @@ TEST_P(PaintPropertyTreeUpdateTest, EnsureSnapContainerData) { |
1607 |
- GetDocument().View()->Resize(300, 300); |
1608 |
- GetDocument().View()->UpdateAllLifecyclePhases(); |
1609 |
- |
1610 |
-- auto doc_snap_container_data = DocScroll()->SnapContainerData(); |
1611 |
-+ auto doc_snap_container_data = DocScroll()->GetSnapContainerData(); |
1612 |
- ASSERT_TRUE(doc_snap_container_data); |
1613 |
- EXPECT_EQ(doc_snap_container_data->scroll_snap_type().axis, SnapAxis::kBoth); |
1614 |
- EXPECT_EQ(doc_snap_container_data->scroll_snap_type().strictness, |
1615 |
-diff --git a/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc b/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc |
1616 |
-index 745b8c8b387e..5f87eeea9435 100644 |
1617 |
---- a/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc |
1618 |
-+++ b/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc |
1619 |
-@@ -333,7 +333,7 @@ void PropertyTreeManager::CreateCompositorScrollNode( |
1620 |
- scroll_node->OverscrollBehaviorX()), |
1621 |
- static_cast<cc::OverscrollBehavior::OverscrollBehaviorType>( |
1622 |
- scroll_node->OverscrollBehaviorY())); |
1623 |
-- compositor_node.snap_container_data = scroll_node->SnapContainerData(); |
1624 |
-+ compositor_node.snap_container_data = scroll_node->GetSnapContainerData(); |
1625 |
- |
1626 |
- auto compositor_element_id = scroll_node->GetCompositorElementId(); |
1627 |
- if (compositor_element_id) { |
1628 |
-diff --git a/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h b/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h |
1629 |
-index e1479269ccc3..5bd7f65f10ba 100644 |
1630 |
---- a/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h |
1631 |
-+++ b/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h |
1632 |
-@@ -99,7 +99,7 @@ class PLATFORM_EXPORT ScrollPaintPropertyNode |
1633 |
- return state_.overscroll_behavior.y; |
1634 |
- } |
1635 |
- |
1636 |
-- base::Optional<SnapContainerData> SnapContainerData() const { |
1637 |
-+ base::Optional<SnapContainerData> GetSnapContainerData() const { |
1638 |
- return state_.snap_container_data; |
1639 |
- } |
1640 |
- |
1641 |
--- |
1642 |
-2.19.1 |
1643 |
- |
1644 |
|
1645 |
diff --git a/www-client/chromium/files/chromium-70-gcc-1.patch b/www-client/chromium/files/chromium-70-gcc-1.patch |
1646 |
deleted file mode 100644 |
1647 |
index bca2a1f8e80..00000000000 |
1648 |
--- a/www-client/chromium/files/chromium-70-gcc-1.patch |
1649 |
+++ /dev/null |
1650 |
@@ -1,98 +0,0 @@ |
1651 |
-From 87902b3202f81d689dd314c17006ffc907fe12a1 Mon Sep 17 00:00:00 2001 |
1652 |
-From: Wang Qing <wangqing-hf@××××××××.cn> |
1653 |
-Date: Mon, 3 Sep 2018 02:41:08 +0000 |
1654 |
-Subject: [PATCH] Fix build error for blink. |
1655 |
-MIME-Version: 1.0 |
1656 |
-Content-Type: text/plain; charset=UTF-8 |
1657 |
-Content-Transfer-Encoding: 8bit |
1658 |
- |
1659 |
-This CLs fixed the error of constexpr function call to non-constexpr function. |
1660 |
- |
1661 |
-Bug: 878202 |
1662 |
-Change-Id: I6ad217a687e62a9a384980d852743a56479de3a9 |
1663 |
-Reviewed-on: https://chromium-review.googlesource.com/1192467 |
1664 |
-Commit-Queue: 汪 清 <wangqing-hf@××××××××.cn> |
1665 |
-Reviewed-by: Eric Willigers <ericwilligers@××××××××.org> |
1666 |
-Cr-Commit-Position: refs/heads/master@{#588316} |
1667 |
---- |
1668 |
- .../core/animation/animation_time_delta.cc | 22 ++++++++++++++ |
1669 |
- .../core/animation/animation_time_delta.h | 30 +++++++------------ |
1670 |
- 2 files changed, 32 insertions(+), 20 deletions(-) |
1671 |
- |
1672 |
-diff --git a/third_party/blink/renderer/core/animation/animation_time_delta.cc b/third_party/blink/renderer/core/animation/animation_time_delta.cc |
1673 |
-index 1b25469c7f2f..2e30a18890da 100644 |
1674 |
---- a/third_party/blink/renderer/core/animation/animation_time_delta.cc |
1675 |
-+++ b/third_party/blink/renderer/core/animation/animation_time_delta.cc |
1676 |
-@@ -7,6 +7,28 @@ |
1677 |
- namespace blink { |
1678 |
- |
1679 |
- #if !defined(BLINK_ANIMATION_USE_TIME_DELTA) |
1680 |
-+// Comparison operators on AnimationTimeDelta. |
1681 |
-+bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs, |
1682 |
-+ const AnimationTimeDelta& rhs) { |
1683 |
-+ return lhs.InSecondsF() == rhs.InSecondsF(); |
1684 |
-+} |
1685 |
-+bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs, |
1686 |
-+ const AnimationTimeDelta& rhs) { |
1687 |
-+ return lhs.InSecondsF() != rhs.InSecondsF(); |
1688 |
-+} |
1689 |
-+bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs, |
1690 |
-+ const AnimationTimeDelta& rhs) { |
1691 |
-+ return lhs.InSecondsF() > rhs.InSecondsF(); |
1692 |
-+} |
1693 |
-+bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs, |
1694 |
-+ const AnimationTimeDelta& rhs) { |
1695 |
-+ return lhs.InSecondsF() >= rhs.InSecondsF(); |
1696 |
-+} |
1697 |
-+bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs, |
1698 |
-+ const AnimationTimeDelta& rhs) { |
1699 |
-+ return lhs.InSecondsF() <= rhs.InSecondsF(); |
1700 |
-+} |
1701 |
-+ |
1702 |
- std::ostream& operator<<(std::ostream& os, AnimationTimeDelta time) { |
1703 |
- return os << time.InSecondsF() << " s"; |
1704 |
- } |
1705 |
-diff --git a/third_party/blink/renderer/core/animation/animation_time_delta.h b/third_party/blink/renderer/core/animation/animation_time_delta.h |
1706 |
-index 1903c1150d3e..95d218466d90 100644 |
1707 |
---- a/third_party/blink/renderer/core/animation/animation_time_delta.h |
1708 |
-+++ b/third_party/blink/renderer/core/animation/animation_time_delta.h |
1709 |
-@@ -90,26 +90,16 @@ AnimationTimeDelta operator*(T a, AnimationTimeDelta td) { |
1710 |
- } |
1711 |
- |
1712 |
- // Comparison operators on AnimationTimeDelta. |
1713 |
--constexpr bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs, |
1714 |
-- const AnimationTimeDelta& rhs) { |
1715 |
-- return lhs.InSecondsF() == rhs.InSecondsF(); |
1716 |
--} |
1717 |
--constexpr bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs, |
1718 |
-- const AnimationTimeDelta& rhs) { |
1719 |
-- return lhs.InSecondsF() != rhs.InSecondsF(); |
1720 |
--} |
1721 |
--constexpr bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs, |
1722 |
-- const AnimationTimeDelta& rhs) { |
1723 |
-- return lhs.InSecondsF() > rhs.InSecondsF(); |
1724 |
--} |
1725 |
--constexpr bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs, |
1726 |
-- const AnimationTimeDelta& rhs) { |
1727 |
-- return lhs.InSecondsF() >= rhs.InSecondsF(); |
1728 |
--} |
1729 |
--constexpr bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs, |
1730 |
-- const AnimationTimeDelta& rhs) { |
1731 |
-- return lhs.InSecondsF() <= rhs.InSecondsF(); |
1732 |
--} |
1733 |
-+bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs, |
1734 |
-+ const AnimationTimeDelta& rhs); |
1735 |
-+bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs, |
1736 |
-+ const AnimationTimeDelta& rhs); |
1737 |
-+bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs, |
1738 |
-+ const AnimationTimeDelta& rhs); |
1739 |
-+bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs, |
1740 |
-+ const AnimationTimeDelta& rhs); |
1741 |
-+bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs, |
1742 |
-+ const AnimationTimeDelta& rhs); |
1743 |
- |
1744 |
- // Defined to allow DCHECK_EQ/etc to work with the class. |
1745 |
- CORE_EXPORT std::ostream& operator<<(std::ostream& os, AnimationTimeDelta time); |
1746 |
--- |
1747 |
-2.19.1 |
1748 |
- |
1749 |
|
1750 |
diff --git a/www-client/chromium/files/chromium-70-gcc-2.patch b/www-client/chromium/files/chromium-70-gcc-2.patch |
1751 |
deleted file mode 100644 |
1752 |
index 33041454c52..00000000000 |
1753 |
--- a/www-client/chromium/files/chromium-70-gcc-2.patch |
1754 |
+++ /dev/null |
1755 |
@@ -1,37 +0,0 @@ |
1756 |
-From cbdb8bd6567c8143dc8c1e5e86a21a8ea064eea4 Mon Sep 17 00:00:00 2001 |
1757 |
-From: Maksim Sisov <msisov@××××××.com> |
1758 |
-Date: Fri, 7 Sep 2018 18:57:42 +0000 |
1759 |
-Subject: [PATCH] OmniboxTextView: fix gcc error for structure initialization |
1760 |
- |
1761 |
-It looks like there is bug in GCC 6, which cannot go through |
1762 |
-structure initialization normally. |
1763 |
- |
1764 |
-Thus, instead of a default initialization of one of the members, |
1765 |
-explicitly initialize it to a default value. |
1766 |
- |
1767 |
-Change-Id: Ia55cc6658e6b6b2f8a80c2582dd28f001c9e648c |
1768 |
-Reviewed-on: https://chromium-review.googlesource.com/1213181 |
1769 |
-Reviewed-by: Scott Violet <sky@××××××××.org> |
1770 |
-Commit-Queue: Maksim Sisov <msisov@××××××.com> |
1771 |
-Cr-Commit-Position: refs/heads/master@{#589614} |
1772 |
---- |
1773 |
- chrome/browser/ui/views/omnibox/omnibox_text_view.cc | 3 ++- |
1774 |
- 1 file changed, 2 insertions(+), 1 deletion(-) |
1775 |
- |
1776 |
-diff --git a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc |
1777 |
-index f0a8083dc930..9021284f166d 100644 |
1778 |
---- a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc |
1779 |
-+++ b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc |
1780 |
-@@ -175,7 +175,8 @@ void ApplyTextStyleForType(SuggestionAnswer::TextStyle text_style, |
1781 |
- style = {part_color, .baseline = gfx::SUPERIOR}; |
1782 |
- break; |
1783 |
- case SuggestionAnswer::TextStyle::BOLD: |
1784 |
-- style = {part_color, .weight = gfx::Font::Weight::BOLD}; |
1785 |
-+ style = {part_color, .baseline = gfx::NORMAL_BASELINE, |
1786 |
-+ .weight = gfx::Font::Weight::BOLD}; |
1787 |
- break; |
1788 |
- case SuggestionAnswer::TextStyle::NORMAL: |
1789 |
- case SuggestionAnswer::TextStyle::NORMAL_DIM: |
1790 |
--- |
1791 |
-2.19.1 |
1792 |
- |
1793 |
|
1794 |
diff --git a/www-client/chromium/files/chromium-compiler-r4.patch b/www-client/chromium/files/chromium-compiler-r4.patch |
1795 |
deleted file mode 100644 |
1796 |
index 3fe73ef7fec..00000000000 |
1797 |
--- a/www-client/chromium/files/chromium-compiler-r4.patch |
1798 |
+++ /dev/null |
1799 |
@@ -1,168 +0,0 @@ |
1800 |
-From 777d166eec22c1894108dce985498f75ac5931e8 Mon Sep 17 00:00:00 2001 |
1801 |
-From: Mike Gilbert <floppym@g.o> |
1802 |
-Date: Wed, 25 Apr 2018 13:22:49 -0400 |
1803 |
-Subject: [PATCH] Disable various compiler configs |
1804 |
- |
1805 |
---- |
1806 |
- build/config/compiler/BUILD.gn | 61 ++++++++++------------------------ |
1807 |
- 1 file changed, 18 insertions(+), 43 deletions(-) |
1808 |
- |
1809 |
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn |
1810 |
-index 6e38ad782d38..87bbd423f67f 100644 |
1811 |
---- a/build/config/compiler/BUILD.gn |
1812 |
-+++ b/build/config/compiler/BUILD.gn |
1813 |
-@@ -225,8 +225,6 @@ config("compiler") { |
1814 |
- |
1815 |
- configs += [ |
1816 |
- # See the definitions below. |
1817 |
-- ":clang_revision", |
1818 |
-- ":compiler_cpu_abi", |
1819 |
- ":compiler_codegen", |
1820 |
- ] |
1821 |
- |
1822 |
-@@ -488,18 +486,6 @@ config("compiler") { |
1823 |
- } |
1824 |
- } |
1825 |
- |
1826 |
-- if (is_clang && !is_nacl && current_toolchain == host_toolchain && |
1827 |
-- target_os != "chromeos") { |
1828 |
-- cflags += [ |
1829 |
-- # TODO(hans): Remove this once Clang generates better optimized debug info |
1830 |
-- # by default. https://crbug.com/765793 |
1831 |
-- "-Xclang", |
1832 |
-- "-mllvm", |
1833 |
-- "-Xclang", |
1834 |
-- "-instcombine-lower-dbg-declare=0", |
1835 |
-- ] |
1836 |
-- } |
1837 |
-- |
1838 |
- # Print absolute paths in diagnostics. There is no precedent for doing this |
1839 |
- # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and |
1840 |
- # Windows developers rely on it (crbug.com/636109) so only do this on Windows. |
1841 |
-@@ -1473,10 +1459,6 @@ config("default_warnings") { |
1842 |
- cflags += [ |
1843 |
- # TODO(thakis): https://crbug.com/753973 |
1844 |
- "-Wno-enum-compare-switch", |
1845 |
-- |
1846 |
-- # Ignore warnings about MSVC optimization pragmas. |
1847 |
-- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 |
1848 |
-- "-Wno-ignored-pragma-optimize", |
1849 |
- ] |
1850 |
- } |
1851 |
- } |
1852 |
-@@ -1518,22 +1500,6 @@ config("chromium_code") { |
1853 |
- "__STDC_FORMAT_MACROS", |
1854 |
- ] |
1855 |
- |
1856 |
-- if (!is_debug && !using_sanitizer && |
1857 |
-- (!is_linux || !is_clang || is_official_build) && |
1858 |
-- current_cpu != "s390x" && current_cpu != "s390" && |
1859 |
-- current_cpu != "ppc64" && current_cpu != "ppc64" && |
1860 |
-- current_cpu != "mips" && current_cpu != "mips64") { |
1861 |
-- # _FORTIFY_SOURCE isn't really supported by Clang now, see |
1862 |
-- # http://llvm.org/bugs/show_bug.cgi?id=16821. |
1863 |
-- # It seems to work fine with Ubuntu 12 headers though, so use it in |
1864 |
-- # official builds. |
1865 |
-- # |
1866 |
-- # Non-chromium code is not guaranteed to compile cleanly with |
1867 |
-- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are |
1868 |
-- # disabled, so only do that for Release build. |
1869 |
-- defines += [ "_FORTIFY_SOURCE=2" ] |
1870 |
-- } |
1871 |
-- |
1872 |
- if (is_mac || is_ios) { |
1873 |
- cflags_objc = [ "-Wobjc-missing-property-synthesis" ] |
1874 |
- cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] |
1875 |
-@@ -1863,7 +1829,8 @@ config("default_stack_frames") { |
1876 |
- } |
1877 |
- |
1878 |
- # Default "optimization on" config. |
1879 |
--config("optimize") { |
1880 |
-+config("optimize") { } |
1881 |
-+config("xoptimize") { |
1882 |
- if (is_win) { |
1883 |
- # TODO(thakis): Remove is_clang here, https://crbug.com/598772 |
1884 |
- if (is_official_build && full_wpo_on_official && !is_clang) { |
1885 |
-@@ -1897,7 +1864,8 @@ config("optimize") { |
1886 |
- } |
1887 |
- |
1888 |
- # Same config as 'optimize' but without the WPO flag. |
1889 |
--config("optimize_no_wpo") { |
1890 |
-+config("optimize_no_wpo") { } |
1891 |
-+config("xoptimize_no_wpo") { |
1892 |
- if (is_win) { |
1893 |
- # Favor size over speed, /O1 must be before the common flags. The GYP |
1894 |
- # build also specifies /Os and /GF but these are implied by /O1. |
1895 |
-@@ -1920,7 +1888,8 @@ config("optimize_no_wpo") { |
1896 |
- } |
1897 |
- |
1898 |
- # Turn off optimizations. |
1899 |
--config("no_optimize") { |
1900 |
-+config("no_optimize") { } |
1901 |
-+config("xno_optimize") { |
1902 |
- if (is_win) { |
1903 |
- cflags = [ |
1904 |
- "/Od", # Disable optimization. |
1905 |
-@@ -1944,7 +1913,8 @@ config("no_optimize") { |
1906 |
- # Turns up the optimization level. On Windows, this implies whole program |
1907 |
- # optimization and link-time code generation which is very expensive and should |
1908 |
- # be used sparingly. |
1909 |
--config("optimize_max") { |
1910 |
-+config("optimize_max") { } |
1911 |
-+config("xoptimize_max") { |
1912 |
- if (is_nacl && is_nacl_irt) { |
1913 |
- # The NaCl IRT is a special case and always wants its own config. |
1914 |
- # Various components do: |
1915 |
-@@ -1991,7 +1961,8 @@ config("optimize_max") { |
1916 |
- # |
1917 |
- # TODO(crbug.com/621335) - rework how all of these configs are related |
1918 |
- # so that we don't need this disclaimer. |
1919 |
--config("optimize_speed") { |
1920 |
-+config("optimize_speed") { } |
1921 |
-+config("xoptimize_speed") { |
1922 |
- if (is_nacl && is_nacl_irt) { |
1923 |
- # The NaCl IRT is a special case and always wants its own config. |
1924 |
- # Various components do: |
1925 |
-@@ -2029,7 +2000,8 @@ config("optimize_speed") { |
1926 |
- } |
1927 |
- } |
1928 |
- |
1929 |
--config("optimize_fuzzing") { |
1930 |
-+config("optimize_fuzzing") { } |
1931 |
-+config("xoptimize_fuzzing") { |
1932 |
- cflags = [ "-O1" ] + common_optimize_on_cflags |
1933 |
- ldflags = common_optimize_on_ldflags |
1934 |
- visibility = [ ":default_optimization" ] |
1935 |
-@@ -2115,7 +2087,8 @@ config("afdo") { |
1936 |
- # configs += [ "//build/config/compiler:symbols" ] |
1937 |
- |
1938 |
- # Full symbols. |
1939 |
--config("symbols") { |
1940 |
-+config("symbols") { } |
1941 |
-+config("xsymbols") { |
1942 |
- if (is_win) { |
1943 |
- if (use_goma || is_clang) { |
1944 |
- # Note that with VC++ this requires is_win_fastlink, enforced elsewhere. |
1945 |
-@@ -2213,7 +2186,8 @@ config("symbols") { |
1946 |
- # Minimal symbols. |
1947 |
- # This config guarantees to hold symbol for stack trace which are shown to user |
1948 |
- # when crash happens in unittests running on buildbot. |
1949 |
--config("minimal_symbols") { |
1950 |
-+config("minimal_symbols") { } |
1951 |
-+config("xminimal_symbols") { |
1952 |
- if (is_win) { |
1953 |
- # Linker symbols for backtraces only. |
1954 |
- cflags = [] |
1955 |
-@@ -2244,7 +2218,8 @@ config("minimal_symbols") { |
1956 |
- } |
1957 |
- |
1958 |
- # No symbols. |
1959 |
--config("no_symbols") { |
1960 |
-+config("no_symbols") { } |
1961 |
-+config("xno_symbols") { |
1962 |
- if (!is_win) { |
1963 |
- cflags = [ "-g0" ] |
1964 |
- asmflags = cflags |
1965 |
--- |
1966 |
-2.18.0 |
1967 |
- |
1968 |
|
1969 |
diff --git a/www-client/chromium/files/chromium-pdfium-stdlib-r0.patch b/www-client/chromium/files/chromium-pdfium-stdlib-r0.patch |
1970 |
deleted file mode 100644 |
1971 |
index 1cfa4c55c29..00000000000 |
1972 |
--- a/www-client/chromium/files/chromium-pdfium-stdlib-r0.patch |
1973 |
+++ /dev/null |
1974 |
@@ -1,30 +0,0 @@ |
1975 |
-From e3ad3deb6a6e79284f3748fa7410311d87df91c5 Mon Sep 17 00:00:00 2001 |
1976 |
-From: Henrique Nakashima <hnakashima@××××××××.org> |
1977 |
-Date: Tue, 4 Sep 2018 16:49:51 +0000 |
1978 |
-Subject: [PATCH] IWYU: stdint.h in pdfium_mem_buffer_file_write.h for uint8_t |
1979 |
- |
1980 |
-Bug: 879900 |
1981 |
-Change-Id: I9c15d1c280a23c53d31f2d72c9d0d1db79eab886 |
1982 |
-Reviewed-on: https://chromium-review.googlesource.com/1204410 |
1983 |
-Reviewed-by: Lei Zhang <thestig@××××××××.org> |
1984 |
-Commit-Queue: Henrique Nakashima <hnakashima@××××××××.org> |
1985 |
-Cr-Commit-Position: refs/heads/master@{#588547} |
1986 |
---- |
1987 |
- pdf/pdfium/pdfium_mem_buffer_file_write.h | 1 + |
1988 |
- 1 file changed, 1 insertion(+) |
1989 |
- |
1990 |
-diff --git a/pdf/pdfium/pdfium_mem_buffer_file_write.h b/pdf/pdfium/pdfium_mem_buffer_file_write.h |
1991 |
-index 03c54bb63800..82e82d23684d 100644 |
1992 |
---- a/pdf/pdfium/pdfium_mem_buffer_file_write.h |
1993 |
-+++ b/pdf/pdfium/pdfium_mem_buffer_file_write.h |
1994 |
-@@ -6,6 +6,7 @@ |
1995 |
- #define PDF_PDFIUM_PDFIUM_MEM_BUFFER_FILE_WRITE_H_ |
1996 |
- |
1997 |
- #include <stddef.h> |
1998 |
-+#include <stdint.h> |
1999 |
- |
2000 |
- #include <vector> |
2001 |
- |
2002 |
--- |
2003 |
-2.19.0 |
2004 |
- |