1 |
commit: 1b8e99b3b294c5df232d8de988c86e90fedbbd16 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 21 20:30:10 2018 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 21 20:31:22 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b8e99b3 |
7 |
|
8 |
www-client/chromium: beta channel bump (65.0.3325.73) |
9 |
|
10 |
Package-Manager: Portage-2.3.24_p18, Repoman-2.3.6_p99 |
11 |
|
12 |
www-client/chromium/Manifest | 2 +- |
13 |
....3298.3.ebuild => chromium-65.0.3325.73.ebuild} | 87 ++++++++++++---------- |
14 |
www-client/chromium/files/chromium-clang-r3.patch | 11 +++ |
15 |
www-client/chromium/files/chromium-math.h-r0.patch | 29 ++++++++ |
16 |
www-client/chromium/files/chromium-stdint.patch | 21 ++++++ |
17 |
5 files changed, 110 insertions(+), 40 deletions(-) |
18 |
|
19 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
20 |
index d4015acc90e..cddedc5b6dc 100644 |
21 |
--- a/www-client/chromium/Manifest |
22 |
+++ b/www-client/chromium/Manifest |
23 |
@@ -1,3 +1,3 @@ |
24 |
DIST chromium-64.0.3282.167.tar.xz 482246360 BLAKE2B b4785c20f33081015ac31fed9dbd108dc78160d95c4ea7055b8fffdb714fe9ef120727cd6b88d4e4a15b0c429f04c7c512cca90c5313128e0001a4ae5b908b6f SHA512 1bee80d2e8d4332cfc307efdac8eb11a48e42f3927e63e7a9d5ff2bbad6c4534926669f21defbf0553160f5bb28596723be8bd0e3dfa19ca9a1e854bcf42fd77 |
25 |
-DIST chromium-65.0.3298.3.tar.xz 485716108 BLAKE2B 185b3f683b2a732343fa5f98b24171f1d3cf2cf8eeb63c56efa7699f6b038d2a7eea4f9277b0b7ee2fdfa207a4f13edbaf2cc9a591a79ec4d058a131ce44366b SHA512 f1ed9a403036e87da7897f173eeb1aa71fe2650efc5ef5b98f814c7d4d9c879971597f9ded11324c86d6edc7f12f3bcf2786a6fb022e9697dbdb8eae086e18b7 |
26 |
DIST chromium-65.0.3315.3.tar.xz 532475512 BLAKE2B 1a118ddd05f2b939ff0fd84f85e1c22789713351776d889bafb55ddb2b897b2921050a3df3b7d5e3224be84539d95dddce1a27a948c61b29c788ed9f8e194e02 SHA512 c7f0feda90c0df15058473d39482e9b9a9b3236dcb90ff8ba7ad53afde2fce4901b2cbd678d8470560cc0cb6e31c8d3caee9f0a9f100d82d95feacabcdb7f8ce |
27 |
+DIST chromium-65.0.3325.73.tar.xz 570268564 BLAKE2B 8d1a9cf38f12ea3566463f42772671268de68d8c49170d60733be8eee7492850be739f19377365366740dcbad3414538eb00765281c966b6cedb85b74709448f SHA512 96ed3862c3fc21afac8d18f4b43f98d29a086e83dfe25af54b6358e139a8b3c9ec761cc463ce287b04a9082c5e62dbc605d4c97f8ec358599a24c7830c890418 |
28 |
|
29 |
diff --git a/www-client/chromium/chromium-65.0.3298.3.ebuild b/www-client/chromium/chromium-65.0.3325.73.ebuild |
30 |
similarity index 95% |
31 |
rename from www-client/chromium/chromium-65.0.3298.3.ebuild |
32 |
rename to www-client/chromium/chromium-65.0.3325.73.ebuild |
33 |
index 33ba5d9ef0e..10515fc7b76 100644 |
34 |
--- a/www-client/chromium/chromium-65.0.3298.3.ebuild |
35 |
+++ b/www-client/chromium/chromium-65.0.3325.73.ebuild |
36 |
@@ -101,6 +101,7 @@ DEPEND="${COMMON_DEPEND} |
37 |
sys-apps/hwids[usb(+)] |
38 |
>=sys-devel/bison-2.4.3 |
39 |
sys-devel/flex |
40 |
+ >=sys-devel/clang-5 |
41 |
virtual/pkgconfig |
42 |
dev-vcs/git |
43 |
$(python_gen_any_dep ' |
44 |
@@ -149,21 +150,24 @@ PATCHES=( |
45 |
"${FILESDIR}/chromium-webrtc-r0.patch" |
46 |
"${FILESDIR}/chromium-memcpy-r0.patch" |
47 |
"${FILESDIR}/chromium-clang-r2.patch" |
48 |
- "${FILESDIR}/chromium-gcc-u2f.patch" |
49 |
+ "${FILESDIR}/chromium-gn-r0.patch" |
50 |
+ "${FILESDIR}/chromium-math.h-r0.patch" |
51 |
+ "${FILESDIR}/chromium-clang-r3.patch" |
52 |
+ "${FILESDIR}/chromium-stdint.patch" |
53 |
) |
54 |
|
55 |
pre_build_checks() { |
56 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
57 |
- local -x CPP="$(tc-getCXX) -E" |
58 |
- if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then |
59 |
- # bugs: #601654 |
60 |
- die "At least clang 3.9.1 is required" |
61 |
- fi |
62 |
- if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then |
63 |
- # bugs: #535730, #525374, #518668, #600288, #627356 |
64 |
- die "At least gcc 5.0 is required" |
65 |
- fi |
66 |
- fi |
67 |
+ #if [[ ${MERGE_TYPE} != binary ]]; then |
68 |
+ # local -x CPP="$(tc-getCXX) -E" |
69 |
+ # if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then |
70 |
+ # # bugs: #601654 |
71 |
+ # die "At least clang 3.9.1 is required" |
72 |
+ # fi |
73 |
+ # if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then |
74 |
+ # # bugs: #535730, #525374, #518668, #600288, #627356 |
75 |
+ # die "At least gcc 5.0 is required" |
76 |
+ # fi |
77 |
+ #fi |
78 |
|
79 |
# Check build requirements, bug #541816 and bug #471810 . |
80 |
CHECKREQS_MEMORY="3G" |
81 |
@@ -262,7 +266,6 @@ src_prepare() { |
82 |
third_party/libXNVCtrl |
83 |
third_party/libaddressinput |
84 |
third_party/libaom |
85 |
- third_party/libaom/source/libaom/third_party/x86inc |
86 |
third_party/libjingle |
87 |
third_party/libphonenumber |
88 |
third_party/libsecret |
89 |
@@ -271,6 +274,7 @@ src_prepare() { |
90 |
third_party/libwebm |
91 |
third_party/libxml/chromium |
92 |
third_party/libyuv |
93 |
+ third_party/llvm |
94 |
third_party/lss |
95 |
third_party/lzma_sdk |
96 |
third_party/markupsafe |
97 |
@@ -371,6 +375,32 @@ src_configure() { |
98 |
|
99 |
local myconf_gn="" |
100 |
|
101 |
+ # Make sure the build system will use the right tools, bug #340795. |
102 |
+ tc-export AR CC CXX NM |
103 |
+ |
104 |
+ if ! tc-is-clang; then |
105 |
+ # Force clang since gcc is pretty broken at the moment. |
106 |
+ CC=clang |
107 |
+ CXX=clang++ |
108 |
+ fi |
109 |
+ |
110 |
+ if tc-is-clang; then |
111 |
+ myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" |
112 |
+ else |
113 |
+ myconf_gn+=" is_clang=false" |
114 |
+ fi |
115 |
+ |
116 |
+ # Define a custom toolchain for GN |
117 |
+ myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" |
118 |
+ |
119 |
+ if tc-is-cross-compiler; then |
120 |
+ tc-export BUILD_{AR,CC,CXX,NM} |
121 |
+ myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\"" |
122 |
+ myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\"" |
123 |
+ else |
124 |
+ myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" |
125 |
+ fi |
126 |
+ |
127 |
# GN needs explicit config for Debug/Release as opposed to inferring it from build directory. |
128 |
myconf_gn+=" is_debug=false" |
129 |
|
130 |
@@ -431,7 +461,6 @@ src_configure() { |
131 |
myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)" |
132 |
myconf_gn+=" enable_widevine=$(usex widevine true false)" |
133 |
myconf_gn+=" use_cups=$(usex cups true false)" |
134 |
- myconf_gn+=" use_gconf=false" |
135 |
myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)" |
136 |
myconf_gn+=" use_kerberos=$(usex kerberos true false)" |
137 |
myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)" |
138 |
@@ -440,12 +469,6 @@ src_configure() { |
139 |
|
140 |
myconf_gn+=" fieldtrial_testing_like_official_build=true" |
141 |
|
142 |
- if tc-is-clang; then |
143 |
- myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" |
144 |
- else |
145 |
- myconf_gn+=" is_clang=false" |
146 |
- fi |
147 |
- |
148 |
# Never use bundled gold binary. Disable gold linker flags for now. |
149 |
# Do not use bundled clang. |
150 |
# Trying to use gold results in linker crash. |
151 |
@@ -510,22 +533,8 @@ src_configure() { |
152 |
fi |
153 |
fi |
154 |
|
155 |
- # Make sure the build system will use the right tools, bug #340795. |
156 |
- tc-export AR CC CXX NM |
157 |
- |
158 |
- # Define a custom toolchain for GN |
159 |
- myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" |
160 |
- |
161 |
- if tc-is-cross-compiler; then |
162 |
- tc-export BUILD_{AR,CC,CXX,NM} |
163 |
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\"" |
164 |
- myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\"" |
165 |
- else |
166 |
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" |
167 |
- fi |
168 |
- |
169 |
# https://bugs.gentoo.org/588596 |
170 |
- append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) |
171 |
+ #append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) |
172 |
|
173 |
# Bug 491582. |
174 |
export TMPDIR="${WORKDIR}/temp" |
175 |
@@ -559,6 +568,8 @@ src_compile() { |
176 |
# Calling this here supports resumption via FEATURES=keepwork |
177 |
python_setup |
178 |
|
179 |
+ #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die |
180 |
+ |
181 |
# Build mksnapshot and pax-mark it. |
182 |
local x |
183 |
for x in mksnapshot v8_context_snapshot_generator; do |
184 |
@@ -632,10 +643,8 @@ src_install() { |
185 |
doins -r out/Release/locales |
186 |
doins -r out/Release/resources |
187 |
|
188 |
- if [[ -d out/Release/swiftshader ]]; then |
189 |
- insinto "${CHROMIUM_HOME}/swiftshader" |
190 |
- doins out/Release/swiftshader/*.so |
191 |
- fi |
192 |
+ insinto "${CHROMIUM_HOME}/swiftshader" |
193 |
+ doins out/Release/swiftshader/*.so |
194 |
|
195 |
# Install icons and desktop entry. |
196 |
local branding size |
197 |
|
198 |
diff --git a/www-client/chromium/files/chromium-clang-r3.patch b/www-client/chromium/files/chromium-clang-r3.patch |
199 |
new file mode 100644 |
200 |
index 00000000000..3905a5f03ff |
201 |
--- /dev/null |
202 |
+++ b/www-client/chromium/files/chromium-clang-r3.patch |
203 |
@@ -0,0 +1,11 @@ |
204 |
+--- a/device/u2f/u2f_ble_transaction.cc |
205 |
++++ b/device/u2f/u2f_ble_transaction.cc |
206 |
+@@ -131,7 +131,7 @@ |
207 |
+ |
208 |
+ void U2fBleTransaction::OnError() { |
209 |
+ request_frame_.reset(); |
210 |
+- request_cont_fragments_ = {}; |
211 |
++ request_cont_fragments_ = base::queue<U2fBleFrameContinuationFragment>(); |
212 |
+ response_frame_assembler_.reset(); |
213 |
+ std::move(callback_).Run(base::nullopt); |
214 |
+ } |
215 |
|
216 |
diff --git a/www-client/chromium/files/chromium-math.h-r0.patch b/www-client/chromium/files/chromium-math.h-r0.patch |
217 |
new file mode 100644 |
218 |
index 00000000000..6c7c747053a |
219 |
--- /dev/null |
220 |
+++ b/www-client/chromium/files/chromium-math.h-r0.patch |
221 |
@@ -0,0 +1,29 @@ |
222 |
+From 9f63f94a11abc34d40ede8b8712fa15b5844a8c0 Mon Sep 17 00:00:00 2001 |
223 |
+From: Tom Anderson <thomasanderson@××××××××.org> |
224 |
+Date: Sat, 27 Jan 2018 20:03:37 +0000 |
225 |
+Subject: [PATCH] Fix build with glibc 2.27 |
226 |
+ |
227 |
+BUG=806340 |
228 |
+TBR=hamelphi@××××××××.org |
229 |
+ |
230 |
+Change-Id: Ib4e5091212d874d9ad88f3e9a1fdfee3ed7e0d5e |
231 |
+Reviewed-on: https://chromium-review.googlesource.com/890059 |
232 |
+Reviewed-by: Thomas Anderson <thomasanderson@××××××××.org> |
233 |
+Reviewed-by: Philippe Hamel <hamelphi@××××××××.org> |
234 |
+Commit-Queue: Thomas Anderson <thomasanderson@××××××××.org> |
235 |
+Cr-Commit-Position: refs/heads/master@{#532249} |
236 |
+--- |
237 |
+ |
238 |
+diff --git a/components/assist_ranker/ranker_example_util.cc b/components/assist_ranker/ranker_example_util.cc |
239 |
+index 54d4dbd..ceedd8f 100644 |
240 |
+--- a/components/assist_ranker/ranker_example_util.cc |
241 |
++++ b/components/assist_ranker/ranker_example_util.cc |
242 |
+@@ -2,6 +2,8 @@ |
243 |
+ // Use of this source code is governed by a BSD-style license that can be |
244 |
+ // found in the LICENSE file. |
245 |
+ |
246 |
++#include <math.h> |
247 |
++ |
248 |
+ #include "components/assist_ranker/ranker_example_util.h" |
249 |
+ #include "base/bit_cast.h" |
250 |
+ #include "base/format_macros.h" |
251 |
|
252 |
diff --git a/www-client/chromium/files/chromium-stdint.patch b/www-client/chromium/files/chromium-stdint.patch |
253 |
new file mode 100644 |
254 |
index 00000000000..877443954fa |
255 |
--- /dev/null |
256 |
+++ b/www-client/chromium/files/chromium-stdint.patch |
257 |
@@ -0,0 +1,21 @@ |
258 |
+From 0235c2b657d936f3cdb09053776e5929fc84704b Mon Sep 17 00:00:00 2001 |
259 |
+From: Tomas Popela <tomas.popela@×××××.com> |
260 |
+Date: Wed, 31 Jan 2018 18:57:07 +0000 |
261 |
+Subject: [PATCH] Add missing stdint include |
262 |
+ |
263 |
+diff --git a/chrome/browser/vr/sample_queue.cc b/chrome/browser/vr/sample_queue.cc |
264 |
+index c2ca777ce90c..53cb3aab1576 100644 |
265 |
+--- a/chrome/browser/vr/sample_queue.cc |
266 |
++++ b/chrome/browser/vr/sample_queue.cc |
267 |
+@@ -2,6 +2,8 @@ |
268 |
+ // Use of this source code is governed by a BSD-style license that can be |
269 |
+ // found in the LICENSE file. |
270 |
+ |
271 |
++#include <stdint.h> |
272 |
++ |
273 |
+ #include "chrome/browser/vr/sample_queue.h" |
274 |
+ |
275 |
+ namespace vr { |
276 |
+-- |
277 |
+2.16.2 |
278 |
+ |