commit: d72547dd30547b9d938ed5816df52ca6bf043541
Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 4 13:50:41 2017 +0000
Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org>
CommitDate: Wed Oct 4 13:50:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d72547dd
www-client/chromium: dev channel bump (63.0.3230.0)
Package-Manager: Portage-2.3.8, Repoman-2.3.1
www-client/chromium/Manifest | 2 +-
...0.3218.0.ebuild => chromium-63.0.3230.0.ebuild} | 22 ++++++++---------
www-client/chromium/files/chromium-clang-r1.patch | 21 ++++++++++++++++
.../chromium/files/chromium-gn-bootstrap-r21.patch | 28 ++++++++++++++++++++++
4 files changed, 61 insertions(+), 12 deletions(-)
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 30603be5421..212276b6793 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
DIST chromium-61.0.3163.100.tar.xz 556305252 SHA256
4135968cac6623c1d2b224494600cd274098cce41c298f8c3908b354a34c281b SHA512
4dfd3a493ceb7c605eeab6f387541273d529e8b935a6104927e34836469aedcfcbb4a1154591585621d5c2e842e68701d32328acba842f840a20498822165f78
WHIRLPOOL
a02443375a59073ad350665a46c978b67e1026078822b3a34f9fb1099a1bc62933ec25c6135c107388ebf21362d0e6a04e394a60275dd1e30b31c145ee7f93e8
DIST chromium-62.0.3202.18.tar.xz 517017924 SHA256
38d76599b999e3636c3eb60888acd34ea8a8d7e24e6dba21ec7ae39d2045d47f SHA512
7017bc7f17af969fc460f0001ae935dca48253d2dea65d5375a126434549bb7ce748518c716b6d06aa6ae357577ca08ec73c7fe0e11b606595c15768388bab87
WHIRLPOOL
305ca8e55bbd2d87c1b6444ed2580b2c6992c2c5072b0abc9751190e07e0a57bb2180d751aaf5a248beea8467c6888f681c1d76a0a7cfb6ccfc2ae5d9669f2ec
DIST chromium-62.0.3202.9.tar.xz 516991748 SHA256
d801d431417736098ee4bf4ecaea642f5fe6101ea88a4cf7b06a04da58331199 SHA512
26e253dc0b779408116e4fbcc41e306afbd34687a9cb9f748d49381cec4ace4a094630aec5be14878584051696c261052ce7b07fd75b9680217165afd3909fe9
WHIRLPOOL
82645f14dd1a19faecc8b8af3fcfef03b2e14cb04c0ad8653bf9e11ef84169ecae7d8fdcbed1a84da0433f621dbbb331319670bb9cb0723759df617dd46e4617
-DIST chromium-63.0.3218.0.tar.xz 544430944 SHA256
36e7e6837cd77848e13e6558b9c7740f362a4f28869d9bfda2cf19615acca7fd SHA512
a55bb2475c8423e21d0448b4fb7a2af73811b29e2fb67d11febf1611b549363cdd6b68ac50c1397a934bedfefaf51e55d8721ad58593ca0d9b6c4b7310376e1b
WHIRLPOOL
94ec530900797cd5a464393e3a8f172621e7687d71a9608b6551f1ec11b9658ea801d8af3478be5d7ddf1a7d2f3d0182ccf4196f8fabb6a5cd2a051a097c89ac
DIST chromium-63.0.3223.8.tar.xz 541587956 SHA256
bced462e16a28ff0a3896539e6c7f72e76cb7ba16640a6cac9a533ec4b8f5ee5 SHA512
6ca0efac47adee14b04cba312397b80aeaed1b0ce9bee427c508c44636ab9a1668f743bd3939d83417129d7e83c38c2f95b72c502c6d834056cf7477ef8b4de8
WHIRLPOOL
b9f526eec3626b93f2541461b9b3a79bef283de62d99e30c209859e686db8e09ed327f90d0811703d699e9813cb86e0002be93fa42372e65afef1c96b8c91d35
+DIST chromium-63.0.3230.0.tar.xz 558852780 SHA256
97daa90a6f0ba7dc49a168cbf9c40896e621fb0352ab6de1d2fa428bb63ab64a SHA512
b0aa9a42df303bc7ff412dec30b3bfed292ae39cb5e0f705f28eeb7a60d6125b9cecef7e3ab7798b2ca091ec71215fa5639def6b867c9fdb7a9a85c9b42323b3
WHIRLPOOL
1b9e346018c7056fce3f844d37b69e98529c9dc3ae04bdf07378c7de568d295814a42aa133c463a3be8d22a39b5f62ec69f679ea5dca3fe7e37a15215932c794
diff --git a/www-client/chromium/chromium-63.0.3218.0.ebuild
b/www-client/chromium/chromium-63.0.3230.0.ebuild
similarity index 97%
rename from www-client/chromium/chromium-63.0.3218.0.ebuild
rename to www-client/chromium/chromium-63.0.3230.0.ebuild
index f43fe5c6b6e..eb1549c1ea9 100644
--- a/www-client/chromium/chromium-63.0.3218.0.ebuild
+++ b/www-client/chromium/chromium-63.0.3230.0.ebuild
@@ -144,10 +144,9 @@ GTK+ icon theme.
PATCHES=(
"${FILESDIR}/${PN}-widevine-r1.patch"
"${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch"
- "${FILESDIR}/${PN}-gcc5-r2.patch"
- "${FILESDIR}/${PN}-glibc2.26-r1.patch"
- "${FILESDIR}/${PN}-gn-bootstrap-r19.patch"
- "${FILESDIR}/${PN}-sysroot-r1.patch"
+ "${FILESDIR}/${PN}-gcc5-r4.patch"
+ "${FILESDIR}/${PN}-gn-bootstrap-r21.patch"
+ "${FILESDIR}/${PN}-clang-r1.patch"
)
pre_build_checks() {
@@ -157,10 +156,13 @@ pre_build_checks() {
# bugs: #601654
die "At least clang 3.9.1 is required"
fi
- if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
- # bugs: #535730, #525374, #518668, #600288, #627356
- die "At least gcc 5.0 is required"
+ if tc-is-gcc; then
+ die "Known build break with gcc, see
https://bugs.gentoo.org/633452 . Use clang as workaround."
fi
+ #if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)";
then
+ # # bugs: #535730, #525374, #518668, #600288, #627356
+ # die "At least gcc 5.0 is required"
+ #fi
fi
# Check build requirements, bug #541816 and bug #471810 .
@@ -206,7 +208,6 @@ src_prepare() {
base/third_party/valgrind
base/third_party/xdg_mime
base/third_party/xdg_user_dirs
- breakpad/src/third_party/curl
chrome/third_party/mozilla_security_manager
courgette/third_party
net/third_party/mozilla_security_manager
@@ -221,6 +222,8 @@ src_prepare() {
third_party/angle/src/third_party/trace_event
third_party/blink
third_party/boringssl
+ third_party/breakpad
+ third_party/breakpad/breakpad/src/third_party/curl
third_party/brotli
third_party/cacheinvalidation
third_party/catapult
@@ -606,9 +609,6 @@ src_install() {
insinto "${CHROMIUM_HOME}/swiftshader"
doins out/Release/swiftshader/*.so
- newman out/Release/chrome.1 chromium.1
- newman out/Release/chrome.1 chromium-browser.1
-
# Install icons and desktop entry.
local branding size
for size in 16 22 24 32 48 64 128 256 ; do
diff --git a/www-client/chromium/files/chromium-clang-r1.patch
b/www-client/chromium/files/chromium-clang-r1.patch
new file mode 100644
index 00000000000..0fef167566a
--- /dev/null
+++ b/www-client/chromium/files/chromium-clang-r1.patch
@@ -0,0 +1,21 @@
+--- a/build/config/compiler/BUILD.gn.orig 2017-10-04 08:50:15.014675936
+0000
++++ b/build/config/compiler/BUILD.gn 2017-10-04 08:50:32.831024327 +0000
+@@ -429,18 +429,6 @@
+ cflags += [ "-fcolor-diagnostics" ]
+ }
+
+- # TODO(hans): Remove this once Clang generates better optimized debug info
by
+- # default. https://crbug.com/765793
+- if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
+- target_os != "chromeos") {
+- cflags += [
+- "-Xclang",
+- "-mllvm",
+- "-Xclang",
+- "-instcombine-lower-dbg-declare=1",
+- ]
+- }
+-
+ # Print absolute paths in diagnostics. There is no precedent for doing this
+ # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
+ # Windows developers rely on it (crbug.com/636109) so only do this on
Windows.
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r21.patch
b/www-client/chromium/files/chromium-gn-bootstrap-r21.patch
new file mode 100644
index 00000000000..f3127af09ec
--- /dev/null
+++ b/www-client/chromium/files/chromium-gn-bootstrap-r21.patch
@@ -0,0 +1,28 @@
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
+index 601d5331698e..f154ed2ef3e6 100755
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -536,7 +536,6 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/threading/thread_local_storage.cc',
+ 'base/threading/thread_restrictions.cc',
+ 'base/threading/thread_task_runner_handle.cc',
+- 'base/threading/worker_pool.cc',
+ 'base/time/clock.cc',
+ 'base/time/default_clock.cc',
+ 'base/time/default_tick_clock.cc',
+@@ -546,7 +545,6 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/timer/timer.cc',
+ 'base/trace_event/category_registry.cc',
+ 'base/trace_event/event_name_filter.cc',
+- 'base/trace_event/freed_object_tracker.cc',
+ 'base/trace_event/heap_profiler_allocation_context.cc',
+ 'base/trace_event/heap_profiler_allocation_context_tracker.cc',
+ 'base/trace_event/heap_profiler_allocation_register.cc',
+@@ -611,7 +609,6 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/threading/platform_thread_internal_posix.cc',
+ 'base/threading/platform_thread_posix.cc',
+ 'base/threading/thread_local_storage_posix.cc',
+- 'base/threading/worker_pool_posix.cc',
+ 'base/time/time_conversion_posix.cc',
+ 'base/trace_event/heap_profiler_allocation_register_posix.cc',
+ ])
