summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Gurr Timo <tgurr@exherbo.org> 2017-09-07 18:48:03 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-09-08 10:09:17 +0200
commit0e5fa79b0c18eee5dd059182818184ef3322d1f0 (patch)
treede84cda82933c015ee41f99a8bed5951169f4955
parent399ca0979f1ed58e9d163d254a8fddee45e3218b (diff)
downloaddesktop-0e5fa79b0c18eee5dd059182818184ef3322d1f0.tar.gz
desktop-0e5fa79b0c18eee5dd059182818184ef3322d1f0.tar.xz
net-www/chromium-stable{,-widevine-plugin}: version bump to 61.0.3163.79
Change-Id: Ica3ae879570ac34d264efc048298c9e193e59e73 Reviewed-on: https://galileo.mailstation.de/gerrit/10006 Reviewed-by: Timo Gurr <tgurr@exherbo.org>
-rw-r--r--packages/net-www/chromium-stable-widevine-plugin/chromium-stable-widevine-plugin-61.0.3163.79_1.exheres-0 (renamed from packages/net-www/chromium-stable-widevine-plugin/chromium-stable-widevine-plugin-60.0.3112.113_1.exheres-0)0
-rw-r--r--packages/net-www/chromium-stable/chromium-stable-61.0.3163.79.exheres-0 (renamed from packages/net-www/chromium-stable/chromium-stable-60.0.3112.113.exheres-0)7
-rw-r--r--packages/net-www/chromium-stable/files/chromium-stable-61.0.3163.79-atk.patch15
-rw-r--r--packages/net-www/chromium-stable/files/chromium-stable-61.0.3163.79-gcc.patch18
-rw-r--r--packages/net-www/chromium-stable/files/chromium-stable-61.0.3163.79-mojo-dep.patch58
-rw-r--r--packages/net-www/chromium-stable/files/chromium-stable-gn-bootstrap.patch28
-rw-r--r--packages/net-www/exlibs/chromium.exlib8
7 files changed, 118 insertions, 16 deletions
diff --git a/packages/net-www/chromium-stable-widevine-plugin/chromium-stable-widevine-plugin-60.0.3112.113_1.exheres-0 b/packages/net-www/chromium-stable-widevine-plugin/chromium-stable-widevine-plugin-61.0.3163.79_1.exheres-0
index c5b8016..c5b8016 100644
--- a/packages/net-www/chromium-stable-widevine-plugin/chromium-stable-widevine-plugin-60.0.3112.113_1.exheres-0
+++ b/packages/net-www/chromium-stable-widevine-plugin/chromium-stable-widevine-plugin-61.0.3163.79_1.exheres-0
diff --git a/packages/net-www/chromium-stable/chromium-stable-60.0.3112.113.exheres-0 b/packages/net-www/chromium-stable/chromium-stable-61.0.3163.79.exheres-0
index d4bf8be..61bcc73 100644
--- a/packages/net-www/chromium-stable/chromium-stable-60.0.3112.113.exheres-0
+++ b/packages/net-www/chromium-stable/chromium-stable-61.0.3163.79.exheres-0
@@ -32,12 +32,15 @@ DEPENDENCIES+="
# http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${PV}-1_amd64.deb
# $ ar -x google-chrome-stable_${PV}-1_amd64.deb
# $ tar xf data.tar.xz
-# $ strings ./opt/google/chrome/chrome | grep -C 1 " (version:" | head -n 1
-WIDEVINE_VERSION=1.4.8.1000
+# $ strings ./opt/google/chrome/chrome | grep " (version:"
+WIDEVINE_VERSION=1.4.8.1008
DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/${PN}-gn-bootstrap.patch
"${FILES}"/${PN}-59.0.3071.115-ucontext-fix.patch
+ "${FILES}"/${PN}-61.0.3163.79-gcc.patch
+ "${FILES}"/${PN}-61.0.3163.79-atk.patch
+ "${FILES}"/${PN}-61.0.3163.79-mojo-dep.patch
)
src_prepare() {
diff --git a/packages/net-www/chromium-stable/files/chromium-stable-61.0.3163.79-atk.patch b/packages/net-www/chromium-stable/files/chromium-stable-61.0.3163.79-atk.patch
new file mode 100644
index 0000000..064b64d
--- /dev/null
+++ b/packages/net-www/chromium-stable/files/chromium-stable-61.0.3163.79-atk.patch
@@ -0,0 +1,15 @@
+Source: Gentoo
+Upstream: Unknown
+Reason: Fix build
+
+--- a/content/browser/accessibility/browser_accessibility_auralinux.cc.orig 2017-07-27 06:28:01.090257874 +0000
++++ b/content/browser/accessibility/browser_accessibility_auralinux.cc 2017-07-27 06:28:21.174653680 +0000
+@@ -571,7 +571,7 @@
+ // it's best to leave this out rather than break people's builds:
+ #if defined(ATK_CHECK_VERSION)
+ #if ATK_CHECK_VERSION(2, 16, 0)
+- atk_state_set_add_state(atk_state_set, ATK_STATE_READ_ONLY);
++ atk_state_set_add_state(state_set, ATK_STATE_READ_ONLY);
+ #endif
+ #endif
+ break;
diff --git a/packages/net-www/chromium-stable/files/chromium-stable-61.0.3163.79-gcc.patch b/packages/net-www/chromium-stable/files/chromium-stable-61.0.3163.79-gcc.patch
new file mode 100644
index 0000000..804fd7c
--- /dev/null
+++ b/packages/net-www/chromium-stable/files/chromium-stable-61.0.3163.79-gcc.patch
@@ -0,0 +1,18 @@
+Source: Gentoo
+Upstream: Unknown (Upstream only builds with clang nowadays, see https://groups.google.com/a/chromium.org/d/msg/chromium-dev/5haWEDpUK6Y/LkM8f4CrDAAJ)
+Reason: Fix build with GCC
+
+diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h
+index 99f230ce7e9a..de2415d402f5 100644
+--- a/base/numerics/safe_math_shared_impl.h
++++ b/base/numerics/safe_math_shared_impl.h
+@@ -21,8 +21,7 @@
+ #if !defined(__native_client__) && \
+ ((defined(__clang__) && \
+ ((__clang_major__ > 3) || \
+- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
+- (defined(__GNUC__) && __GNUC__ >= 5))
++ (__clang_major__ == 3 && __clang_minor__ >= 4))))
+ #include "base/numerics/safe_math_clang_gcc_impl.h"
+ #define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
+ #else
diff --git a/packages/net-www/chromium-stable/files/chromium-stable-61.0.3163.79-mojo-dep.patch b/packages/net-www/chromium-stable/files/chromium-stable-61.0.3163.79-mojo-dep.patch
new file mode 100644
index 0000000..fdce810
--- /dev/null
+++ b/packages/net-www/chromium-stable/files/chromium-stable-61.0.3163.79-mojo-dep.patch
@@ -0,0 +1,58 @@
+Source: Gentoo
+Upstream: https://chromium-review.googlesource.com/602869
+Reason: Fix build
+
+From f8e2c057ec6123b0a1d08294f41e78c427636b49 Mon Sep 17 00:00:00 2001
+From: Mike Bjorge <mbjorge@chromium.org>
+Date: Mon, 7 Aug 2017 18:41:58 +0000
+Subject: [PATCH] Add mojo_blink dep from WebKit loader/.
+
+Now that loader has a direct dependency on the generated mojom-blink
+headers (https://chromium-review.googlesource.com/c/577488), the loader/
+target should have a dep on the mojo target that generates the headers,
+otherwise the build may fail depending on build order.
+
+All the other platform/ targets that depend on the mojom-blink headers
+are directly included in the platform target, which has the necessary
+dependency already.
+
+Bug: 746197
+Bug: 750883
+Change-Id: Ife1429ec649605aae3f7920560cec37f3a218154
+Reviewed-on: https://chromium-review.googlesource.com/602869
+Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
+Reviewed-by: Matt Falkenhagen <falken@chromium.org>
+Commit-Queue: Mike Bjorge <mbjorge@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#492369}
+---
+ third_party/WebKit/Source/platform/loader/BUILD.gn | 1 +
+ third_party/WebKit/public/BUILD.gn | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/third_party/WebKit/Source/platform/loader/BUILD.gn b/third_party/WebKit/Source/platform/loader/BUILD.gn
+index d483734b21cf..409befe884a8 100644
+--- a/third_party/WebKit/Source/platform/loader/BUILD.gn
++++ b/third_party/WebKit/Source/platform/loader/BUILD.gn
+@@ -99,6 +99,7 @@ source_set("loader") {
+ "//components/link_header_util:link_header_util",
+ "//mojo/public/cpp/system:system",
+ "//storage/public/interfaces:interfaces_blink__generator",
++ "//third_party/WebKit/public:mojo_bindings_blink",
+ ]
+
+ public_deps = [
+diff --git a/third_party/WebKit/public/BUILD.gn b/third_party/WebKit/public/BUILD.gn
+index 84ee3ca9136d..cc847663efc6 100644
+--- a/third_party/WebKit/public/BUILD.gn
++++ b/third_party/WebKit/public/BUILD.gn
+@@ -755,6 +755,7 @@ mojom("mojo_bindings") {
+ visibility_blink = [
+ "//content/common:mojo_bindings_blink",
+ "//third_party/WebKit/Source/platform",
++ "//third_party/WebKit/Source/platform/loader",
+ ]
+ sources = [
+ "platform/display_mode.mojom",
+--
+2.14.0
+
diff --git a/packages/net-www/chromium-stable/files/chromium-stable-gn-bootstrap.patch b/packages/net-www/chromium-stable/files/chromium-stable-gn-bootstrap.patch
index 1ed8ab1..7813dcf 100644
--- a/packages/net-www/chromium-stable/files/chromium-stable-gn-bootstrap.patch
+++ b/packages/net-www/chromium-stable/files/chromium-stable-gn-bootstrap.patch
@@ -2,16 +2,24 @@ Source: Gentoo
Upstream: No
Reason: Required for gn to sucessfully bootstrap
-Index: tools/gn/bootstrap/bootstrap.py
diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 6f2f5b1264519ea38cc36fb0b7e2cc24c378ca7a..0b03d2626b358fb90ab39d737679ee47bd60303b 100755
+index 1390560f8e37..ff2ae57c46b0 100755
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -487,6 +487,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/sys_info.cc',
- 'base/task_runner.cc',
- 'base/task_scheduler/delayed_task_manager.cc',
-+ 'base/task_scheduler/environment_config.cc',
- 'base/task_scheduler/post_task.cc',
- 'base/task_scheduler/priority_queue.cc',
- 'base/task_scheduler/scheduler_lock_impl.cc',
+@@ -449,6 +449,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/metrics/histogram_base.cc',
+ 'base/metrics/histogram_functions.cc',
+ 'base/metrics/histogram_samples.cc',
++ 'base/metrics/histogram_snapshot_manager.cc',
+ 'base/metrics/metrics_hashes.cc',
+ 'base/metrics/persistent_histogram_allocator.cc',
+ 'base/metrics/persistent_memory_allocator.cc',
+@@ -534,7 +535,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/trace_event/heap_profiler_allocation_context_tracker.cc',
+ 'base/trace_event/heap_profiler_allocation_register.cc',
+ 'base/trace_event/heap_profiler_event_filter.cc',
+- 'base/trace_event/heap_profiler_event_writer.cc',
++ 'base/trace_event/heap_profiler_heap_dump_writer.cc',
+ 'base/trace_event/heap_profiler_serialization_state.cc',
+ 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc',
+ 'base/trace_event/heap_profiler_type_name_deduplicator.cc',
diff --git a/packages/net-www/exlibs/chromium.exlib b/packages/net-www/exlibs/chromium.exlib
index e0c18be..2527d01 100644
--- a/packages/net-www/exlibs/chromium.exlib
+++ b/packages/net-www/exlibs/chromium.exlib
@@ -78,7 +78,7 @@ DEPENDENCIES="
dev-scm/git [[ note = [ https://bugs.gentoo.org/show_bug.cgi?id=593476 ] ]]
dev-util/gperf[>=3.0.4]
sys-devel/bison
- sys-devel/ninja
+ sys-devel/ninja[>=1.7.2]
build+run:
app-arch/gzip[>=1.8]
app-arch/snappy
@@ -183,10 +183,10 @@ chromium_src_prepare() {
third_party/WebKit
third_party/analytics
third_party/angle
- third_party/angle/src/common/third_party/numerics
+ third_party/angle/src/common/third_party/base
+ third_party/angle/src/common/third_party/murmurhash
third_party/angle/src/third_party/compiler
third_party/angle/src/third_party/libXNVCtrl
- third_party/angle/src/third_party/murmurhash
third_party/angle/src/third_party/trace_event
third_party/boringssl
third_party/brotli
@@ -381,7 +381,7 @@ chromium_src_configure() {
myconf_gn+=" enable_nacl=false"
# Trying to use gold results in linker crash
- myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false"
+ myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
# Don't try to build with Clang for now
myconf_gn+=" is_clang=false"