1 |
commit: 79f11419507ebc46b3fe2bd48ec962df27b31d30 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 10 02:47:55 2018 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 10 02:48:15 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79f11419 |
7 |
|
8 |
www-client/chromium: beta channel bump (68.0.3440.17) |
9 |
|
10 |
Package-Manager: Portage-2.3.40_p14, Repoman-2.3.9_p246 |
11 |
|
12 |
www-client/chromium/Manifest | 2 +- |
13 |
....3409.2.ebuild => chromium-68.0.3440.17.ebuild} | 48 ++++++----------- |
14 |
.../chromium/files/chromium-cors-string-r0.patch | 51 ++++++++++++++++++ |
15 |
.../chromium/files/chromium-libjpeg-r0.patch | 62 ++++++++++++++++++++++ |
16 |
.../chromium/files/chromium-libwebp-shim-r0.patch | 43 +++++++++++++++ |
17 |
5 files changed, 173 insertions(+), 33 deletions(-) |
18 |
|
19 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
20 |
index 13945ede85e..aef8717a345 100644 |
21 |
--- a/www-client/chromium/Manifest |
22 |
+++ b/www-client/chromium/Manifest |
23 |
@@ -1,4 +1,4 @@ |
24 |
DIST chromium-67.0.3396.62.tar.xz 591452000 BLAKE2B 01d63d21548fcfc707e3ab1d293f24f34237784ec87949e2886a364d7e8f517f82e98803f45b690111a31304d269917442305d04fa13c34180f852007280a78c SHA512 c768701a04600f6dd981ea036a28973df104281dcdadda20d0ae515a0b80112b94840cee36823676c4b4cd71e0e6ef069af801f746fea29d65f978a3666f6cb0 |
25 |
DIST chromium-67.0.3396.79.tar.xz 591459156 BLAKE2B c62a54ceaf240a06ce54ff2e13ea1c22bb89c7d88628ab005230ded307b44836c96f12fc85cef85fe088fbed66e203bc359d2b516347969d733e99b0e6d143b6 SHA512 4b7cd2cdc5a2b784e61498e945dbac0a086f2ff9224e0c050f85ab86183602860b34dc305c99730c31478820e48a1da4570284359f13275ab2b10592190cbca8 |
26 |
-DIST chromium-68.0.3409.2.tar.xz 595647380 BLAKE2B 3f3ebb7de759ae92b8feca74a931c10c4bdf4f75a0a7aeb2f56b59e635e1f03becccdf2b26d306e5753d9379eadede6ef50ec4e44338a3a6bdfb960b74003770 SHA512 2ce35251392570bcfe0cc02813bf6cee1761b2227888a135491828bfdfa9eafa4538e8fb981165503f901eecbf91cc8ce17cebab1681c63a43f0625dae7a2dd8 |
27 |
DIST chromium-68.0.3438.3.tar.xz 624448788 BLAKE2B 25e8f6bfc9171f17a634caa8974a01dba8e0b40dba78534f8b04cbced98566ce8addba65907165599587d0120563073f051af2af19601e4556182b9ec5442113 SHA512 2ff17270acee971bf9a2770b826f919979f24ab7be12a00504ad0b16e72f21fd70f7dc543e8823f8c1737ff785ae900e999d2e82153ff84d0b33cf68ad82a2a2 |
28 |
+DIST chromium-68.0.3440.17.tar.xz 624240248 BLAKE2B 9322f731efbc218dbefec351984f93bac5deedee3cc5ce426a619262d885097f28d8532a3d5b55e8daacd2c28dee2dd85dd4063687cbc7ed7d125d2a2a48f885 SHA512 1a6af7c5f3bfe87b37844c9d863f512aa464de75252487877d7796fa0dc246a533357086c64701f624809493eef97fced23d3eaa449819b38ce6038227015d35 |
29 |
|
30 |
diff --git a/www-client/chromium/chromium-68.0.3409.2.ebuild b/www-client/chromium/chromium-68.0.3440.17.ebuild |
31 |
similarity index 94% |
32 |
rename from www-client/chromium/chromium-68.0.3409.2.ebuild |
33 |
rename to www-client/chromium/chromium-68.0.3440.17.ebuild |
34 |
index 11a9cd104a2..13d9aa7c022 100644 |
35 |
--- a/www-client/chromium/chromium-68.0.3409.2.ebuild |
36 |
+++ b/www-client/chromium/chromium-68.0.3440.17.ebuild |
37 |
@@ -8,7 +8,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he |
38 |
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 |
39 |
sv sw ta te th tr uk vi zh-CN zh-TW" |
40 |
|
41 |
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils |
42 |
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils |
43 |
|
44 |
DESCRIPTION="Open-source version of Google Chrome web browser" |
45 |
HOMEPAGE="http://chromium.org/" |
46 |
@@ -104,22 +104,8 @@ DEPEND="${COMMON_DEPEND} |
47 |
>=sys-devel/clang-5 |
48 |
virtual/pkgconfig |
49 |
dev-vcs/git |
50 |
- $(python_gen_any_dep ' |
51 |
- dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] |
52 |
- >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}] |
53 |
- dev-python/html5lib[${PYTHON_USEDEP}] |
54 |
- dev-python/simplejson[${PYTHON_USEDEP}] |
55 |
- ') |
56 |
" |
57 |
|
58 |
-# Keep this in sync with the python_gen_any_dep call. |
59 |
-python_check_deps() { |
60 |
- has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && |
61 |
- has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" && |
62 |
- has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" && |
63 |
- has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]" |
64 |
-} |
65 |
- |
66 |
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then |
67 |
EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; |
68 |
fi |
69 |
@@ -145,14 +131,15 @@ GTK+ icon theme. |
70 |
|
71 |
PATCHES=( |
72 |
"${FILESDIR}/chromium-widevine-r2.patch" |
73 |
- "${FILESDIR}/chromium-compiler-r1.patch" |
74 |
- "${FILESDIR}/chromium-ffmpeg-build-r0.patch" |
75 |
+ "${FILESDIR}/chromium-compiler-r2.patch" |
76 |
"${FILESDIR}/chromium-webrtc-r0.patch" |
77 |
"${FILESDIR}/chromium-memcpy-r0.patch" |
78 |
"${FILESDIR}/chromium-math.h-r0.patch" |
79 |
"${FILESDIR}/chromium-stdint.patch" |
80 |
"${FILESDIR}/chromium-ffmpeg-r1.patch" |
81 |
- "${FILESDIR}/chromium-gn-bootstrap-r23.patch" |
82 |
+ "${FILESDIR}/chromium-libjpeg-r0.patch" |
83 |
+ "${FILESDIR}/chromium-cors-string-r0.patch" |
84 |
+ "${FILESDIR}/chromium-libwebp-shim-r0.patch" |
85 |
) |
86 |
|
87 |
pre_build_checks() { |
88 |
@@ -218,6 +205,8 @@ src_prepare() { |
89 |
net/third_party/http2 |
90 |
net/third_party/mozilla_security_manager |
91 |
net/third_party/nss |
92 |
+ net/third_party/quic |
93 |
+ net/third_party/spdy |
94 |
third_party/WebKit |
95 |
third_party/analytics |
96 |
third_party/angle |
97 |
@@ -241,7 +230,10 @@ src_prepare() { |
98 |
third_party/catapult |
99 |
third_party/catapult/common/py_vulcanize/third_party/rcssmin |
100 |
third_party/catapult/common/py_vulcanize/third_party/rjsmin |
101 |
+ third_party/catapult/third_party/beautifulsoup4 |
102 |
+ third_party/catapult/third_party/html5lib-python |
103 |
third_party/catapult/third_party/polymer |
104 |
+ third_party/catapult/third_party/six |
105 |
third_party/catapult/tracing/third_party/d3 |
106 |
third_party/catapult/tracing/third_party/gl-matrix |
107 |
third_party/catapult/tracing/third_party/jszip |
108 |
@@ -275,11 +267,11 @@ src_prepare() { |
109 |
third_party/libXNVCtrl |
110 |
third_party/libaddressinput |
111 |
third_party/libaom |
112 |
- third_party/libaom/source/libaom/third_party/x86inc |
113 |
third_party/libjingle |
114 |
third_party/libphonenumber |
115 |
third_party/libsecret |
116 |
third_party/libsrtp |
117 |
+ third_party/libsync |
118 |
third_party/libudev |
119 |
third_party/libwebm |
120 |
third_party/libxml/chromium |
121 |
@@ -310,9 +302,12 @@ src_prepare() { |
122 |
third_party/polymer |
123 |
third_party/protobuf |
124 |
third_party/protobuf/third_party/six |
125 |
+ third_party/pyjson5 |
126 |
third_party/qcms |
127 |
+ third_party/rnnoise |
128 |
third_party/s2cellid |
129 |
third_party/sfntly |
130 |
+ third_party/simplejson |
131 |
third_party/skia |
132 |
third_party/skia/third_party/gif |
133 |
third_party/skia/third_party/skcms |
134 |
@@ -557,7 +552,8 @@ src_configure() { |
135 |
# https://bugs.gentoo.org/654216 |
136 |
addpredict /dev/dri/ #nowarn |
137 |
|
138 |
- if ! use system-ffmpeg; then |
139 |
+ #if ! use system-ffmpeg; then |
140 |
+ if false; then |
141 |
local build_ffmpeg_args="" |
142 |
if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then |
143 |
build_ffmpeg_args+=" --disable-asm" |
144 |
@@ -587,18 +583,6 @@ src_compile() { |
145 |
|
146 |
#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die |
147 |
|
148 |
- # Build mksnapshot and pax-mark it. |
149 |
- local x |
150 |
- for x in mksnapshot v8_context_snapshot_generator; do |
151 |
- if tc-is-cross-compiler; then |
152 |
- eninja -C out/Release "host/${x}" |
153 |
- pax-mark m "out/Release/host/${x}" |
154 |
- else |
155 |
- eninja -C out/Release "${x}" |
156 |
- pax-mark m "out/Release/${x}" |
157 |
- fi |
158 |
- done |
159 |
- |
160 |
# Even though ninja autodetects number of CPUs, we respect |
161 |
# user's options, for debugging with -j 1 or any other reason. |
162 |
eninja -C out/Release chrome chromedriver |
163 |
|
164 |
diff --git a/www-client/chromium/files/chromium-cors-string-r0.patch b/www-client/chromium/files/chromium-cors-string-r0.patch |
165 |
new file mode 100644 |
166 |
index 00000000000..b724cd44df7 |
167 |
--- /dev/null |
168 |
+++ b/www-client/chromium/files/chromium-cors-string-r0.patch |
169 |
@@ -0,0 +1,51 @@ |
170 |
+From 01d891fa0790950549c7bedb34edf869827a372e Mon Sep 17 00:00:00 2001 |
171 |
+From: Jose Dapena Paz <jose.dapena@×××.com> |
172 |
+Date: Thu, 31 May 2018 17:03:37 +0000 |
173 |
+Subject: [PATCH] CORS legacy: add missing string include |
174 |
+MIME-Version: 1.0 |
175 |
+Content-Type: text/plain; charset=UTF-8 |
176 |
+Content-Transfer-Encoding: 8bit |
177 |
+ |
178 |
+The cors_legacy.h file includes declarations using std::string, but |
179 |
+it is not declared due to missing #include <string>. |
180 |
+ |
181 |
+Also drop unneeded declarations in .cpp file. |
182 |
+ |
183 |
+Change-Id: I00df799f84a6c3530c2f12f1e52d24c7d9bd6bfd |
184 |
+Reviewed-on: https://chromium-review.googlesource.com/1080707 |
185 |
+Reviewed-by: Tom Sepez <tsepez@××××××××.org> |
186 |
+Commit-Queue: José Dapena Paz <jose.dapena@×××.com> |
187 |
+Cr-Commit-Position: refs/heads/master@{#563282} |
188 |
+--- |
189 |
+ services/network/public/cpp/cors/cors_legacy.cc | 2 -- |
190 |
+ services/network/public/cpp/cors/cors_legacy.h | 1 + |
191 |
+ 2 files changed, 1 insertion(+), 2 deletions(-) |
192 |
+ |
193 |
+diff --git a/services/network/public/cpp/cors/cors_legacy.cc b/services/network/public/cpp/cors/cors_legacy.cc |
194 |
+index 8f32ac3be64e..f01af63619b5 100644 |
195 |
+--- a/services/network/public/cpp/cors/cors_legacy.cc |
196 |
++++ b/services/network/public/cpp/cors/cors_legacy.cc |
197 |
+@@ -5,8 +5,6 @@ |
198 |
+ #include "services/network/public/cpp/cors/cors_legacy.h" |
199 |
+ |
200 |
+ #include <algorithm> |
201 |
+-#include <string> |
202 |
+-#include <vector> |
203 |
+ |
204 |
+ #include "url/gurl.h" |
205 |
+ #include "url/url_util.h" |
206 |
+diff --git a/services/network/public/cpp/cors/cors_legacy.h b/services/network/public/cpp/cors/cors_legacy.h |
207 |
+index d2cdf026ca3a..dc9295a92c47 100644 |
208 |
+--- a/services/network/public/cpp/cors/cors_legacy.h |
209 |
++++ b/services/network/public/cpp/cors/cors_legacy.h |
210 |
+@@ -5,6 +5,7 @@ |
211 |
+ #ifndef SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_ |
212 |
+ #define SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_ |
213 |
+ |
214 |
++#include <string> |
215 |
+ #include <vector> |
216 |
+ |
217 |
+ #include "base/component_export.h" |
218 |
+-- |
219 |
+2.17.1 |
220 |
+ |
221 |
|
222 |
diff --git a/www-client/chromium/files/chromium-libjpeg-r0.patch b/www-client/chromium/files/chromium-libjpeg-r0.patch |
223 |
new file mode 100644 |
224 |
index 00000000000..5354281cace |
225 |
--- /dev/null |
226 |
+++ b/www-client/chromium/files/chromium-libjpeg-r0.patch |
227 |
@@ -0,0 +1,62 @@ |
228 |
+From c6b0194f7a4d9f494b2d51f46d2c332e2e5f4050 Mon Sep 17 00:00:00 2001 |
229 |
+From: Daniel Bratell <bratell@×××××.com> |
230 |
+Date: Mon, 28 May 2018 13:13:01 +0000 |
231 |
+Subject: [PATCH] Use the same libjpeg in all of blink/platform |
232 |
+ |
233 |
+The normal libjpeg renames some symbols with macros so if its |
234 |
+headers are included together with libjpeg-turbo's headers |
235 |
+in the same translation unit, there will be an inconsistent |
236 |
+renaming of libjpeg symbols. This happened in some extreme |
237 |
+jumbo configuration and resulted in confising linker errors. |
238 |
+ |
239 |
+This patch changes an include so that jpeglib.h becomes included |
240 |
+the same way everywhere. |
241 |
+ |
242 |
+Change-Id: I7f122d0919d58371bb40dc0097a766b857b9815e |
243 |
+Reviewed-on: https://chromium-review.googlesource.com/1073423 |
244 |
+Reviewed-by: Kentaro Hara <haraken@××××××××.org> |
245 |
+Commit-Queue: Daniel Bratell <bratell@×××××.com> |
246 |
+Cr-Commit-Position: refs/heads/master@{#562243} |
247 |
+--- |
248 |
+ .../renderer/platform/image-encoders/image_encoder.cc | 11 +++++++++++ |
249 |
+ .../renderer/platform/image-encoders/image_encoder.h | 2 -- |
250 |
+ 2 files changed, 11 insertions(+), 2 deletions(-) |
251 |
+ |
252 |
+diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc |
253 |
+index 0c7f14c7c0e4..4c450f5d6783 100644 |
254 |
+--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc |
255 |
++++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc |
256 |
+@@ -4,6 +4,17 @@ |
257 |
+ |
258 |
+ #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h" |
259 |
+ |
260 |
++#include "build/build_config.h" |
261 |
++ |
262 |
++#if defined(OS_WIN) |
263 |
++#include <basetsd.h> // Included before jpeglib.h because of INT32 clash |
264 |
++#endif // OS_WIN |
265 |
++#include <stdio.h> // Needed by jpeglib.h |
266 |
++ |
267 |
++#include "jpeglib.h" // for JPEG_MAX_DIMENSION |
268 |
++ |
269 |
++#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION |
270 |
++ |
271 |
+ namespace blink { |
272 |
+ |
273 |
+ bool ImageEncoder::Encode(Vector<unsigned char>* dst, |
274 |
+diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.h b/third_party/blink/renderer/platform/image-encoders/image_encoder.h |
275 |
+index 0d1460f34827..40306097d507 100644 |
276 |
+--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.h |
277 |
++++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.h |
278 |
+@@ -7,8 +7,6 @@ |
279 |
+ |
280 |
+ #include "third_party/blink/renderer/platform/platform_export.h" |
281 |
+ #include "third_party/blink/renderer/platform/wtf/vector.h" |
282 |
+-#include "third_party/libjpeg/jpeglib.h" // for JPEG_MAX_DIMENSION |
283 |
+-#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION |
284 |
+ #include "third_party/skia/include/core/SkStream.h" |
285 |
+ #include "third_party/skia/include/encode/SkJpegEncoder.h" |
286 |
+ #include "third_party/skia/include/encode/SkPngEncoder.h" |
287 |
+-- |
288 |
+2.17.1 |
289 |
+ |
290 |
|
291 |
diff --git a/www-client/chromium/files/chromium-libwebp-shim-r0.patch b/www-client/chromium/files/chromium-libwebp-shim-r0.patch |
292 |
new file mode 100644 |
293 |
index 00000000000..cb387a4a003 |
294 |
--- /dev/null |
295 |
+++ b/www-client/chromium/files/chromium-libwebp-shim-r0.patch |
296 |
@@ -0,0 +1,43 @@ |
297 |
+diff --git a/build/linux/unbundle/libwebp.gn b/build/linux/unbundle/libwebp.gn |
298 |
+index ab92adecf400..12574d87be58 100644 |
299 |
+--- a/build/linux/unbundle/libwebp.gn |
300 |
++++ b/build/linux/unbundle/libwebp.gn |
301 |
+@@ -2,12 +2,34 @@ |
302 |
+ # Use of this source code is governed by a BSD-style license that can be |
303 |
+ # found in the LICENSE file. |
304 |
+ |
305 |
++import("//build/config/linux/pkg_config.gni") |
306 |
++import("//build/shim_headers.gni") |
307 |
++ |
308 |
++pkg_config("system_libwebp") { |
309 |
++ packages = [ |
310 |
++ "libwebp", |
311 |
++ "libwebpdemux", |
312 |
++ "libwebpmux", |
313 |
++ ] |
314 |
++} |
315 |
++ |
316 |
++shim_headers("libwebp_shim") { |
317 |
++ root_path = "src" |
318 |
++ headers = [ |
319 |
++ "webp/decode.h", |
320 |
++ "webp/demux.h", |
321 |
++ "webp/encode.h", |
322 |
++ "webp/mux.h", |
323 |
++ "webp/mux_types.h", |
324 |
++ "webp/types.h", |
325 |
++ ] |
326 |
++} |
327 |
++ |
328 |
+ source_set("libwebp_webp") { |
329 |
+- libs = [ |
330 |
+- "webp", |
331 |
+- "webpdemux", |
332 |
+- "webpmux", |
333 |
++ deps = [ |
334 |
++ ":libwebp_shim", |
335 |
+ ] |
336 |
++ public_configs = [ ":system_libwebp" ] |
337 |
+ } |
338 |
+ |
339 |
+ group("libwebp") { |