1 |
commit: 2d2ef44b7d460ce4d402b70a337ddca6eac2b978 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 10 15:44:18 2019 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 10 15:44:18 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d2ef44b |
7 |
|
8 |
www-client/chromium: remove old |
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 | 3 - |
14 |
www-client/chromium/chromium-71.0.3578.80.ebuild | 713 -------------------- |
15 |
www-client/chromium/chromium-72.0.3626.96.ebuild | 716 --------------------- |
16 |
www-client/chromium/files/chromium-71-gcc-0.patch | 57 -- |
17 |
.../chromium/files/chromium-compiler-r6.patch | 170 ----- |
18 |
.../chromium/files/chromium-harfbuzz-r0.patch | 80 --- |
19 |
.../chromium/files/chromium-widevine-r3.patch | 23 - |
20 |
7 files changed, 1762 deletions(-) |
21 |
|
22 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
23 |
index 86cd01aa831..edf4dba24e7 100644 |
24 |
--- a/www-client/chromium/Manifest |
25 |
+++ b/www-client/chromium/Manifest |
26 |
@@ -1,5 +1,2 @@ |
27 |
-DIST chromium-71.0.3578.80.tar.xz 633878288 BLAKE2B be6dcb4c1123830f8f0413e52e46c6e3356356cbfadcaa77c3960f22a6f1f2f5a7a2e7da415b7c19b75d6cd4b881d45a8aeaa7c311547ac58fc34c87fdf23891 SHA512 79b0f5ebe71a34d9f5215df1b4e47071f2337bb480fbec591011653acdfe524419bd10efdeab334ac34c07bc4eb2c485d60a9c3b2f053a721271130ff98af516 |
28 |
DIST chromium-72.0.3626.28.tar.xz 686169316 BLAKE2B 6ee2bfd35e8d48a7122f0a8b85777733bdaf2c6c56b00eb6cf3ee14afede25a45919b6ce6267fb54ae9040d0b676d084d6db5026918b07bc3e26f825d6298c35 SHA512 474452f6d41f900118d88f3aaf435cd332567f7a55c2af449e775668a78ee285ab7c011ca41237fa2b13f4b3076ec0cfb5448cfe9018092614e60c0ad7c12252 |
29 |
-DIST chromium-72.0.3626.96.tar.xz 686361344 BLAKE2B 92a001d99d418b0305235af9109719d9179f8bee53ad79e1ac089a1bc32b493ddcd3e26419e37b68e912f7b09deb51efefd325b82abb1fa281fe207e3a1f9a89 SHA512 949dde41053dba7408ab96d6fc56668efa46248a7a5a4690642f3de696c25fc9d5a746d82b106f4083bf4a1a5676eea06060c616375f74379a051a6bde4faea0 |
30 |
-DIST chromium-webrtc-includes-r1.patch.xz 57820 BLAKE2B 8e113680254b4834abda72c335a8f0af7211c5982c91e52372945f9a57c5558bd6772300ffefb475b450c40ffe66cd627aba34d33af101fe402815c2a16fe6c8 SHA512 cd4562ec32a044925afc65d9cba62310acc515db7cab0ee3aa0f3afe11672b3e7046ca937d8739c4feca436af7d9cf0f7860716a397c8aa5d5ae647b5eaf1ac0 |
31 |
DIST chromium-webrtc-includes.patch.xz 57908 BLAKE2B e977da6fb10bd3fdd12fef75ad669c4e7cb15f8e518a18c52dec7a4e27f0d5444dffc880b4aed30ccef8b620d82946be08c0b5b63ceaec0554e9f80b867b9750 SHA512 440c5ede645d13ec74c08c755a46298f5fcf10c9cbe6d88621ae89a2b27ae41be9954f4e3c1798525cc97aac01e5021b878a06c5625628c4c071cec84f3dfe8a |
32 |
|
33 |
diff --git a/www-client/chromium/chromium-71.0.3578.80.ebuild b/www-client/chromium/chromium-71.0.3578.80.ebuild |
34 |
deleted file mode 100644 |
35 |
index fc1699e20ce..00000000000 |
36 |
--- a/www-client/chromium/chromium-71.0.3578.80.ebuild |
37 |
+++ /dev/null |
38 |
@@ -1,713 +0,0 @@ |
39 |
-# Copyright 1999-2018 Gentoo Authors |
40 |
-# Distributed under the terms of the GNU General Public License v2 |
41 |
- |
42 |
-EAPI=7 |
43 |
-PYTHON_COMPAT=( python2_7 ) |
44 |
- |
45 |
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he |
46 |
- 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 |
47 |
- sv sw ta te th tr uk vi zh-CN zh-TW" |
48 |
- |
49 |
-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 |
50 |
- |
51 |
-DESCRIPTION="Open-source version of Google Chrome web browser" |
52 |
-HOMEPAGE="http://chromium.org/" |
53 |
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" |
54 |
- |
55 |
-LICENSE="BSD" |
56 |
-SLOT="0" |
57 |
-KEYWORDS="amd64 ~x86" |
58 |
-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" |
59 |
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" |
60 |
- |
61 |
-COMMON_DEPEND=" |
62 |
- >=app-accessibility/at-spi2-atk-2.26:2 |
63 |
- app-arch/bzip2:= |
64 |
- cups? ( >=net-print/cups-1.3.11:= ) |
65 |
- >=dev-libs/atk-2.26 |
66 |
- dev-libs/expat:= |
67 |
- dev-libs/glib:2 |
68 |
- system-icu? ( >=dev-libs/icu-59:= ) |
69 |
- >=dev-libs/libxml2-2.9.4-r3:=[icu] |
70 |
- dev-libs/libxslt:= |
71 |
- dev-libs/nspr:= |
72 |
- >=dev-libs/nss-3.26:= |
73 |
- >=dev-libs/re2-0.2016.11.01:= |
74 |
- gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) |
75 |
- >=media-libs/alsa-lib-1.0.19:= |
76 |
- media-libs/fontconfig:= |
77 |
- media-libs/freetype:= |
78 |
- >=media-libs/harfbuzz-2.0.0:0=[icu(-)] |
79 |
- media-libs/libjpeg-turbo:= |
80 |
- media-libs/libpng:= |
81 |
- system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) |
82 |
- >=media-libs/openh264-1.6.0:= |
83 |
- pulseaudio? ( media-sound/pulseaudio:= ) |
84 |
- system-ffmpeg? ( |
85 |
- >=media-video/ffmpeg-4:= |
86 |
- || ( |
87 |
- media-video/ffmpeg[-samba] |
88 |
- >=net-fs/samba-4.5.10-r1[-debug(-)] |
89 |
- ) |
90 |
- !=net-fs/samba-4.5.12-r0 |
91 |
- media-libs/opus:= |
92 |
- ) |
93 |
- sys-apps/dbus:= |
94 |
- sys-apps/pciutils:= |
95 |
- virtual/udev |
96 |
- x11-libs/cairo:= |
97 |
- x11-libs/gdk-pixbuf:2 |
98 |
- x11-libs/gtk+:3[X] |
99 |
- x11-libs/libX11:= |
100 |
- x11-libs/libXcomposite:= |
101 |
- x11-libs/libXcursor:= |
102 |
- x11-libs/libXdamage:= |
103 |
- x11-libs/libXext:= |
104 |
- x11-libs/libXfixes:= |
105 |
- >=x11-libs/libXi-1.6.0:= |
106 |
- x11-libs/libXrandr:= |
107 |
- x11-libs/libXrender:= |
108 |
- x11-libs/libXScrnSaver:= |
109 |
- x11-libs/libXtst:= |
110 |
- x11-libs/pango:= |
111 |
- app-arch/snappy:= |
112 |
- media-libs/flac:= |
113 |
- >=media-libs/libwebp-0.4.0:= |
114 |
- sys-libs/zlib:=[minizip] |
115 |
- kerberos? ( virtual/krb5 ) |
116 |
-" |
117 |
-# For nvidia-drivers blocker, see bug #413637 . |
118 |
-RDEPEND="${COMMON_DEPEND} |
119 |
- !<www-plugins/chrome-binary-plugins-57 |
120 |
- x11-misc/xdg-utils |
121 |
- virtual/opengl |
122 |
- virtual/ttf-fonts |
123 |
- selinux? ( sec-policy/selinux-chromium ) |
124 |
- tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) |
125 |
- widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] ) |
126 |
-" |
127 |
-# dev-vcs/git - https://bugs.gentoo.org/593476 |
128 |
-# sys-apps/sandbox - https://crbug.com/586444 |
129 |
-DEPEND="${COMMON_DEPEND} |
130 |
-" |
131 |
-BDEPEND=" |
132 |
- >=app-arch/gzip-1.7 |
133 |
- !arm? ( |
134 |
- dev-lang/yasm |
135 |
- ) |
136 |
- dev-lang/perl |
137 |
- dev-util/gn |
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 |
- virtual/pkgconfig |
145 |
- dev-vcs/git |
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-r6.patch" |
179 |
- "${FILESDIR}/chromium-widevine-r3.patch" |
180 |
- "${FILESDIR}/chromium-webrtc-r0.patch" |
181 |
- "${FILESDIR}/chromium-memcpy-r0.patch" |
182 |
- "${FILESDIR}/chromium-math.h-r0.patch" |
183 |
- "${FILESDIR}/chromium-stdint.patch" |
184 |
- "${FILESDIR}/chromium-harfbuzz-r0.patch" |
185 |
- "${FILESDIR}/chromium-71-gcc-0.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/http2 |
247 |
- net/third_party/mozilla_security_manager |
248 |
- net/third_party/nss |
249 |
- net/third_party/quic |
250 |
- net/third_party/spdy |
251 |
- net/third_party/uri_template |
252 |
- third_party/WebKit |
253 |
- third_party/abseil-cpp |
254 |
- third_party/analytics |
255 |
- third_party/angle |
256 |
- third_party/angle/src/common/third_party/base |
257 |
- third_party/angle/src/common/third_party/smhasher |
258 |
- third_party/angle/src/third_party/compiler |
259 |
- third_party/angle/src/third_party/libXNVCtrl |
260 |
- third_party/angle/src/third_party/trace_event |
261 |
- third_party/angle/third_party/glslang |
262 |
- third_party/angle/third_party/spirv-headers |
263 |
- third_party/angle/third_party/spirv-tools |
264 |
- third_party/angle/third_party/vulkan-headers |
265 |
- third_party/angle/third_party/vulkan-loader |
266 |
- third_party/angle/third_party/vulkan-tools |
267 |
- third_party/angle/third_party/vulkan-validation-layers |
268 |
- third_party/apple_apsl |
269 |
- third_party/blink |
270 |
- third_party/boringssl |
271 |
- third_party/boringssl/src/third_party/fiat |
272 |
- third_party/breakpad |
273 |
- third_party/breakpad/breakpad/src/third_party/curl |
274 |
- third_party/brotli |
275 |
- third_party/cacheinvalidation |
276 |
- third_party/catapult |
277 |
- third_party/catapult/common/py_vulcanize/third_party/rcssmin |
278 |
- third_party/catapult/common/py_vulcanize/third_party/rjsmin |
279 |
- third_party/catapult/third_party/beautifulsoup4 |
280 |
- third_party/catapult/third_party/html5lib-python |
281 |
- third_party/catapult/third_party/polymer |
282 |
- third_party/catapult/third_party/six |
283 |
- third_party/catapult/tracing/third_party/d3 |
284 |
- third_party/catapult/tracing/third_party/gl-matrix |
285 |
- third_party/catapult/tracing/third_party/jszip |
286 |
- third_party/catapult/tracing/third_party/mannwhitneyu |
287 |
- third_party/catapult/tracing/third_party/oboe |
288 |
- third_party/catapult/tracing/third_party/pako |
289 |
- third_party/ced |
290 |
- third_party/cld_3 |
291 |
- third_party/crashpad |
292 |
- third_party/crashpad/crashpad/third_party/zlib |
293 |
- third_party/crc32c |
294 |
- third_party/cros_system_api |
295 |
- third_party/devscripts |
296 |
- third_party/dom_distiller_js |
297 |
- third_party/fips181 |
298 |
- third_party/flatbuffers |
299 |
- third_party/flot |
300 |
- third_party/freetype |
301 |
- third_party/glslang-angle |
302 |
- third_party/google_input_tools |
303 |
- third_party/google_input_tools/third_party/closure_library |
304 |
- third_party/google_input_tools/third_party/closure_library/third_party/closure |
305 |
- third_party/googletest |
306 |
- third_party/hunspell |
307 |
- third_party/iccjpeg |
308 |
- third_party/inspector_protocol |
309 |
- third_party/jinja2 |
310 |
- third_party/jsoncpp |
311 |
- third_party/jstemplate |
312 |
- third_party/khronos |
313 |
- third_party/leveldatabase |
314 |
- third_party/libXNVCtrl |
315 |
- third_party/libaddressinput |
316 |
- third_party/libaom |
317 |
- third_party/libaom/source/libaom/third_party/vector |
318 |
- third_party/libaom/source/libaom/third_party/x86inc |
319 |
- third_party/libjingle |
320 |
- third_party/libphonenumber |
321 |
- third_party/libsecret |
322 |
- third_party/libsrtp |
323 |
- third_party/libsync |
324 |
- third_party/libudev |
325 |
- third_party/libwebm |
326 |
- third_party/libxml/chromium |
327 |
- third_party/libyuv |
328 |
- third_party/llvm |
329 |
- third_party/lss |
330 |
- third_party/lzma_sdk |
331 |
- third_party/markupsafe |
332 |
- third_party/mesa |
333 |
- third_party/metrics_proto |
334 |
- third_party/modp_b64 |
335 |
- third_party/node |
336 |
- third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2 |
337 |
- third_party/openmax_dl |
338 |
- third_party/ots |
339 |
- third_party/pdfium |
340 |
- third_party/pdfium/third_party/agg23 |
341 |
- third_party/pdfium/third_party/base |
342 |
- third_party/pdfium/third_party/bigint |
343 |
- third_party/pdfium/third_party/freetype |
344 |
- third_party/pdfium/third_party/lcms |
345 |
- third_party/pdfium/third_party/libopenjpeg20 |
346 |
- third_party/pdfium/third_party/libpng16 |
347 |
- third_party/pdfium/third_party/libtiff |
348 |
- third_party/pdfium/third_party/skia_shared |
349 |
- third_party/perfetto |
350 |
- third_party/ply |
351 |
- third_party/polymer |
352 |
- third_party/protobuf |
353 |
- third_party/protobuf/third_party/six |
354 |
- third_party/pyjson5 |
355 |
- third_party/qcms |
356 |
- third_party/rnnoise |
357 |
- third_party/s2cellid |
358 |
- third_party/sfntly |
359 |
- third_party/simplejson |
360 |
- third_party/skia |
361 |
- third_party/skia/third_party/gif |
362 |
- third_party/skia/third_party/skcms |
363 |
- third_party/skia/third_party/vulkan |
364 |
- third_party/smhasher |
365 |
- third_party/spirv-headers |
366 |
- third_party/SPIRV-Tools |
367 |
- third_party/spirv-tools-angle |
368 |
- third_party/sqlite |
369 |
- third_party/swiftshader |
370 |
- third_party/swiftshader/third_party/llvm-subzero |
371 |
- third_party/swiftshader/third_party/subzero |
372 |
- third_party/unrar |
373 |
- third_party/usrsctp |
374 |
- third_party/vulkan |
375 |
- third_party/vulkan-validation-layers |
376 |
- third_party/web-animations-js |
377 |
- third_party/webdriver |
378 |
- third_party/webrtc |
379 |
- third_party/webrtc/common_audio/third_party/fft4g |
380 |
- third_party/webrtc/common_audio/third_party/spl_sqrt_floor |
381 |
- third_party/webrtc/modules/third_party/fft |
382 |
- third_party/webrtc/modules/third_party/g711 |
383 |
- third_party/webrtc/modules/third_party/g722 |
384 |
- third_party/webrtc/rtc_base/third_party/base64 |
385 |
- third_party/webrtc/rtc_base/third_party/sigslot |
386 |
- third_party/widevine |
387 |
- third_party/woff2 |
388 |
- third_party/zlib/google |
389 |
- url/third_party/mozilla |
390 |
- v8/src/third_party/valgrind |
391 |
- v8/src/third_party/utf8-decoder |
392 |
- v8/third_party/inspector_protocol |
393 |
- v8/third_party/v8 |
394 |
- |
395 |
- # gyp -> gn leftovers |
396 |
- base/third_party/libevent |
397 |
- third_party/adobe |
398 |
- third_party/speech-dispatcher |
399 |
- third_party/usb_ids |
400 |
- third_party/xdg-utils |
401 |
- third_party/yasm/run_yasm.py |
402 |
- ) |
403 |
- if ! use system-ffmpeg; then |
404 |
- keeplibs+=( third_party/ffmpeg third_party/opus ) |
405 |
- fi |
406 |
- if ! use system-icu; then |
407 |
- keeplibs+=( third_party/icu ) |
408 |
- fi |
409 |
- if ! use system-libvpx; then |
410 |
- keeplibs+=( third_party/libvpx ) |
411 |
- keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc ) |
412 |
- fi |
413 |
- if use tcmalloc; then |
414 |
- keeplibs+=( third_party/tcmalloc ) |
415 |
- fi |
416 |
- |
417 |
- # Remove most bundled libraries. Some are still needed. |
418 |
- build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die |
419 |
-} |
420 |
- |
421 |
-src_configure() { |
422 |
- # Calling this here supports resumption via FEATURES=keepwork |
423 |
- python_setup |
424 |
- |
425 |
- local myconf_gn="" |
426 |
- |
427 |
- # Make sure the build system will use the right tools, bug #340795. |
428 |
- tc-export AR CC CXX NM |
429 |
- |
430 |
- if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then |
431 |
- # Force clang since gcc is pretty broken at the moment. |
432 |
- CC=${CHOST}-clang |
433 |
- CXX=${CHOST}-clang++ |
434 |
- strip-unsupported-flags |
435 |
- fi |
436 |
- |
437 |
- if tc-is-clang; then |
438 |
- myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" |
439 |
- else |
440 |
- myconf_gn+=" is_clang=false" |
441 |
- fi |
442 |
- |
443 |
- # Define a custom toolchain for GN |
444 |
- myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" |
445 |
- |
446 |
- if tc-is-cross-compiler; then |
447 |
- tc-export BUILD_{AR,CC,CXX,NM} |
448 |
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\"" |
449 |
- myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\"" |
450 |
- else |
451 |
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" |
452 |
- fi |
453 |
- |
454 |
- # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. |
455 |
- myconf_gn+=" is_debug=false" |
456 |
- |
457 |
- # Component build isn't generally intended for use by end users. It's mostly useful |
458 |
- # for development and debugging. |
459 |
- myconf_gn+=" is_component_build=$(usex component-build true false)" |
460 |
- |
461 |
- # https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md |
462 |
- myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)" |
463 |
- |
464 |
- myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")" |
465 |
- |
466 |
- # Disable nacl, we can't build without pnacl (http://crbug.com/269560). |
467 |
- myconf_gn+=" enable_nacl=false" |
468 |
- |
469 |
- # Use system-provided libraries. |
470 |
- # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733). |
471 |
- # TODO: use_system_hunspell (upstream changes needed). |
472 |
- # TODO: use_system_libsrtp (bug #459932). |
473 |
- # TODO: use_system_protobuf (bug #525560). |
474 |
- # TODO: use_system_ssl (http://crbug.com/58087). |
475 |
- # TODO: use_system_sqlite (http://crbug.com/22208). |
476 |
- |
477 |
- # libevent: https://bugs.gentoo.org/593458 |
478 |
- local gn_system_libraries=( |
479 |
- flac |
480 |
- fontconfig |
481 |
- freetype |
482 |
- # Need harfbuzz_from_pkgconfig target |
483 |
- #harfbuzz-ng |
484 |
- libdrm |
485 |
- libjpeg |
486 |
- libpng |
487 |
- libwebp |
488 |
- libxml |
489 |
- libxslt |
490 |
- openh264 |
491 |
- re2 |
492 |
- snappy |
493 |
- yasm |
494 |
- zlib |
495 |
- ) |
496 |
- if use system-ffmpeg; then |
497 |
- gn_system_libraries+=( ffmpeg opus ) |
498 |
- fi |
499 |
- if use system-icu; then |
500 |
- gn_system_libraries+=( icu ) |
501 |
- fi |
502 |
- if use system-libvpx; then |
503 |
- gn_system_libraries+=( libvpx ) |
504 |
- fi |
505 |
- build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die |
506 |
- |
507 |
- # See dependency logic in third_party/BUILD.gn |
508 |
- myconf_gn+=" use_system_harfbuzz=true" |
509 |
- |
510 |
- # Optional dependencies. |
511 |
- myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)" |
512 |
- myconf_gn+=" enable_widevine=$(usex widevine true false)" |
513 |
- myconf_gn+=" use_cups=$(usex cups true false)" |
514 |
- myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)" |
515 |
- myconf_gn+=" use_kerberos=$(usex kerberos true false)" |
516 |
- myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)" |
517 |
- |
518 |
- # TODO: link_pulseaudio=true for GN. |
519 |
- |
520 |
- myconf_gn+=" fieldtrial_testing_like_official_build=true" |
521 |
- |
522 |
- # Never use bundled gold binary. Disable gold linker flags for now. |
523 |
- # Do not use bundled clang. |
524 |
- # Trying to use gold results in linker crash. |
525 |
- myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false" |
526 |
- |
527 |
- # Disable forced lld, bug 641556 |
528 |
- myconf_gn+=" use_lld=false" |
529 |
- |
530 |
- ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" |
531 |
- myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)" |
532 |
- myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\"" |
533 |
- |
534 |
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . |
535 |
- # Note: these are for Gentoo use ONLY. For your own distribution, |
536 |
- # please get your own set of keys. Feel free to contact chromium@g.o |
537 |
- # for more info. |
538 |
- local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc" |
539 |
- local google_default_client_id="329227923882.apps.googleusercontent.com" |
540 |
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" |
541 |
- myconf_gn+=" google_api_key=\"${google_api_key}\"" |
542 |
- myconf_gn+=" google_default_client_id=\"${google_default_client_id}\"" |
543 |
- myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\"" |
544 |
- |
545 |
- local myarch="$(tc-arch)" |
546 |
- if [[ $myarch = amd64 ]] ; then |
547 |
- myconf_gn+=" target_cpu=\"x64\"" |
548 |
- ffmpeg_target_arch=x64 |
549 |
- elif [[ $myarch = x86 ]] ; then |
550 |
- myconf_gn+=" target_cpu=\"x86\"" |
551 |
- ffmpeg_target_arch=ia32 |
552 |
- |
553 |
- # This is normally defined by compiler_cpu_abi in |
554 |
- # build/config/compiler/BUILD.gn, but we patch that part out. |
555 |
- append-flags -msse2 -mfpmath=sse -mmmx |
556 |
- elif [[ $myarch = arm64 ]] ; then |
557 |
- myconf_gn+=" target_cpu=\"arm64\"" |
558 |
- ffmpeg_target_arch=arm64 |
559 |
- elif [[ $myarch = arm ]] ; then |
560 |
- myconf_gn+=" target_cpu=\"arm\"" |
561 |
- ffmpeg_target_arch=$(usex neon arm-neon arm) |
562 |
- else |
563 |
- die "Failed to determine target arch, got '$myarch'." |
564 |
- fi |
565 |
- |
566 |
- # Make sure that -Werror doesn't get added to CFLAGS by the build system. |
567 |
- # Depending on GCC version the warnings are different and we don't want |
568 |
- # the build to fail because of that. |
569 |
- myconf_gn+=" treat_warnings_as_errors=false" |
570 |
- |
571 |
- # Disable fatal linker warnings, bug 506268. |
572 |
- myconf_gn+=" fatal_linker_warnings=false" |
573 |
- |
574 |
- # Avoid CFLAGS problems, bug #352457, bug #390147. |
575 |
- if ! use custom-cflags; then |
576 |
- replace-flags "-Os" "-O2" |
577 |
- strip-flags |
578 |
- |
579 |
- # Prevent linker from running out of address space, bug #471810 . |
580 |
- if use x86; then |
581 |
- filter-flags "-g*" |
582 |
- fi |
583 |
- |
584 |
- # Prevent libvpx build failures. Bug 530248, 544702, 546984. |
585 |
- if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then |
586 |
- filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 |
587 |
- fi |
588 |
- fi |
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/chromium-72.0.3626.96.ebuild b/www-client/chromium/chromium-72.0.3626.96.ebuild |
754 |
deleted file mode 100644 |
755 |
index bf82cadbae5..00000000000 |
756 |
--- a/www-client/chromium/chromium-72.0.3626.96.ebuild |
757 |
+++ /dev/null |
758 |
@@ -1,716 +0,0 @@ |
759 |
-# Copyright 1999-2019 Gentoo Authors |
760 |
-# Distributed under the terms of the GNU General Public License v2 |
761 |
- |
762 |
-EAPI=7 |
763 |
-PYTHON_COMPAT=( python2_7 ) |
764 |
- |
765 |
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he |
766 |
- 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 |
767 |
- sv sw ta te th tr uk vi zh-CN zh-TW" |
768 |
- |
769 |
-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 |
770 |
- |
771 |
-DESCRIPTION="Open-source version of Google Chrome web browser" |
772 |
-HOMEPAGE="http://chromium.org/" |
773 |
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz |
774 |
- https://dev.gentoo.org/~floppym/dist/chromium-webrtc-includes-r1.patch.xz" |
775 |
- |
776 |
-LICENSE="BSD" |
777 |
-SLOT="0" |
778 |
-KEYWORDS="amd64 ~x86" |
779 |
-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" |
780 |
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" |
781 |
- |
782 |
-COMMON_DEPEND=" |
783 |
- >=app-accessibility/at-spi2-atk-2.26:2 |
784 |
- app-arch/bzip2:= |
785 |
- cups? ( >=net-print/cups-1.3.11:= ) |
786 |
- >=dev-libs/atk-2.26 |
787 |
- dev-libs/expat:= |
788 |
- dev-libs/glib:2 |
789 |
- system-icu? ( >=dev-libs/icu-59:= ) |
790 |
- >=dev-libs/libxml2-2.9.4-r3:=[icu] |
791 |
- dev-libs/libxslt:= |
792 |
- dev-libs/nspr:= |
793 |
- >=dev-libs/nss-3.26:= |
794 |
- >=dev-libs/re2-0.2016.11.01:= |
795 |
- gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) |
796 |
- >=media-libs/alsa-lib-1.0.19:= |
797 |
- media-libs/fontconfig:= |
798 |
- media-libs/freetype:= |
799 |
- >=media-libs/harfbuzz-2.0.0:0=[icu(-)] |
800 |
- media-libs/libjpeg-turbo:= |
801 |
- media-libs/libpng:= |
802 |
- system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) |
803 |
- >=media-libs/openh264-1.6.0:= |
804 |
- pulseaudio? ( media-sound/pulseaudio:= ) |
805 |
- system-ffmpeg? ( |
806 |
- >=media-video/ffmpeg-4:= |
807 |
- || ( |
808 |
- media-video/ffmpeg[-samba] |
809 |
- >=net-fs/samba-4.5.10-r1[-debug(-)] |
810 |
- ) |
811 |
- !=net-fs/samba-4.5.12-r0 |
812 |
- media-libs/opus:= |
813 |
- ) |
814 |
- sys-apps/dbus:= |
815 |
- sys-apps/pciutils:= |
816 |
- virtual/udev |
817 |
- x11-libs/cairo:= |
818 |
- x11-libs/gdk-pixbuf:2 |
819 |
- x11-libs/gtk+:3[X] |
820 |
- x11-libs/libX11:= |
821 |
- x11-libs/libXcomposite:= |
822 |
- x11-libs/libXcursor:= |
823 |
- x11-libs/libXdamage:= |
824 |
- x11-libs/libXext:= |
825 |
- x11-libs/libXfixes:= |
826 |
- >=x11-libs/libXi-1.6.0:= |
827 |
- x11-libs/libXrandr:= |
828 |
- x11-libs/libXrender:= |
829 |
- x11-libs/libXScrnSaver:= |
830 |
- x11-libs/libXtst:= |
831 |
- x11-libs/pango:= |
832 |
- app-arch/snappy:= |
833 |
- media-libs/flac:= |
834 |
- >=media-libs/libwebp-0.4.0:= |
835 |
- sys-libs/zlib:=[minizip] |
836 |
- kerberos? ( virtual/krb5 ) |
837 |
-" |
838 |
-# For nvidia-drivers blocker, see bug #413637 . |
839 |
-RDEPEND="${COMMON_DEPEND} |
840 |
- !<www-plugins/chrome-binary-plugins-57 |
841 |
- x11-misc/xdg-utils |
842 |
- virtual/opengl |
843 |
- virtual/ttf-fonts |
844 |
- selinux? ( sec-policy/selinux-chromium ) |
845 |
- tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) |
846 |
- widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] ) |
847 |
-" |
848 |
-# dev-vcs/git - https://bugs.gentoo.org/593476 |
849 |
-# sys-apps/sandbox - https://crbug.com/586444 |
850 |
-DEPEND="${COMMON_DEPEND} |
851 |
-" |
852 |
-BDEPEND=" |
853 |
- >=app-arch/gzip-1.7 |
854 |
- !arm? ( |
855 |
- dev-lang/yasm |
856 |
- ) |
857 |
- dev-lang/perl |
858 |
- dev-util/gn |
859 |
- dev-vcs/git |
860 |
- >=dev-util/gperf-3.0.3 |
861 |
- >=dev-util/ninja-1.7.2 |
862 |
- >=net-libs/nodejs-7.6.0[inspector] |
863 |
- sys-apps/hwids[usb(+)] |
864 |
- >=sys-devel/bison-2.4.3 |
865 |
- sys-devel/flex |
866 |
- virtual/jre |
867 |
- virtual/pkgconfig |
868 |
-" |
869 |
- |
870 |
-: ${CHROMIUM_FORCE_CLANG=no} |
871 |
- |
872 |
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then |
873 |
- BDEPEND+=" >=sys-devel/clang-5" |
874 |
-fi |
875 |
- |
876 |
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then |
877 |
- EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; |
878 |
-fi |
879 |
- |
880 |
-DISABLE_AUTOFORMATTING="yes" |
881 |
-DOC_CONTENTS=" |
882 |
-Some web pages may require additional fonts to display properly. |
883 |
-Try installing some of the following packages if some characters |
884 |
-are not displayed properly: |
885 |
-- media-fonts/arphicfonts |
886 |
-- media-fonts/droid |
887 |
-- media-fonts/ipamonafont |
888 |
-- media-fonts/noto |
889 |
-- media-fonts/ja-ipafonts |
890 |
-- media-fonts/takao-fonts |
891 |
-- media-fonts/wqy-microhei |
892 |
-- media-fonts/wqy-zenhei |
893 |
- |
894 |
-To fix broken icons on the Downloads page, you should install an icon |
895 |
-theme that covers the appropriate MIME types, and configure this as your |
896 |
-GTK+ icon theme. |
897 |
-" |
898 |
- |
899 |
-PATCHES=( |
900 |
- "${FILESDIR}/chromium-compiler-r7.patch" |
901 |
- "${FILESDIR}/chromium-widevine-r4.patch" |
902 |
- "${FILESDIR}/chromium-webrtc-r0.patch" |
903 |
- "${FILESDIR}/chromium-memcpy-r0.patch" |
904 |
- "${FILESDIR}/chromium-math.h-r0.patch" |
905 |
- "${FILESDIR}/chromium-stdint.patch" |
906 |
-) |
907 |
- |
908 |
-pre_build_checks() { |
909 |
- #if [[ ${MERGE_TYPE} != binary ]]; then |
910 |
- # local -x CPP="$(tc-getCXX) -E" |
911 |
- # if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then |
912 |
- # # bugs: #601654 |
913 |
- # die "At least clang 3.9.1 is required" |
914 |
- # fi |
915 |
- # if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then |
916 |
- # # bugs: #535730, #525374, #518668, #600288, #627356 |
917 |
- # die "At least gcc 5.0 is required" |
918 |
- # fi |
919 |
- #fi |
920 |
- |
921 |
- # Check build requirements, bug #541816 and bug #471810 . |
922 |
- CHECKREQS_MEMORY="3G" |
923 |
- CHECKREQS_DISK_BUILD="5G" |
924 |
- if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then |
925 |
- CHECKREQS_DISK_BUILD="25G" |
926 |
- if ! use component-build; then |
927 |
- CHECKREQS_MEMORY="16G" |
928 |
- fi |
929 |
- fi |
930 |
- check-reqs_pkg_setup |
931 |
-} |
932 |
- |
933 |
-pkg_pretend() { |
934 |
- pre_build_checks |
935 |
-} |
936 |
- |
937 |
-pkg_setup() { |
938 |
- pre_build_checks |
939 |
- |
940 |
- chromium_suid_sandbox_check_kernel_config |
941 |
-} |
942 |
- |
943 |
-src_prepare() { |
944 |
- # Calling this here supports resumption via FEATURES=keepwork |
945 |
- python_setup |
946 |
- |
947 |
- default |
948 |
- |
949 |
- pushd third_party/webrtc >/dev/null || die |
950 |
- eapply "${WORKDIR}"/chromium-webrtc-includes-r1.patch |
951 |
- popd >/dev/null || die |
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/abseil-cpp |
977 |
- third_party/angle |
978 |
- third_party/angle/src/common/third_party/base |
979 |
- third_party/angle/src/common/third_party/smhasher |
980 |
- third_party/angle/src/common/third_party/xxhash |
981 |
- third_party/angle/src/third_party/compiler |
982 |
- third_party/angle/src/third_party/libXNVCtrl |
983 |
- third_party/angle/src/third_party/trace_event |
984 |
- third_party/angle/third_party/glslang |
985 |
- third_party/angle/third_party/spirv-headers |
986 |
- third_party/angle/third_party/spirv-tools |
987 |
- third_party/angle/third_party/vulkan-headers |
988 |
- third_party/angle/third_party/vulkan-loader |
989 |
- third_party/angle/third_party/vulkan-tools |
990 |
- third_party/angle/third_party/vulkan-validation-layers |
991 |
- third_party/apple_apsl |
992 |
- third_party/blink |
993 |
- third_party/boringssl |
994 |
- third_party/boringssl/src/third_party/fiat |
995 |
- third_party/breakpad |
996 |
- third_party/breakpad/breakpad/src/third_party/curl |
997 |
- third_party/brotli |
998 |
- third_party/cacheinvalidation |
999 |
- third_party/catapult |
1000 |
- third_party/catapult/common/py_vulcanize/third_party/rcssmin |
1001 |
- third_party/catapult/common/py_vulcanize/third_party/rjsmin |
1002 |
- third_party/catapult/third_party/beautifulsoup4 |
1003 |
- third_party/catapult/third_party/html5lib-python |
1004 |
- third_party/catapult/third_party/polymer |
1005 |
- third_party/catapult/third_party/six |
1006 |
- third_party/catapult/tracing/third_party/d3 |
1007 |
- third_party/catapult/tracing/third_party/gl-matrix |
1008 |
- third_party/catapult/tracing/third_party/jszip |
1009 |
- third_party/catapult/tracing/third_party/mannwhitneyu |
1010 |
- third_party/catapult/tracing/third_party/oboe |
1011 |
- third_party/catapult/tracing/third_party/pako |
1012 |
- third_party/ced |
1013 |
- third_party/cld_3 |
1014 |
- third_party/closure_compiler |
1015 |
- third_party/crashpad |
1016 |
- third_party/crashpad/crashpad/third_party/zlib |
1017 |
- third_party/crc32c |
1018 |
- third_party/cros_system_api |
1019 |
- third_party/devscripts |
1020 |
- third_party/dom_distiller_js |
1021 |
- third_party/fips181 |
1022 |
- third_party/flatbuffers |
1023 |
- third_party/flot |
1024 |
- third_party/freetype |
1025 |
- third_party/google_input_tools |
1026 |
- third_party/google_input_tools/third_party/closure_library |
1027 |
- third_party/google_input_tools/third_party/closure_library/third_party/closure |
1028 |
- third_party/googletest |
1029 |
- third_party/hunspell |
1030 |
- third_party/iccjpeg |
1031 |
- third_party/inspector_protocol |
1032 |
- third_party/jinja2 |
1033 |
- third_party/jsoncpp |
1034 |
- third_party/jstemplate |
1035 |
- third_party/khronos |
1036 |
- third_party/leveldatabase |
1037 |
- third_party/libXNVCtrl |
1038 |
- third_party/libaddressinput |
1039 |
- third_party/libaom |
1040 |
- third_party/libaom/source/libaom/third_party/vector |
1041 |
- third_party/libaom/source/libaom/third_party/x86inc |
1042 |
- third_party/libjingle |
1043 |
- third_party/libphonenumber |
1044 |
- third_party/libsecret |
1045 |
- third_party/libsrtp |
1046 |
- third_party/libsync |
1047 |
- third_party/libudev |
1048 |
- third_party/libwebm |
1049 |
- third_party/libxml/chromium |
1050 |
- third_party/libyuv |
1051 |
- third_party/llvm |
1052 |
- third_party/lss |
1053 |
- third_party/lzma_sdk |
1054 |
- third_party/markupsafe |
1055 |
- third_party/mesa |
1056 |
- third_party/metrics_proto |
1057 |
- third_party/modp_b64 |
1058 |
- third_party/nasm |
1059 |
- third_party/node |
1060 |
- third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2 |
1061 |
- third_party/openmax_dl |
1062 |
- third_party/ots |
1063 |
- third_party/pdfium |
1064 |
- third_party/pdfium/third_party/agg23 |
1065 |
- third_party/pdfium/third_party/base |
1066 |
- third_party/pdfium/third_party/bigint |
1067 |
- third_party/pdfium/third_party/freetype |
1068 |
- third_party/pdfium/third_party/lcms |
1069 |
- third_party/pdfium/third_party/libopenjpeg20 |
1070 |
- third_party/pdfium/third_party/libpng16 |
1071 |
- third_party/pdfium/third_party/libtiff |
1072 |
- third_party/pdfium/third_party/skia_shared |
1073 |
- third_party/perfetto |
1074 |
- third_party/ply |
1075 |
- third_party/polymer |
1076 |
- third_party/protobuf |
1077 |
- third_party/protobuf/third_party/six |
1078 |
- third_party/pyjson5 |
1079 |
- third_party/qcms |
1080 |
- third_party/rnnoise |
1081 |
- third_party/s2cellid |
1082 |
- third_party/sfntly |
1083 |
- third_party/simplejson |
1084 |
- third_party/skia |
1085 |
- third_party/skia/third_party/gif |
1086 |
- third_party/skia/third_party/skcms |
1087 |
- third_party/skia/third_party/vulkan |
1088 |
- third_party/smhasher |
1089 |
- third_party/spirv-headers |
1090 |
- third_party/SPIRV-Tools |
1091 |
- third_party/sqlite |
1092 |
- third_party/swiftshader |
1093 |
- third_party/swiftshader/third_party/llvm-subzero |
1094 |
- third_party/swiftshader/third_party/subzero |
1095 |
- third_party/unrar |
1096 |
- third_party/usrsctp |
1097 |
- third_party/vulkan |
1098 |
- third_party/web-animations-js |
1099 |
- third_party/webdriver |
1100 |
- third_party/webrtc |
1101 |
- third_party/webrtc/common_audio/third_party/fft4g |
1102 |
- third_party/webrtc/common_audio/third_party/spl_sqrt_floor |
1103 |
- third_party/webrtc/modules/third_party/fft |
1104 |
- third_party/webrtc/modules/third_party/g711 |
1105 |
- third_party/webrtc/modules/third_party/g722 |
1106 |
- third_party/webrtc/rtc_base/third_party/base64 |
1107 |
- third_party/webrtc/rtc_base/third_party/sigslot |
1108 |
- third_party/widevine |
1109 |
- third_party/woff2 |
1110 |
- third_party/zlib/google |
1111 |
- url/third_party/mozilla |
1112 |
- v8/src/third_party/valgrind |
1113 |
- v8/src/third_party/utf8-decoder |
1114 |
- v8/third_party/inspector_protocol |
1115 |
- v8/third_party/v8 |
1116 |
- |
1117 |
- # gyp -> gn leftovers |
1118 |
- base/third_party/libevent |
1119 |
- third_party/adobe |
1120 |
- third_party/speech-dispatcher |
1121 |
- third_party/usb_ids |
1122 |
- third_party/xdg-utils |
1123 |
- third_party/yasm/run_yasm.py |
1124 |
- ) |
1125 |
- if ! use system-ffmpeg; then |
1126 |
- keeplibs+=( third_party/ffmpeg third_party/opus ) |
1127 |
- fi |
1128 |
- if ! use system-icu; then |
1129 |
- keeplibs+=( third_party/icu ) |
1130 |
- fi |
1131 |
- if ! use system-libvpx; then |
1132 |
- keeplibs+=( third_party/libvpx ) |
1133 |
- keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc ) |
1134 |
- fi |
1135 |
- if use tcmalloc; then |
1136 |
- keeplibs+=( third_party/tcmalloc ) |
1137 |
- fi |
1138 |
- |
1139 |
- # Remove most bundled libraries. Some are still needed. |
1140 |
- build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die |
1141 |
-} |
1142 |
- |
1143 |
-src_configure() { |
1144 |
- # Calling this here supports resumption via FEATURES=keepwork |
1145 |
- python_setup |
1146 |
- |
1147 |
- local myconf_gn="" |
1148 |
- |
1149 |
- # Make sure the build system will use the right tools, bug #340795. |
1150 |
- tc-export AR CC CXX NM |
1151 |
- |
1152 |
- if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then |
1153 |
- # Force clang since gcc is pretty broken at the moment. |
1154 |
- CC=${CHOST}-clang |
1155 |
- CXX=${CHOST}-clang++ |
1156 |
- strip-unsupported-flags |
1157 |
- fi |
1158 |
- |
1159 |
- if tc-is-clang; then |
1160 |
- myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" |
1161 |
- else |
1162 |
- myconf_gn+=" is_clang=false" |
1163 |
- fi |
1164 |
- |
1165 |
- # Define a custom toolchain for GN |
1166 |
- myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" |
1167 |
- |
1168 |
- if tc-is-cross-compiler; then |
1169 |
- tc-export BUILD_{AR,CC,CXX,NM} |
1170 |
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\"" |
1171 |
- myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\"" |
1172 |
- else |
1173 |
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" |
1174 |
- fi |
1175 |
- |
1176 |
- # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. |
1177 |
- myconf_gn+=" is_debug=false" |
1178 |
- |
1179 |
- # Component build isn't generally intended for use by end users. It's mostly useful |
1180 |
- # for development and debugging. |
1181 |
- myconf_gn+=" is_component_build=$(usex component-build true false)" |
1182 |
- |
1183 |
- # https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md |
1184 |
- myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)" |
1185 |
- |
1186 |
- myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")" |
1187 |
- |
1188 |
- # Disable nacl, we can't build without pnacl (http://crbug.com/269560). |
1189 |
- myconf_gn+=" enable_nacl=false" |
1190 |
- |
1191 |
- # Use system-provided libraries. |
1192 |
- # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733). |
1193 |
- # TODO: use_system_hunspell (upstream changes needed). |
1194 |
- # TODO: use_system_libsrtp (bug #459932). |
1195 |
- # TODO: use_system_protobuf (bug #525560). |
1196 |
- # TODO: use_system_ssl (http://crbug.com/58087). |
1197 |
- # TODO: use_system_sqlite (http://crbug.com/22208). |
1198 |
- |
1199 |
- # libevent: https://bugs.gentoo.org/593458 |
1200 |
- local gn_system_libraries=( |
1201 |
- flac |
1202 |
- fontconfig |
1203 |
- freetype |
1204 |
- # Need harfbuzz_from_pkgconfig target |
1205 |
- #harfbuzz-ng |
1206 |
- libdrm |
1207 |
- libjpeg |
1208 |
- libpng |
1209 |
- libwebp |
1210 |
- libxml |
1211 |
- libxslt |
1212 |
- openh264 |
1213 |
- re2 |
1214 |
- snappy |
1215 |
- yasm |
1216 |
- zlib |
1217 |
- ) |
1218 |
- if use system-ffmpeg; then |
1219 |
- gn_system_libraries+=( ffmpeg opus ) |
1220 |
- fi |
1221 |
- if use system-icu; then |
1222 |
- gn_system_libraries+=( icu ) |
1223 |
- fi |
1224 |
- if use system-libvpx; then |
1225 |
- gn_system_libraries+=( libvpx ) |
1226 |
- fi |
1227 |
- build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die |
1228 |
- |
1229 |
- # See dependency logic in third_party/BUILD.gn |
1230 |
- myconf_gn+=" use_system_harfbuzz=true" |
1231 |
- |
1232 |
- # Optional dependencies. |
1233 |
- myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)" |
1234 |
- myconf_gn+=" enable_widevine=$(usex widevine true false)" |
1235 |
- myconf_gn+=" use_cups=$(usex cups true false)" |
1236 |
- myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)" |
1237 |
- myconf_gn+=" use_kerberos=$(usex kerberos true false)" |
1238 |
- myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)" |
1239 |
- |
1240 |
- # TODO: link_pulseaudio=true for GN. |
1241 |
- |
1242 |
- myconf_gn+=" fieldtrial_testing_like_official_build=true" |
1243 |
- |
1244 |
- # Never use bundled gold binary. Disable gold linker flags for now. |
1245 |
- # Do not use bundled clang. |
1246 |
- # Trying to use gold results in linker crash. |
1247 |
- myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false" |
1248 |
- |
1249 |
- # Disable forced lld, bug 641556 |
1250 |
- myconf_gn+=" use_lld=false" |
1251 |
- |
1252 |
- ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" |
1253 |
- myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)" |
1254 |
- myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\"" |
1255 |
- |
1256 |
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . |
1257 |
- # Note: these are for Gentoo use ONLY. For your own distribution, |
1258 |
- # please get your own set of keys. Feel free to contact chromium@g.o |
1259 |
- # for more info. |
1260 |
- local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc" |
1261 |
- local google_default_client_id="329227923882.apps.googleusercontent.com" |
1262 |
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" |
1263 |
- myconf_gn+=" google_api_key=\"${google_api_key}\"" |
1264 |
- myconf_gn+=" google_default_client_id=\"${google_default_client_id}\"" |
1265 |
- myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\"" |
1266 |
- |
1267 |
- local myarch="$(tc-arch)" |
1268 |
- |
1269 |
- # Avoid CFLAGS problems, bug #352457, bug #390147. |
1270 |
- if ! use custom-cflags; then |
1271 |
- replace-flags "-Os" "-O2" |
1272 |
- strip-flags |
1273 |
- |
1274 |
- # Prevent linker from running out of address space, bug #471810 . |
1275 |
- if use x86; then |
1276 |
- filter-flags "-g*" |
1277 |
- fi |
1278 |
- |
1279 |
- # Prevent libvpx build failures. Bug 530248, 544702, 546984. |
1280 |
- if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then |
1281 |
- filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 |
1282 |
- fi |
1283 |
- fi |
1284 |
- |
1285 |
- if [[ $myarch = amd64 ]] ; then |
1286 |
- myconf_gn+=" target_cpu=\"x64\"" |
1287 |
- ffmpeg_target_arch=x64 |
1288 |
- elif [[ $myarch = x86 ]] ; then |
1289 |
- myconf_gn+=" target_cpu=\"x86\"" |
1290 |
- ffmpeg_target_arch=ia32 |
1291 |
- |
1292 |
- # This is normally defined by compiler_cpu_abi in |
1293 |
- # build/config/compiler/BUILD.gn, but we patch that part out. |
1294 |
- append-flags -msse2 -mfpmath=sse -mmmx |
1295 |
- elif [[ $myarch = arm64 ]] ; then |
1296 |
- myconf_gn+=" target_cpu=\"arm64\"" |
1297 |
- ffmpeg_target_arch=arm64 |
1298 |
- elif [[ $myarch = arm ]] ; then |
1299 |
- myconf_gn+=" target_cpu=\"arm\"" |
1300 |
- ffmpeg_target_arch=$(usex neon arm-neon arm) |
1301 |
- else |
1302 |
- die "Failed to determine target arch, got '$myarch'." |
1303 |
- fi |
1304 |
- |
1305 |
- # Make sure that -Werror doesn't get added to CFLAGS by the build system. |
1306 |
- # Depending on GCC version the warnings are different and we don't want |
1307 |
- # the build to fail because of that. |
1308 |
- myconf_gn+=" treat_warnings_as_errors=false" |
1309 |
- |
1310 |
- # Disable fatal linker warnings, bug 506268. |
1311 |
- myconf_gn+=" fatal_linker_warnings=false" |
1312 |
- |
1313 |
- # https://bugs.gentoo.org/588596 |
1314 |
- #append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) |
1315 |
- |
1316 |
- # Bug 491582. |
1317 |
- export TMPDIR="${WORKDIR}/temp" |
1318 |
- mkdir -p -m 755 "${TMPDIR}" || die |
1319 |
- |
1320 |
- # https://bugs.gentoo.org/654216 |
1321 |
- addpredict /dev/dri/ #nowarn |
1322 |
- |
1323 |
- #if ! use system-ffmpeg; then |
1324 |
- if false; then |
1325 |
- local build_ffmpeg_args="" |
1326 |
- if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then |
1327 |
- build_ffmpeg_args+=" --disable-asm" |
1328 |
- fi |
1329 |
- |
1330 |
- # Re-configure bundled ffmpeg. See bug #491378 for example reasons. |
1331 |
- einfo "Configuring bundled ffmpeg..." |
1332 |
- pushd third_party/ffmpeg > /dev/null || die |
1333 |
- chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ |
1334 |
- --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die |
1335 |
- chromium/scripts/copy_config.sh || die |
1336 |
- chromium/scripts/generate_gn.py || die |
1337 |
- popd > /dev/null || die |
1338 |
- fi |
1339 |
- |
1340 |
- einfo "Configuring Chromium..." |
1341 |
- set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release |
1342 |
- echo "$@" |
1343 |
- "$@" || die |
1344 |
-} |
1345 |
- |
1346 |
-src_compile() { |
1347 |
- # Final link uses lots of file descriptors. |
1348 |
- ulimit -n 2048 |
1349 |
- |
1350 |
- # Calling this here supports resumption via FEATURES=keepwork |
1351 |
- python_setup |
1352 |
- |
1353 |
- #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die |
1354 |
- |
1355 |
- # Work around broken deps |
1356 |
- eninja -C out/Release gen/ui/accessibility/ax_enums.mojom{,-shared}.h |
1357 |
- |
1358 |
- # Build mksnapshot and pax-mark it. |
1359 |
- local x |
1360 |
- for x in mksnapshot v8_context_snapshot_generator; do |
1361 |
- if tc-is-cross-compiler; then |
1362 |
- eninja -C out/Release "host/${x}" |
1363 |
- pax-mark m "out/Release/host/${x}" |
1364 |
- else |
1365 |
- eninja -C out/Release "${x}" |
1366 |
- pax-mark m "out/Release/${x}" |
1367 |
- fi |
1368 |
- done |
1369 |
- |
1370 |
- # Even though ninja autodetects number of CPUs, we respect |
1371 |
- # user's options, for debugging with -j 1 or any other reason. |
1372 |
- eninja -C out/Release chrome chromedriver |
1373 |
- use suid && eninja -C out/Release chrome_sandbox |
1374 |
- |
1375 |
- pax-mark m out/Release/chrome |
1376 |
-} |
1377 |
- |
1378 |
-src_install() { |
1379 |
- local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" |
1380 |
- exeinto "${CHROMIUM_HOME}" |
1381 |
- doexe out/Release/chrome |
1382 |
- |
1383 |
- if use suid; then |
1384 |
- newexe out/Release/chrome_sandbox chrome-sandbox |
1385 |
- fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" |
1386 |
- fi |
1387 |
- |
1388 |
- doexe out/Release/chromedriver |
1389 |
- |
1390 |
- local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) |
1391 |
- sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die |
1392 |
- doexe chromium-launcher.sh |
1393 |
- |
1394 |
- # It is important that we name the target "chromium-browser", |
1395 |
- # xdg-utils expect it; bug #355517. |
1396 |
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser |
1397 |
- # keep the old symlink around for consistency |
1398 |
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium |
1399 |
- |
1400 |
- dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver |
1401 |
- |
1402 |
- # Allow users to override command-line options, bug #357629. |
1403 |
- insinto /etc/chromium |
1404 |
- newins "${FILESDIR}/chromium.default" "default" |
1405 |
- |
1406 |
- pushd out/Release/locales > /dev/null || die |
1407 |
- chromium_remove_language_paks |
1408 |
- popd |
1409 |
- |
1410 |
- insinto "${CHROMIUM_HOME}" |
1411 |
- doins out/Release/*.bin |
1412 |
- doins out/Release/*.pak |
1413 |
- doins out/Release/*.so |
1414 |
- |
1415 |
- if ! use system-icu; then |
1416 |
- doins out/Release/icudtl.dat |
1417 |
- fi |
1418 |
- |
1419 |
- doins -r out/Release/locales |
1420 |
- doins -r out/Release/resources |
1421 |
- |
1422 |
- if [[ -d out/Release/swiftshader ]]; then |
1423 |
- insinto "${CHROMIUM_HOME}/swiftshader" |
1424 |
- doins out/Release/swiftshader/*.so |
1425 |
- fi |
1426 |
- |
1427 |
- # Install icons and desktop entry. |
1428 |
- local branding size |
1429 |
- for size in 16 22 24 32 48 64 128 256 ; do |
1430 |
- case ${size} in |
1431 |
- 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; |
1432 |
- *) branding="chrome/app/theme/chromium" ;; |
1433 |
- esac |
1434 |
- newicon -s ${size} "${branding}/product_logo_${size}.png" \ |
1435 |
- chromium-browser.png |
1436 |
- done |
1437 |
- |
1438 |
- local mime_types="text/html;text/xml;application/xhtml+xml;" |
1439 |
- mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 |
1440 |
- mime_types+="x-scheme-handler/ftp;" # bug #412185 |
1441 |
- mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 |
1442 |
- make_desktop_entry \ |
1443 |
- chromium-browser \ |
1444 |
- "Chromium" \ |
1445 |
- chromium-browser \ |
1446 |
- "Network;WebBrowser" \ |
1447 |
- "MimeType=${mime_types}\nStartupWMClass=chromium-browser" |
1448 |
- sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die |
1449 |
- |
1450 |
- # Install GNOME default application entry (bug #303100). |
1451 |
- insinto /usr/share/gnome-control-center/default-apps |
1452 |
- newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml |
1453 |
- |
1454 |
- readme.gentoo_create_doc |
1455 |
-} |
1456 |
- |
1457 |
-pkg_postrm() { |
1458 |
- if type gtk-update-icon-cache &>/dev/null; then |
1459 |
- ebegin "Updating GTK icon cache" |
1460 |
- gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor" |
1461 |
- eend $? |
1462 |
- fi |
1463 |
- xdg_desktop_database_update |
1464 |
-} |
1465 |
- |
1466 |
-pkg_postinst() { |
1467 |
- if type gtk-update-icon-cache &>/dev/null; then |
1468 |
- ebegin "Updating GTK icon cache" |
1469 |
- gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor" |
1470 |
- eend $? |
1471 |
- fi |
1472 |
- xdg_desktop_database_update |
1473 |
- readme.gentoo_print_elog |
1474 |
-} |
1475 |
|
1476 |
diff --git a/www-client/chromium/files/chromium-71-gcc-0.patch b/www-client/chromium/files/chromium-71-gcc-0.patch |
1477 |
deleted file mode 100644 |
1478 |
index 711b827566f..00000000000 |
1479 |
--- a/www-client/chromium/files/chromium-71-gcc-0.patch |
1480 |
+++ /dev/null |
1481 |
@@ -1,57 +0,0 @@ |
1482 |
-From 65be571f6ac2f7942b4df9e50b24da517f829eec Mon Sep 17 00:00:00 2001 |
1483 |
-From: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
1484 |
-Date: Mon, 15 Oct 2018 20:26:10 +0000 |
1485 |
-Subject: [PATCH] google_util: Explicitly use std::initializer_list with |
1486 |
- base::NoDestructor |
1487 |
-MIME-Version: 1.0 |
1488 |
-Content-Type: text/plain; charset=UTF-8 |
1489 |
-Content-Transfer-Encoding: 8bit |
1490 |
- |
1491 |
-Follow-up to ac53c5c53 ("Remove CR_DEFINE_STATIC_LOCAL from /components"). |
1492 |
-Due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84849, having |
1493 |
-base::NoDestructor<T<U>> and passing an initializer list of Us does not |
1494 |
-work if this is not done explicitly, as GCC incorrectly fails to determine |
1495 |
-which constructor overload to use: |
1496 |
- |
1497 |
- ../../components/google/core/common/google_util.cc: In function ‘bool google_util::{anonymous}::IsCanonicalHostGoogleHostname(base::StringPiece, google_util::SubdomainPermission)’: |
1498 |
- ../../components/google/core/common/google_util.cc:120:24: error: call of overloaded ‘NoDestructor(<brace-enclosed initializer list>)’ is ambiguous |
1499 |
- {GOOGLE_TLD_LIST}); |
1500 |
- |
1501 |
-See also: https://chromium-review.googlesource.com/c/chromium/src/+/1170905 |
1502 |
- |
1503 |
-Bug: 819294 |
1504 |
-Change-Id: Ie1490b6646d7998d636c485769caabf56c1cf44c |
1505 |
-Reviewed-on: https://chromium-review.googlesource.com/c/1275854 |
1506 |
-Reviewed-by: Peter Kasting <pkasting@××××××××.org> |
1507 |
-Commit-Queue: Raphael Kubo da Costa (CET) <raphael.kubo.da.costa@×××××.com> |
1508 |
-Cr-Commit-Position: refs/heads/master@{#599733} |
1509 |
---- |
1510 |
- components/google/core/common/google_util.cc | 5 +++-- |
1511 |
- 1 file changed, 3 insertions(+), 2 deletions(-) |
1512 |
- |
1513 |
-diff --git a/components/google/core/common/google_util.cc b/components/google/core/common/google_util.cc |
1514 |
-index a44c84393820..7733848a0443 100644 |
1515 |
---- a/components/google/core/common/google_util.cc |
1516 |
-+++ b/components/google/core/common/google_util.cc |
1517 |
-@@ -117,7 +117,7 @@ bool IsCanonicalHostGoogleHostname(base::StringPiece canonical_host, |
1518 |
- StripTrailingDot(&tld); |
1519 |
- |
1520 |
- static base::NoDestructor<std::set<std::string>> google_tlds( |
1521 |
-- {GOOGLE_TLD_LIST}); |
1522 |
-+ std::initializer_list<std::string>({GOOGLE_TLD_LIST})); |
1523 |
- return base::ContainsKey(*google_tlds, tld.as_string()); |
1524 |
- } |
1525 |
- |
1526 |
-@@ -132,7 +132,8 @@ bool IsGoogleSearchSubdomainUrl(const GURL& url) { |
1527 |
- StripTrailingDot(&host); |
1528 |
- |
1529 |
- static base::NoDestructor<std::set<std::string>> google_subdomains( |
1530 |
-- {"ipv4.google.com", "ipv6.google.com"}); |
1531 |
-+ std::initializer_list<std::string>( |
1532 |
-+ {"ipv4.google.com", "ipv6.google.com"})); |
1533 |
- |
1534 |
- return base::ContainsKey(*google_subdomains, host.as_string()); |
1535 |
- } |
1536 |
--- |
1537 |
-2.19.1 |
1538 |
- |
1539 |
|
1540 |
diff --git a/www-client/chromium/files/chromium-compiler-r6.patch b/www-client/chromium/files/chromium-compiler-r6.patch |
1541 |
deleted file mode 100644 |
1542 |
index db8d04649fd..00000000000 |
1543 |
--- a/www-client/chromium/files/chromium-compiler-r6.patch |
1544 |
+++ /dev/null |
1545 |
@@ -1,170 +0,0 @@ |
1546 |
-From cec10e55fdb150b33342ad462907fb6202de364e Mon Sep 17 00:00:00 2001 |
1547 |
-From: Mike Gilbert <floppym@g.o> |
1548 |
-Date: Wed, 25 Apr 2018 13:22:49 -0400 |
1549 |
-Subject: [PATCH] Disable various compiler configs |
1550 |
- |
1551 |
---- |
1552 |
- build/config/compiler/BUILD.gn | 63 ++++++++++------------------------ |
1553 |
- 1 file changed, 18 insertions(+), 45 deletions(-) |
1554 |
- |
1555 |
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn |
1556 |
-index 0f7a6b48f7b2..c91b702147d4 100644 |
1557 |
---- a/build/config/compiler/BUILD.gn |
1558 |
-+++ b/build/config/compiler/BUILD.gn |
1559 |
-@@ -236,8 +236,6 @@ config("compiler") { |
1560 |
- |
1561 |
- configs += [ |
1562 |
- # See the definitions below. |
1563 |
-- ":clang_revision", |
1564 |
-- ":compiler_cpu_abi", |
1565 |
- ":compiler_codegen", |
1566 |
- ] |
1567 |
- |
1568 |
-@@ -502,17 +500,6 @@ config("compiler") { |
1569 |
- } |
1570 |
- } |
1571 |
- |
1572 |
-- if (is_clang && !is_nacl && !use_xcode_clang) { |
1573 |
-- cflags += [ |
1574 |
-- # TODO(hans): Remove this once Clang generates better optimized debug info |
1575 |
-- # by default. https://crbug.com/765793 |
1576 |
-- "-Xclang", |
1577 |
-- "-mllvm", |
1578 |
-- "-Xclang", |
1579 |
-- "-instcombine-lower-dbg-declare=0", |
1580 |
-- ] |
1581 |
-- } |
1582 |
-- |
1583 |
- # Print absolute paths in diagnostics. There is no precedent for doing this |
1584 |
- # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and |
1585 |
- # Windows developers rely on it (crbug.com/636109) so only do this on Windows. |
1586 |
-@@ -1498,13 +1485,6 @@ config("default_warnings") { |
1587 |
- cflags += [ |
1588 |
- # TODO(thakis): https://crbug.com/753973 |
1589 |
- "-Wno-enum-compare-switch", |
1590 |
-- |
1591 |
-- # Ignore warnings about MSVC optimization pragmas. |
1592 |
-- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 |
1593 |
-- "-Wno-ignored-pragma-optimize", |
1594 |
-- |
1595 |
-- # TODO(hans): https://crbug.com/890307 |
1596 |
-- "-Wno-defaulted-function-deleted", |
1597 |
- ] |
1598 |
- } |
1599 |
- } |
1600 |
-@@ -1546,22 +1526,6 @@ config("chromium_code") { |
1601 |
- "__STDC_FORMAT_MACROS", |
1602 |
- ] |
1603 |
- |
1604 |
-- if (!is_debug && !using_sanitizer && |
1605 |
-- (!is_linux || !is_clang || is_official_build) && |
1606 |
-- current_cpu != "s390x" && current_cpu != "s390" && |
1607 |
-- current_cpu != "ppc64" && current_cpu != "ppc64" && |
1608 |
-- current_cpu != "mips" && current_cpu != "mips64") { |
1609 |
-- # _FORTIFY_SOURCE isn't really supported by Clang now, see |
1610 |
-- # http://llvm.org/bugs/show_bug.cgi?id=16821. |
1611 |
-- # It seems to work fine with Ubuntu 12 headers though, so use it in |
1612 |
-- # official builds. |
1613 |
-- # |
1614 |
-- # Non-chromium code is not guaranteed to compile cleanly with |
1615 |
-- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are |
1616 |
-- # disabled, so only do that for Release build. |
1617 |
-- defines += [ "_FORTIFY_SOURCE=2" ] |
1618 |
-- } |
1619 |
-- |
1620 |
- if (is_mac) { |
1621 |
- cflags_objc = [ "-Wobjc-missing-property-synthesis" ] |
1622 |
- cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] |
1623 |
-@@ -1931,7 +1895,8 @@ config("default_stack_frames") { |
1624 |
- } |
1625 |
- |
1626 |
- # Default "optimization on" config. |
1627 |
--config("optimize") { |
1628 |
-+config("optimize") { } |
1629 |
-+config("xoptimize") { |
1630 |
- if (is_win) { |
1631 |
- # TODO(thakis): Remove is_clang here, https://crbug.com/598772 |
1632 |
- if (is_official_build && full_wpo_on_official && !is_clang) { |
1633 |
-@@ -1965,7 +1930,8 @@ config("optimize") { |
1634 |
- } |
1635 |
- |
1636 |
- # Same config as 'optimize' but without the WPO flag. |
1637 |
--config("optimize_no_wpo") { |
1638 |
-+config("optimize_no_wpo") { } |
1639 |
-+config("xoptimize_no_wpo") { |
1640 |
- if (is_win) { |
1641 |
- # Favor size over speed, /O1 must be before the common flags. The GYP |
1642 |
- # build also specifies /Os and /GF but these are implied by /O1. |
1643 |
-@@ -1988,7 +1954,8 @@ config("optimize_no_wpo") { |
1644 |
- } |
1645 |
- |
1646 |
- # Turn off optimizations. |
1647 |
--config("no_optimize") { |
1648 |
-+config("no_optimize") { } |
1649 |
-+config("xno_optimize") { |
1650 |
- if (is_win) { |
1651 |
- cflags = [ |
1652 |
- "/Od", # Disable optimization. |
1653 |
-@@ -2012,7 +1979,8 @@ config("no_optimize") { |
1654 |
- # Turns up the optimization level. On Windows, this implies whole program |
1655 |
- # optimization and link-time code generation which is very expensive and should |
1656 |
- # be used sparingly. |
1657 |
--config("optimize_max") { |
1658 |
-+config("optimize_max") { } |
1659 |
-+config("xoptimize_max") { |
1660 |
- if (is_nacl && is_nacl_irt) { |
1661 |
- # The NaCl IRT is a special case and always wants its own config. |
1662 |
- # Various components do: |
1663 |
-@@ -2059,7 +2027,8 @@ config("optimize_max") { |
1664 |
- # |
1665 |
- # TODO(crbug.com/621335) - rework how all of these configs are related |
1666 |
- # so that we don't need this disclaimer. |
1667 |
--config("optimize_speed") { |
1668 |
-+config("optimize_speed") { } |
1669 |
-+config("xoptimize_speed") { |
1670 |
- if (is_nacl && is_nacl_irt) { |
1671 |
- # The NaCl IRT is a special case and always wants its own config. |
1672 |
- # Various components do: |
1673 |
-@@ -2097,7 +2066,8 @@ config("optimize_speed") { |
1674 |
- } |
1675 |
- } |
1676 |
- |
1677 |
--config("optimize_fuzzing") { |
1678 |
-+config("optimize_fuzzing") { } |
1679 |
-+config("xoptimize_fuzzing") { |
1680 |
- cflags = [ "-O1" ] + common_optimize_on_cflags |
1681 |
- ldflags = common_optimize_on_ldflags |
1682 |
- visibility = [ ":default_optimization" ] |
1683 |
-@@ -2183,7 +2153,8 @@ config("afdo") { |
1684 |
- # configs += [ "//build/config/compiler:symbols" ] |
1685 |
- |
1686 |
- # Full symbols. |
1687 |
--config("symbols") { |
1688 |
-+config("symbols") { } |
1689 |
-+config("xsymbols") { |
1690 |
- if (is_win) { |
1691 |
- if (use_goma || is_clang) { |
1692 |
- # Note that with VC++ this requires is_win_fastlink, enforced elsewhere. |
1693 |
-@@ -2281,7 +2252,8 @@ config("symbols") { |
1694 |
- # Minimal symbols. |
1695 |
- # This config guarantees to hold symbol for stack trace which are shown to user |
1696 |
- # when crash happens in unittests running on buildbot. |
1697 |
--config("minimal_symbols") { |
1698 |
-+config("minimal_symbols") { } |
1699 |
-+config("xminimal_symbols") { |
1700 |
- if (is_win) { |
1701 |
- # Linker symbols for backtraces only. |
1702 |
- cflags = [] |
1703 |
-@@ -2321,7 +2293,8 @@ config("minimal_symbols") { |
1704 |
- } |
1705 |
- |
1706 |
- # No symbols. |
1707 |
--config("no_symbols") { |
1708 |
-+config("no_symbols") { } |
1709 |
-+config("xno_symbols") { |
1710 |
- if (!is_win) { |
1711 |
- cflags = [ "-g0" ] |
1712 |
- asmflags = cflags |
1713 |
--- |
1714 |
-2.19.1 |
1715 |
- |
1716 |
|
1717 |
diff --git a/www-client/chromium/files/chromium-harfbuzz-r0.patch b/www-client/chromium/files/chromium-harfbuzz-r0.patch |
1718 |
deleted file mode 100644 |
1719 |
index 2d5602de280..00000000000 |
1720 |
--- a/www-client/chromium/files/chromium-harfbuzz-r0.patch |
1721 |
+++ /dev/null |
1722 |
@@ -1,80 +0,0 @@ |
1723 |
-From 7ae38170a117e909bb28e1470842b68de3501197 Mon Sep 17 00:00:00 2001 |
1724 |
-From: Mike Gilbert <floppymaster@×××××.com> |
1725 |
-Date: Sun, 21 Oct 2018 10:06:53 -0400 |
1726 |
-Subject: [PATCH] blink: add 'const' modifier for harfbuzz hb_codepoint_t |
1727 |
- pointers |
1728 |
- |
1729 |
-This resolves a build failure against harfbuzz 2.0. |
1730 |
- |
1731 |
-Based on a patch by Alexandre Fierreira. |
1732 |
- |
1733 |
-Bug: https://bugs.gentoo.org/669034 |
1734 |
---- |
1735 |
- .../renderer/platform/fonts/shaping/harfbuzz_face.cc | 2 +- |
1736 |
- .../renderer/platform/fonts/skia/skia_text_metrics.cc | 9 +++++++-- |
1737 |
- .../renderer/platform/fonts/skia/skia_text_metrics.h | 2 +- |
1738 |
- 3 files changed, 9 insertions(+), 4 deletions(-) |
1739 |
- |
1740 |
-diff --git a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc |
1741 |
-index 8e7d91ca371f..e279a5876cb3 100644 |
1742 |
---- a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc |
1743 |
-+++ b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc |
1744 |
-@@ -139,7 +139,7 @@ static hb_position_t HarfBuzzGetGlyphHorizontalAdvance(hb_font_t* hb_font, |
1745 |
- static void HarfBuzzGetGlyphHorizontalAdvances(hb_font_t* font, |
1746 |
- void* font_data, |
1747 |
- unsigned count, |
1748 |
-- hb_codepoint_t* first_glyph, |
1749 |
-+ const hb_codepoint_t* first_glyph, |
1750 |
- unsigned int glyph_stride, |
1751 |
- hb_position_t* first_advance, |
1752 |
- unsigned int advance_stride, |
1753 |
-diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc |
1754 |
-index 77ec6209fab9..9f9070921448 100644 |
1755 |
---- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc |
1756 |
-+++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc |
1757 |
-@@ -18,6 +18,11 @@ T* advance_by_byte_size(T* p, unsigned byte_size) { |
1758 |
- return reinterpret_cast<T*>(reinterpret_cast<uint8_t*>(p) + byte_size); |
1759 |
- } |
1760 |
- |
1761 |
-+template <class T> |
1762 |
-+T* advance_by_byte_size_const(T* p, unsigned byte_size) { |
1763 |
-+ return reinterpret_cast<T*>(reinterpret_cast<const uint8_t*>(p) + byte_size); |
1764 |
-+} |
1765 |
-+ |
1766 |
- } // namespace |
1767 |
- |
1768 |
- SkiaTextMetrics::SkiaTextMetrics(const SkPaint* paint) : paint_(paint) { |
1769 |
-@@ -39,7 +44,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(hb_codepoint_t codepoint, |
1770 |
- } |
1771 |
- |
1772 |
- void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count, |
1773 |
-- hb_codepoint_t* glyphs, |
1774 |
-+ const hb_codepoint_t* glyphs, |
1775 |
- unsigned glyph_stride, |
1776 |
- hb_position_t* advances, |
1777 |
- unsigned advance_stride) { |
1778 |
-@@ -48,7 +53,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count, |
1779 |
- // array that copy them to a regular array. |
1780 |
- Vector<Glyph, 256> glyph_array(count); |
1781 |
- for (unsigned i = 0; i < count; |
1782 |
-- i++, glyphs = advance_by_byte_size(glyphs, glyph_stride)) { |
1783 |
-+ i++, glyphs = advance_by_byte_size_const(glyphs, glyph_stride)) { |
1784 |
- glyph_array[i] = *glyphs; |
1785 |
- } |
1786 |
- Vector<SkScalar, 256> sk_width_array(count); |
1787 |
-diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h |
1788 |
-index 787d8af0375a..3bc4407c641b 100644 |
1789 |
---- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h |
1790 |
-+++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h |
1791 |
-@@ -19,7 +19,7 @@ class SkiaTextMetrics final { |
1792 |
- |
1793 |
- void GetGlyphWidthForHarfBuzz(hb_codepoint_t, hb_position_t* width); |
1794 |
- void GetGlyphWidthForHarfBuzz(unsigned count, |
1795 |
-- hb_codepoint_t* first_glyph, |
1796 |
-+ const hb_codepoint_t* first_glyph, |
1797 |
- unsigned glyph_stride, |
1798 |
- hb_position_t* first_advance, |
1799 |
- unsigned advance_stride); |
1800 |
--- |
1801 |
-2.19.1 |
1802 |
- |
1803 |
|
1804 |
diff --git a/www-client/chromium/files/chromium-widevine-r3.patch b/www-client/chromium/files/chromium-widevine-r3.patch |
1805 |
deleted file mode 100644 |
1806 |
index a126084563c..00000000000 |
1807 |
--- a/www-client/chromium/files/chromium-widevine-r3.patch |
1808 |
+++ /dev/null |
1809 |
@@ -1,23 +0,0 @@ |
1810 |
-From 5818fdbef3d399fe1bfbb56f81e59184e1a8e467 Mon Sep 17 00:00:00 2001 |
1811 |
-From: Mike Gilbert <floppymaster@×××××.com> |
1812 |
-Date: Sun, 14 Oct 2018 20:04:03 -0400 |
1813 |
-Subject: [PATCH] Define WIDEVINE_CDM_VERSION_STRING |
1814 |
- |
1815 |
---- |
1816 |
- third_party/widevine/cdm/widevine_cdm_version.h | 1 + |
1817 |
- 1 file changed, 1 insertion(+) |
1818 |
- |
1819 |
-diff --git a/third_party/widevine/cdm/widevine_cdm_version.h b/third_party/widevine/cdm/widevine_cdm_version.h |
1820 |
-index dd6efed02646..eaa017197e61 100644 |
1821 |
---- a/third_party/widevine/cdm/widevine_cdm_version.h |
1822 |
-+++ b/third_party/widevine/cdm/widevine_cdm_version.h |
1823 |
-@@ -11,5 +11,6 @@ |
1824 |
- // If the Widevine CDM is available define the following: |
1825 |
- // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available |
1826 |
- // as a string, e.g., "1.0.123.456"). |
1827 |
-+#define WIDEVINE_CDM_VERSION_STRING "unknown" |
1828 |
- |
1829 |
- #endif // WIDEVINE_CDM_VERSION_H_ |
1830 |
--- |
1831 |
-2.19.1 |
1832 |
- |