1 |
commit: 6b89e0d09ed3f133a3ae77bf46a0fe7bcdbc092e |
2 |
Author: Stephan Hartmann <stha09 <AT> googlemail <DOT> com> |
3 |
AuthorDate: Sat Sep 28 18:08:47 2019 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 29 21:23:59 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b89e0d0 |
7 |
|
8 |
www-client/chromium: beta channel bump (78.0.3904.34) |
9 |
|
10 |
Closes: https://bugs.gentoo.org/694896 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/13077 |
12 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
13 |
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com> |
14 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
15 |
|
16 |
www-client/chromium/Manifest | 4 +- |
17 |
....3887.7.ebuild => chromium-78.0.3904.34.ebuild} | 18 ++++- |
18 |
.../files/chromium-78-gcc-enum-range.patch | 46 ++++++++++++ |
19 |
.../chromium/files/chromium-78-gcc-noexcept.patch | 32 ++++++++ |
20 |
.../files/chromium-78-gcc-std-vector.patch | 87 ++++++++++++++++++++++ |
21 |
.../chromium/files/chromium-78-include.patch | 32 +++++--- |
22 |
.../chromium/files/chromium-unbundle-zlib-r1.patch | 13 ++++ |
23 |
7 files changed, 217 insertions(+), 15 deletions(-) |
24 |
|
25 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
26 |
index 8b478908b01..673fdc0d93b 100644 |
27 |
--- a/www-client/chromium/Manifest |
28 |
+++ b/www-client/chromium/Manifest |
29 |
@@ -1,2 +1,4 @@ |
30 |
DIST chromium-77.0.3865.90.tar.xz 729551228 BLAKE2B 865a40a7fa7d6a0b2de137249f7f14dad32b30cb0099fccc0d21570a2488834c5ab6504ef7c63f334e5d798de5391d6e96beaa49009caecb178d898e27317d89 SHA512 8b343c6ccc798c74cca8d5d41285153ace917da28360192afb21925c103ba425a4045f75c589f73a8c5c75bd1bbca44bfae1a4b96e9b7a97636d9929c7961bbc |
31 |
-DIST chromium-78.0.3887.7.tar.xz 737057024 BLAKE2B b4754f1fa9a243c29e83d6136494c6db1726a6d3f23013115a4a576428f7ca3c0fcd3f81cf7fe4037f2c3e6901b3fce015aeed7b7b945b4a3e368f2e6fb9afa1 SHA512 9b8eb33c6f19e5b247372e19a61ec1ae6c804bd7b9731222430e2e1b585146fc543a686ccfc9553d6d137999570c544cdb45696db6ce50c38dfead1b0760c1a4 |
32 |
+DIST chromium-78-revert-noexcept.patch 69206 BLAKE2B c0cbcd9cf4ca1d22afb0deb90ca0e208abc4853ec0430ded105c76488af38df7fba696531a1b597efb8ffe3f8c9352bf47bfc364db3ffff0f6ccb726bb7e1f94 SHA512 13ab086b40f246fd7397c3f44663e69dd3c996beb657d7c06d1af0730be90135c1097ec555e384a76add4034f69e8bfe23de4d69900df4c67dc6b383d6c3708d |
33 |
+DIST chromium-78-revert-pm-observer.patch 22149 BLAKE2B d0169db31948a0a11930d23dbb1fd6573525218a795fe57702cdc6bfef87ce3ab856f8429f5bc9751bf6c96750ad3ed16ce22a4e8be1c57a183da30ca4b56d84 SHA512 68b4558226264aa04af265f7fd42c7319f1cd483d249ad53244efa9d640d99bfb97d39aa8a3e395e1ece4384092b21f7c27d635bc0f3a9f0ba6ddd2f38f4dbae |
34 |
+DIST chromium-78.0.3904.34.tar.xz 741873348 BLAKE2B 4cf6d35548a41c44dca3dbf9275ac1fe09e6ce3108b7b4bc3b90034e4780456ae399ea368ed67ef3cce9cd3b00265ddfd765da837214a51437d333c288ba1e7e SHA512 d1c7b75fc2b4e5acbb89f9044a87e678db4ad99e805448716daf0227d8760b02d08b090ff3dbbb2f3aad5f7a1c488a59345cf209cb609cca6781b8e3353e1f32 |
35 |
|
36 |
diff --git a/www-client/chromium/chromium-78.0.3887.7.ebuild b/www-client/chromium/chromium-78.0.3904.34.ebuild |
37 |
similarity index 97% |
38 |
rename from www-client/chromium/chromium-78.0.3887.7.ebuild |
39 |
rename to www-client/chromium/chromium-78.0.3904.34.ebuild |
40 |
index e8fb43a9ec7..2e268516462 100644 |
41 |
--- a/www-client/chromium/chromium-78.0.3887.7.ebuild |
42 |
+++ b/www-client/chromium/chromium-78.0.3904.34.ebuild |
43 |
@@ -12,7 +12,10 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util |
44 |
|
45 |
DESCRIPTION="Open-source version of Google Chrome web browser" |
46 |
HOMEPAGE="http://chromium.org/" |
47 |
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" |
48 |
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz |
49 |
+ https://dev.gentoo.org/~floppym/dist/chromium-78-revert-noexcept.patch |
50 |
+ https://dev.gentoo.org/~floppym/dist/chromium-78-revert-pm-observer.patch |
51 |
+" |
52 |
|
53 |
LICENSE="BSD" |
54 |
SLOT="0" |
55 |
@@ -143,11 +146,16 @@ PATCHES=( |
56 |
"${FILESDIR}/chromium-compiler-r10.patch" |
57 |
"${FILESDIR}/chromium-widevine-r4.patch" |
58 |
"${FILESDIR}/chromium-fix-char_traits.patch" |
59 |
- "${FILESDIR}/chromium-unbundle-zlib.patch" |
60 |
- "${FILESDIR}/chromium-77-fix-gn-gen.patch" |
61 |
+ "${FILESDIR}/chromium-unbundle-zlib-r1.patch" |
62 |
"${FILESDIR}/chromium-77-system-icu.patch" |
63 |
"${FILESDIR}/chromium-77-clang.patch" |
64 |
+ "${FILESDIR}/chromium-77-pulseaudio-13.patch" |
65 |
"${FILESDIR}/chromium-78-include.patch" |
66 |
+ "${DISTDIR}/chromium-78-revert-noexcept.patch" |
67 |
+ "${DISTDIR}/chromium-78-revert-pm-observer.patch" |
68 |
+ "${FILESDIR}/chromium-78-gcc-enum-range.patch" |
69 |
+ "${FILESDIR}/chromium-78-gcc-std-vector.patch" |
70 |
+ "${FILESDIR}/chromium-78-gcc-noexcept.patch" |
71 |
) |
72 |
|
73 |
pre_build_checks() { |
74 |
@@ -191,7 +199,7 @@ src_prepare() { |
75 |
|
76 |
local keeplibs=( |
77 |
base/third_party/cityhash |
78 |
- base/third_party/dmg_fp |
79 |
+ base/third_party/double_conversion |
80 |
base/third_party/dynamic_annotations |
81 |
base/third_party/icu |
82 |
base/third_party/nspr |
83 |
@@ -259,6 +267,7 @@ src_prepare() { |
84 |
third_party/cros_system_api |
85 |
third_party/dav1d |
86 |
third_party/dawn |
87 |
+ third_party/depot_tools |
88 |
third_party/devscripts |
89 |
third_party/dom_distiller_js |
90 |
third_party/emoji-segmenter |
91 |
@@ -414,6 +423,7 @@ src_configure() { |
92 |
myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" |
93 |
else |
94 |
myconf_gn+=" is_clang=false" |
95 |
+ append-cxxflags -fpermissive |
96 |
fi |
97 |
|
98 |
# Define a custom toolchain for GN |
99 |
|
100 |
diff --git a/www-client/chromium/files/chromium-78-gcc-enum-range.patch b/www-client/chromium/files/chromium-78-gcc-enum-range.patch |
101 |
new file mode 100644 |
102 |
index 00000000000..9c15e954b4e |
103 |
--- /dev/null |
104 |
+++ b/www-client/chromium/files/chromium-78-gcc-enum-range.patch |
105 |
@@ -0,0 +1,46 @@ |
106 |
+From 9662ec844017690d5fd56bf0f05ef6a540dd29c1 Mon Sep 17 00:00:00 2001 |
107 |
+From: Tom Anderson <thomasanderson@××××××××.org> |
108 |
+Date: Mon, 09 Sep 2019 19:06:01 +0000 |
109 |
+Subject: [PATCH] Fix GCC build error |
110 |
+ |
111 |
+Fixes this error: |
112 |
+[ 375s] In file included from ../../base/task/common/intrusive_heap.h:8, |
113 |
+[ 375s] from ../../base/task/thread_pool/task_source.h:17, |
114 |
+[ 375s] from ../../base/task/thread_pool/task_tracker.h:27, |
115 |
+[ 375s] from ./../../base/task/thread_pool/service_thread.cc:14, |
116 |
+[ 375s] from gen/base/base_jumbo_28.cc:5: |
117 |
+[ 375s] ../../base/containers/intrusive_heap.h:152:36: error: enumerator value |
118 |
+ '-1' is outside the range of underlying type 'size_t' {aka 'long unsigned int'} |
119 |
+[ 375s] 152 | enum : size_t { kInvalidIndex = -1 }; |
120 |
+[ 375s] | |
121 |
+ |
122 |
+Change-Id: I6044fb704931b2f8416f6b19a247ae297cd7b0d6 |
123 |
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1792763 |
124 |
+Commit-Queue: Thomas Anderson <thomasanderson@××××××××.org> |
125 |
+Commit-Queue: Lei Zhang <thestig@××××××××.org> |
126 |
+Reviewed-by: Lei Zhang <thestig@××××××××.org> |
127 |
+Auto-Submit: Thomas Anderson <thomasanderson@××××××××.org> |
128 |
+Cr-Commit-Position: refs/heads/master@{#694853} |
129 |
+--- |
130 |
+ |
131 |
+diff --git a/base/containers/intrusive_heap.h b/base/containers/intrusive_heap.h |
132 |
+index 53d3909..d7626bb 100644 |
133 |
+--- a/base/containers/intrusive_heap.h |
134 |
++++ b/base/containers/intrusive_heap.h |
135 |
+@@ -131,6 +131,7 @@ |
136 |
+ |
137 |
+ #include <algorithm> |
138 |
+ #include <functional> |
139 |
++#include <limits> |
140 |
+ #include <type_traits> |
141 |
+ #include <utility> |
142 |
+ #include <vector> |
143 |
+@@ -149,7 +150,7 @@ |
144 |
+ // in place. |
145 |
+ class BASE_EXPORT HeapHandle { |
146 |
+ public: |
147 |
+- enum : size_t { kInvalidIndex = -1 }; |
148 |
++ enum : size_t { kInvalidIndex = std::numeric_limits<size_t>::max() }; |
149 |
+ |
150 |
+ constexpr HeapHandle() = default; |
151 |
+ constexpr HeapHandle(const HeapHandle& other) = default; |
152 |
|
153 |
diff --git a/www-client/chromium/files/chromium-78-gcc-noexcept.patch b/www-client/chromium/files/chromium-78-gcc-noexcept.patch |
154 |
new file mode 100644 |
155 |
index 00000000000..8ddb53fe82d |
156 |
--- /dev/null |
157 |
+++ b/www-client/chromium/files/chromium-78-gcc-noexcept.patch |
158 |
@@ -0,0 +1,32 @@ |
159 |
+From d16cda8fc3476cc534a756873cc8aa2692a57054 Mon Sep 17 00:00:00 2001 |
160 |
+From: Jose Dapena Paz <jose.dapena@×××.com> |
161 |
+Date: Thu, 22 Aug 2019 13:13:36 +0200 |
162 |
+Subject: [PATCH] GCC: declare noexcept move constructor/assign operators of V8StackTraceId |
163 |
+ |
164 |
+blink::BlinkCloneableMessage declares default implementation of |
165 |
+move operator/assign operator that requires v8_inspector::V8StackTraceId |
166 |
+to declare its move constructor/assign operator too. |
167 |
+ |
168 |
+Bug: chromium:819294 |
169 |
+Change-Id: Iaf626ee8245efcba372a17cdf2de448e691d41d6 |
170 |
+Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1796062 |
171 |
+Commit-Queue: José Dapena Paz <jose.dapena@×××.com> |
172 |
+Reviewed-by: Yang Guo <yangguo@××××××××.org> |
173 |
+Cr-Commit-Position: refs/heads/master@{#63799} |
174 |
+--- |
175 |
+ |
176 |
+diff --git a/v8/include/v8-inspector.h b/v8/include/v8-inspector.h |
177 |
+index ce5b777..ed4cdec 100644 |
178 |
+--- a/v8/include/v8-inspector.h |
179 |
++++ b/v8/include/v8-inspector.h |
180 |
+@@ -231,7 +231,10 @@ struct V8_EXPORT V8StackTraceId { |
181 |
+ std::pair<int64_t, int64_t> debugger_id; |
182 |
+ |
183 |
+ V8StackTraceId(); |
184 |
++ V8StackTraceId(const V8StackTraceId&) = default; |
185 |
+ V8StackTraceId(uintptr_t id, const std::pair<int64_t, int64_t> debugger_id); |
186 |
++ V8StackTraceId& operator=(const V8StackTraceId&) = default; |
187 |
++ V8StackTraceId& operator=(V8StackTraceId&&) noexcept = default; |
188 |
+ ~V8StackTraceId() = default; |
189 |
+ |
190 |
+ bool IsInvalid() const; |
191 |
|
192 |
diff --git a/www-client/chromium/files/chromium-78-gcc-std-vector.patch b/www-client/chromium/files/chromium-78-gcc-std-vector.patch |
193 |
new file mode 100644 |
194 |
index 00000000000..cf1abf06b5a |
195 |
--- /dev/null |
196 |
+++ b/www-client/chromium/files/chromium-78-gcc-std-vector.patch |
197 |
@@ -0,0 +1,87 @@ |
198 |
+From f4c3c329588b78af63aad8b401da767242b86709 Mon Sep 17 00:00:00 2001 |
199 |
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
200 |
+Date: Mon, 16 Sep 2019 17:05:42 +0000 |
201 |
+Subject: [PATCH] dns_util: Make DohUpgradeEntry non-const when used with std::vector<> |
202 |
+ |
203 |
+This fixes the build with libstdc++ (with most other standard libraries |
204 |
+other than libc++, in fact) after commit f93a48e3 ("Allow upgrade to DoH |
205 |
+during automatic mode"): |
206 |
+ |
207 |
+../../../../../../usr/bin/../lib/gcc/x86_64-redhat-linux/8/../../../../include/c++/8/bits/stl_vector.h:351:7: error: static_assert failed due to requirement 'is_same<typename remove_cv<const DohUpgradeEntry>::type, const DohUpgradeEntry>::value' "std::vector must have a non-const, non-volatile value_type" |
208 |
+ static_assert(is_same<typename remove_cv<_Tp>::type, _Tp>::value, |
209 |
+ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
210 |
+../../base/no_destructor.h:77:28: note: in instantiation of template class 'std::vector<const net::(anonymous namespace)::DohUpgradeEntry, std::allocator<const net::(anonymous namespace)::DohUpgradeEntry> >' requested here |
211 |
+ alignas(T) char storage_[sizeof(T)]; |
212 |
+ ^ |
213 |
+../../net/dns/dns_util.cc:147:7: note: in instantiation of template class 'base::NoDestructor<std::vector<const net::(anonymous namespace)::DohUpgradeEntry, std::allocator<const net::(anonymous namespace)::DohUpgradeEntry> > >' requested here |
214 |
+ upgradable_servers({ |
215 |
+ ^ |
216 |
+../../net/dns/dns_util.cc:230:36: error: invalid range expression of type 'const std::vector<const net::(anonymous namespace)::DohUpgradeEntry, std::allocator<const net::(anonymous namespace)::DohUpgradeEntry> >'; no viable 'begin' function available |
217 |
+ for (const auto& upgrade_entry : upgradable_servers) { |
218 |
+ ^ ~~~~~~~~~~~~~~~~~~ |
219 |
+ |
220 |
+The C++ standard forbids containers of const elements. Callers of |
221 |
+GetDohUpgradeList() use it in a safe way anyway, and most of |
222 |
+DohUpgradeEntry's members are const. |
223 |
+ |
224 |
+(Added gcc specific workaround) |
225 |
+ |
226 |
+Bug: 957519 |
227 |
+Change-Id: I826a51823edb1184c0fae27105101e2894efe568 |
228 |
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1805636 |
229 |
+Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@×××××.com> |
230 |
+Commit-Queue: Eric Orth <ericorth@××××××××.org> |
231 |
+Reviewed-by: Eric Orth <ericorth@××××××××.org> |
232 |
+Cr-Commit-Position: refs/heads/master@{#696834} |
233 |
+--- |
234 |
+ |
235 |
+diff --git a/net/dns/dns_util.cc b/net/dns/dns_util.cc |
236 |
+index d83ff7c..14997c4 100644 |
237 |
+--- a/net/dns/dns_util.cc |
238 |
++++ b/net/dns/dns_util.cc |
239 |
+@@ -139,12 +139,12 @@ struct DohUpgradeEntry { |
240 |
+ const DnsConfig::DnsOverHttpsServerConfig dns_over_https_config; |
241 |
+ }; |
242 |
+ |
243 |
+-const std::vector<const DohUpgradeEntry>& GetDohUpgradeList() { |
244 |
++const std::vector<DohUpgradeEntry>& GetDohUpgradeList() { |
245 |
+ // The provider names in these entries should be kept in sync with the |
246 |
+ // DohProviderId histogram suffix list in |
247 |
+ // tools/metrics/histograms/histograms.xml. |
248 |
+- static const base::NoDestructor<std::vector<const DohUpgradeEntry>> |
249 |
+- upgradable_servers({ |
250 |
++ static const base::NoDestructor<std::vector<DohUpgradeEntry>> |
251 |
++ upgradable_servers(std::initializer_list<DohUpgradeEntry>{ |
252 |
+ DohUpgradeEntry( |
253 |
+ "CleanBrowsingAdult", |
254 |
+ {"185.228.168.10", "185.228.169.11", "2a0d:2a00:1::1", |
255 |
+@@ -222,8 +222,7 @@ const std::vector<const DohUpgradeEntry>& GetDohUpgradeList() { |
256 |
+ std::vector<const DohUpgradeEntry*> GetDohUpgradeEntriesFromNameservers( |
257 |
+ const std::vector<IPEndPoint>& dns_servers, |
258 |
+ const std::vector<std::string>& excluded_providers) { |
259 |
+- const std::vector<const DohUpgradeEntry>& upgradable_servers = |
260 |
+- GetDohUpgradeList(); |
261 |
++ const std::vector<DohUpgradeEntry>& upgradable_servers = GetDohUpgradeList(); |
262 |
+ std::vector<const DohUpgradeEntry*> entries; |
263 |
+ |
264 |
+ for (const auto& server : dns_servers) { |
265 |
+@@ -417,8 +416,7 @@ std::vector<DnsConfig::DnsOverHttpsServerConfig> |
266 |
+ GetDohUpgradeServersFromDotHostname( |
267 |
+ const std::string& dot_server, |
268 |
+ const std::vector<std::string>& excluded_providers) { |
269 |
+- const std::vector<const DohUpgradeEntry>& upgradable_servers = |
270 |
+- GetDohUpgradeList(); |
271 |
++ const std::vector<DohUpgradeEntry>& upgradable_servers = GetDohUpgradeList(); |
272 |
+ std::vector<DnsConfig::DnsOverHttpsServerConfig> doh_servers; |
273 |
+ |
274 |
+ if (dot_server.empty()) |
275 |
+@@ -451,8 +449,7 @@ GetDohUpgradeServersFromNameservers( |
276 |
+ |
277 |
+ std::string GetDohProviderIdForHistogramFromDohConfig( |
278 |
+ const DnsConfig::DnsOverHttpsServerConfig& doh_server) { |
279 |
+- const std::vector<const DohUpgradeEntry>& upgradable_servers = |
280 |
+- GetDohUpgradeList(); |
281 |
++ const std::vector<DohUpgradeEntry>& upgradable_servers = GetDohUpgradeList(); |
282 |
+ for (const auto& upgrade_entry : upgradable_servers) { |
283 |
+ if (doh_server.server_template == |
284 |
+ upgrade_entry.dns_over_https_config.server_template) { |
285 |
|
286 |
diff --git a/www-client/chromium/files/chromium-78-include.patch b/www-client/chromium/files/chromium-78-include.patch |
287 |
index a0b77c4fb9d..224aa3b3519 100644 |
288 |
--- a/www-client/chromium/files/chromium-78-include.patch |
289 |
+++ b/www-client/chromium/files/chromium-78-include.patch |
290 |
@@ -1,13 +1,25 @@ |
291 |
-diff --git a/components/password_manager/core/browser/leak_detection/encryption_utils.cc b/components/password_manager/core/browser/leak_detection/encryption_utils.cc |
292 |
-index 31a7116..53eb464 100644 |
293 |
---- a/components/password_manager/core/browser/leak_detection/encryption_utils.cc |
294 |
-+++ b/components/password_manager/core/browser/leak_detection/encryption_utils.cc |
295 |
-@@ -13,6 +13,8 @@ |
296 |
- #include "crypto/sha2.h" |
297 |
- #include "third_party/boringssl/src/include/openssl/evp.h" |
298 |
+From bbfe2665923225b4a7c436ba2b6c7e5f695f2e52 Mon Sep 17 00:00:00 2001 |
299 |
+From: David Landell <landell@××××.com> |
300 |
+Date: Fri, 13 Sep 2019 12:24:13 +0000 |
301 |
+Subject: [PATCH] Add missing include for unique_ptr |
302 |
+ |
303 |
+Change-Id: I614d2f42868d563eb6a92dfb2aae08286e20d687 |
304 |
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1803137 |
305 |
+Reviewed-by: Henrik Boström <hbos@××××××××.org> |
306 |
+Commit-Queue: Henrik Boström <hbos@××××××××.org> |
307 |
+Cr-Commit-Position: refs/heads/master@{#696355} |
308 |
+--- |
309 |
+ |
310 |
+diff --git a/third_party/blink/public/platform/web_rtc_rtp_source.h b/third_party/blink/public/platform/web_rtc_rtp_source.h |
311 |
+index 959440f..c3fd542 100644 |
312 |
+--- a/third_party/blink/public/platform/web_rtc_rtp_source.h |
313 |
++++ b/third_party/blink/public/platform/web_rtc_rtp_source.h |
314 |
+@@ -5,6 +5,8 @@ |
315 |
+ #ifndef THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_RTC_RTP_SOURCE_H_ |
316 |
+ #define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_RTC_RTP_SOURCE_H_ |
317 |
|
318 |
-+#include <climits> |
319 |
++#include <memory> |
320 |
+ |
321 |
- namespace password_manager { |
322 |
+ #include "base/optional.h" |
323 |
+ #include "third_party/blink/public/platform/web_common.h" |
324 |
|
325 |
- namespace { |
326 |
|
327 |
diff --git a/www-client/chromium/files/chromium-unbundle-zlib-r1.patch b/www-client/chromium/files/chromium-unbundle-zlib-r1.patch |
328 |
new file mode 100644 |
329 |
index 00000000000..951a2adb196 |
330 |
--- /dev/null |
331 |
+++ b/www-client/chromium/files/chromium-unbundle-zlib-r1.patch |
332 |
@@ -0,0 +1,13 @@ |
333 |
+diff --git a/third_party/perfetto/gn/BUILD.gn b/third_party/perfetto/gn/BUILD.gn |
334 |
+index 3bc618a..e0ddf6d 100644 |
335 |
+--- a/third_party/perfetto/gn/BUILD.gn |
336 |
++++ b/third_party/perfetto/gn/BUILD.gn |
337 |
+@@ -244,7 +244,7 @@ if (enable_perfetto_trace_processor || perfetto_build_standalone || |
338 |
+ "//buildtools:zlib", |
339 |
+ ] |
340 |
+ } else { |
341 |
+- public_configs = [ "//third_party/zlib:zlib_config" ] |
342 |
++ public_configs = [ "//third_party/zlib:system_zlib" ] |
343 |
+ public_deps = [ |
344 |
+ "//third_party/zlib", |
345 |
+ ] |