summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Rasmus Thomsen <Rasmus.thomsen@protonmail.com> 2017-12-08 21:36:33 +0100
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-12-13 00:17:31 +0100
commit21b7eb1c1db956cd455432b7f87b617489a0e44d (patch)
tree0e7e7be1e8c82361415c094f735fe9a6cc0ea4bf
parent5364eea829674630bdbd4f647109233f8955457e (diff)
downloaddesktop-master.tar.gz
desktop-master.tar.xz
net-www/chromium-stable{,-widevine-plugin}: version bump to 63.0.3239.84HEADmaster
Change-Id: Ia81ede50f73deff9b3bc7fc119bea8e260685451 Reviewed-on: https://galileo.mailstation.de/gerrit/10783 Reviewed-by: Timo Gurr <tgurr@exherbo.org>
-rw-r--r--packages/net-www/chromium-stable-widevine-plugin/chromium-stable-widevine-plugin-63.0.3239.84_1.exheres-0 (renamed from packages/net-www/chromium-stable-widevine-plugin/chromium-stable-widevine-plugin-62.0.3202.94_1.exheres-0)0
-rw-r--r--packages/net-www/chromium-stable/chromium-stable-63.0.3239.84.exheres-0 (renamed from packages/net-www/chromium-stable/chromium-stable-62.0.3202.94.exheres-0)4
-rw-r--r--packages/net-www/chromium-stable/files/chromium-stable-59.0.3071.115-ucontext-fix.patch218
-rw-r--r--packages/net-www/chromium-stable/files/chromium-stable-gn-bootstrap.patch72
-rw-r--r--packages/net-www/chromium-stable/files/chromium-webrtc-r0.patch37
-rw-r--r--packages/net-www/chromium-stable/files/crc32c-string-view-check.patch78
-rw-r--r--packages/net-www/exlibs/chromium.exlib28
7 files changed, 53 insertions, 384 deletions
diff --git a/packages/net-www/chromium-stable-widevine-plugin/chromium-stable-widevine-plugin-62.0.3202.94_1.exheres-0 b/packages/net-www/chromium-stable-widevine-plugin/chromium-stable-widevine-plugin-63.0.3239.84_1.exheres-0
index c5b8016..c5b8016 100644
--- a/packages/net-www/chromium-stable-widevine-plugin/chromium-stable-widevine-plugin-62.0.3202.94_1.exheres-0
+++ b/packages/net-www/chromium-stable-widevine-plugin/chromium-stable-widevine-plugin-63.0.3239.84_1.exheres-0
diff --git a/packages/net-www/chromium-stable/chromium-stable-62.0.3202.94.exheres-0 b/packages/net-www/chromium-stable/chromium-stable-63.0.3239.84.exheres-0
index b5be98c..28d6e92 100644
--- a/packages/net-www/chromium-stable/chromium-stable-62.0.3202.94.exheres-0
+++ b/packages/net-www/chromium-stable/chromium-stable-63.0.3239.84.exheres-0
@@ -36,9 +36,7 @@ DEPENDENCIES+="
WIDEVINE_VERSION=1.4.8.1029
DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/${PN}-gn-bootstrap.patch
- "${FILES}"/${PN}-59.0.3071.115-ucontext-fix.patch
- "${FILES}"/crc32c-string-view-check.patch
+ "${FILES}"/chromium-webrtc-r0.patch
)
src_prepare() {
diff --git a/packages/net-www/chromium-stable/files/chromium-stable-59.0.3071.115-ucontext-fix.patch b/packages/net-www/chromium-stable/files/chromium-stable-59.0.3071.115-ucontext-fix.patch
deleted file mode 100644
index 655261b..0000000
--- a/packages/net-www/chromium-stable/files/chromium-stable-59.0.3071.115-ucontext-fix.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-Source: Fedora, https://src.fedoraproject.org/rpms/chromium/raw/master/f/chromium-59.0.3071.115-ucontext-fix.patch
-Upstream: Unsure (Couldn't find anything in the bugtracker and on gerrit)
-Reason: Fix build with glibc-2.26
-
-diff -up chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc.ucontextfix chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
---- chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc.ucontextfix 2017-07-12 15:23:33.019591380 -0400
-+++ chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc 2017-07-12 15:32:52.069197546 -0400
-@@ -36,19 +36,19 @@ namespace google_breakpad {
-
- // Minidump defines register structures which are different from the raw
- // structures which we get from the kernel. These are platform specific
--// functions to juggle the ucontext and user structures into minidump format.
-+// functions to juggle the ucontext_t and user structures into minidump format.
-
- #if defined(__i386__)
-
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gregs[REG_ESP];
- }
-
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gregs[REG_EIP];
- }
-
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct _libc_fpstate* fp) {
- const greg_t* regs = uc->uc_mcontext.gregs;
-
-@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawC
-
- #elif defined(__x86_64)
-
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gregs[REG_RSP];
- }
-
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gregs[REG_RIP];
- }
-
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct _libc_fpstate* fpregs) {
- const greg_t* regs = uc->uc_mcontext.gregs;
-
-@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawC
-
- #elif defined(__ARM_EABI__)
-
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.arm_sp;
- }
-
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.arm_pc;
- }
-
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
- out->context_flags = MD_CONTEXT_ARM_FULL;
-
- out->iregs[0] = uc->uc_mcontext.arm_r0;
-@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawC
-
- #elif defined(__aarch64__)
-
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.sp;
- }
-
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.pc;
- }
-
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct fpsimd_context* fpregs) {
- out->context_flags = MD_CONTEXT_ARM64_FULL;
-
-@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawC
-
- #elif defined(__mips__)
-
--uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP];
- }
-
--uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
-+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
- return uc->uc_mcontext.pc;
- }
-
--void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
-+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
- #if _MIPS_SIM == _ABI64
- out->context_flags = MD_CONTEXT_MIPS64_FULL;
- #elif _MIPS_SIM == _ABIO32
-diff -up chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h.ucontextfix chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
---- chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h.ucontextfix 2017-07-12 15:33:08.486806743 -0400
-+++ chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h 2017-07-12 15:33:57.299644808 -0400
-@@ -39,23 +39,23 @@
-
- namespace google_breakpad {
-
--// Wraps platform-dependent implementations of accessors to ucontext structs.
-+// Wraps platform-dependent implementations of accessors to ucontext_t structs.
- struct UContextReader {
-- static uintptr_t GetStackPointer(const struct ucontext* uc);
-+ static uintptr_t GetStackPointer(const ucontext_t* uc);
-
-- static uintptr_t GetInstructionPointer(const struct ucontext* uc);
-+ static uintptr_t GetInstructionPointer(const ucontext_t* uc);
-
-- // Juggle a arch-specific ucontext into a minidump format
-+ // Juggle a arch-specific ucontext_t into a minidump format
- // out: the minidump structure
- // info: the collection of register structures.
- #if defined(__i386__) || defined(__x86_64)
-- static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct _libc_fpstate* fp);
- #elif defined(__aarch64__)
-- static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
-+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
- const struct fpsimd_context* fpregs);
- #else
-- static void FillCPUContext(RawContextCPU *out, const ucontext *uc);
-+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
- #endif
- };
-
-diff -up chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.cc.ucontextfix chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.cc
---- chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.cc.ucontextfix 2017-07-12 15:34:09.094364048 -0400
-+++ chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.cc 2017-07-12 15:35:36.483283853 -0400
-@@ -439,9 +439,9 @@ bool ExceptionHandler::HandleSignal(int
- // Fill in all the holes in the struct to make Valgrind happy.
- memset(&g_crash_context_, 0, sizeof(g_crash_context_));
- memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t));
-- memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext));
-+ memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t));
- #if defined(__aarch64__)
-- struct ucontext* uc_ptr = (struct ucontext*)uc;
-+ ucontext_t* uc_ptr = (ucontext_t*)uc;
- struct fpsimd_context* fp_ptr =
- (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved;
- if (fp_ptr->head.magic == FPSIMD_MAGIC) {
-@@ -450,9 +450,9 @@ bool ExceptionHandler::HandleSignal(int
- }
- #elif !defined(__ARM_EABI__) && !defined(__mips__)
- // FP state is not part of user ABI on ARM Linux.
-- // In case of MIPS Linux FP state is already part of struct ucontext
-+ // In case of MIPS Linux FP state is already part of ucontext_t
- // and 'float_state' is not a member of CrashContext.
-- struct ucontext* uc_ptr = (struct ucontext*)uc;
-+ ucontext_t* uc_ptr = (ucontext_t*)uc;
- if (uc_ptr->uc_mcontext.fpregs) {
- memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs,
- sizeof(g_crash_context_.float_state));
-@@ -476,7 +476,7 @@ bool ExceptionHandler::SimulateSignalDel
- // ExceptionHandler::HandleSignal().
- siginfo.si_code = SI_USER;
- siginfo.si_pid = getpid();
-- struct ucontext context;
-+ ucontext_t context;
- getcontext(&context);
- return HandleSignal(sig, &siginfo, &context);
- }
-diff -up chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.h.ucontextfix chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.h
---- chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.h.ucontextfix 2017-07-12 15:35:48.559996380 -0400
-+++ chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.h 2017-07-12 15:36:32.615948562 -0400
-@@ -191,11 +191,11 @@ class ExceptionHandler {
- struct CrashContext {
- siginfo_t siginfo;
- pid_t tid; // the crashing thread.
-- struct ucontext context;
-+ ucontext_t context;
- #if !defined(__ARM_EABI__) && !defined(__mips__)
- // #ifdef this out because FP state is not part of user ABI for Linux ARM.
- // In case of MIPS Linux FP state is already part of struct
-- // ucontext so 'float_state' is not required.
-+ // ucontext_t so 'float_state' is not required.
- fpstate_t float_state;
- #endif
- };
-diff -up chromium-59.0.3071.115/breakpad/src/client/linux/microdump_writer/microdump_writer.cc.ucontextfix chromium-59.0.3071.115/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
---- chromium-59.0.3071.115/breakpad/src/client/linux/microdump_writer/microdump_writer.cc.ucontextfix 2017-07-12 15:37:26.232674196 -0400
-+++ chromium-59.0.3071.115/breakpad/src/client/linux/microdump_writer/microdump_writer.cc 2017-07-12 15:37:39.032369973 -0400
-@@ -579,7 +579,7 @@ class MicrodumpWriter {
-
- void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
-
-- const struct ucontext* const ucontext_;
-+ const ucontext_t* const ucontext_;
- #if !defined(__ARM_EABI__) && !defined(__mips__)
- const google_breakpad::fpstate_t* const float_state_;
- #endif
-diff -up chromium-59.0.3071.115/breakpad/src/client/linux/minidump_writer/minidump_writer.cc.ucontextfix chromium-59.0.3071.115/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
---- chromium-59.0.3071.115/breakpad/src/client/linux/minidump_writer/minidump_writer.cc.ucontextfix 2017-07-12 15:37:54.041013246 -0400
-+++ chromium-59.0.3071.115/breakpad/src/client/linux/minidump_writer/minidump_writer.cc 2017-07-12 15:38:19.600405748 -0400
-@@ -1323,7 +1323,7 @@ class MinidumpWriter {
- const int fd_; // File descriptor where the minidum should be written.
- const char* path_; // Path to the file where the minidum should be written.
-
-- const struct ucontext* const ucontext_; // also from the signal handler
-+ const ucontext_t* const ucontext_; // also from the signal handler
- #if !defined(__ARM_EABI__) && !defined(__mips__)
- const google_breakpad::fpstate_t* const float_state_; // ditto
- #endif
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
deleted file mode 100644
index fab35df..0000000
--- a/packages/net-www/chromium-stable/files/chromium-stable-gn-bootstrap.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Source: Gentoo
-Upstream: No
-Reason: Required for gn to sucessfully bootstrap
-
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -179,6 +179,7 @@ def build_gn_with_ninja_manually(tempdir, options):
-
- write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_flags.h',
- {
-+ 'ENABLE_LOCATION_SOURCE': 'false',
- 'ENABLE_PROFILING': 'false',
- 'CAN_UNWIND_WITH_FRAME_POINTERS': 'false'
- })
-@@ -204,7 +205,7 @@ def build_gn_with_ninja_manually(tempdir, options):
-
- write_gn_ninja(os.path.join(tempdir, 'build.ninja'),
- root_gen_dir, options)
-- cmd = ['ninja', '-C', tempdir]
-+ cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err']
- if options.verbose:
- cmd.append('-v')
-
-@@ -458,6 +459,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/metrics/bucket_ranges.cc',
- 'base/metrics/field_trial.cc',
- 'base/metrics/field_trial_param_associator.cc',
-+ 'base/metrics/field_trial_params.cc',
- 'base/metrics/histogram.cc',
- 'base/metrics/histogram_base.cc',
- 'base/metrics/histogram_functions.cc',
-@@ -507,6 +509,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/task_scheduler/scheduler_lock_impl.cc',
- 'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc',
- 'base/task_scheduler/scheduler_worker.cc',
-+ 'base/task_scheduler/scheduler_worker_pool.cc',
- 'base/task_scheduler/scheduler_worker_pool_impl.cc',
- 'base/task_scheduler/scheduler_worker_pool_params.cc',
- 'base/task_scheduler/scheduler_worker_stack.cc',
-@@ -523,6 +526,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/third_party/icu/icu_utf.cc',
- 'base/third_party/nspr/prtime.cc',
- 'base/threading/post_task_and_reply_impl.cc',
-+ 'base/threading/scoped_blocking_call.cc',
- 'base/threading/sequence_local_storage_map.cc',
- 'base/threading/sequenced_task_runner_handle.cc',
- 'base/threading/sequenced_worker_pool.cc',
-@@ -579,7 +583,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/unguessable_token.cc',
- 'base/value_iterators.cc',
- 'base/values.cc',
-- 'base/value_iterators.cc',
- 'base/vlog.cc',
- ])
-
-@@ -652,7 +655,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- static_libraries['base']['sources'].extend([
- 'base/memory/shared_memory_handle_posix.cc',
- 'base/memory/shared_memory_posix.cc',
-- 'base/memory/shared_memory_tracker.cc',
- 'base/nix/xdg_util.cc',
- 'base/process/internal_linux.cc',
- 'base/process/memory_linux.cc',
-@@ -827,7 +829,7 @@ def build_gn_with_gn(temp_gn, build_dir, options):
- cmd = [temp_gn, 'gen', build_dir, '--args=%s' % gn_gen_args]
- check_call(cmd)
-
-- cmd = ['ninja', '-C', build_dir]
-+ cmd = ['ninja', '-C', build_dir, '-w', 'dupbuild=err']
- if options.verbose:
- cmd.append('-v')
- cmd.append('gn')
diff --git a/packages/net-www/chromium-stable/files/chromium-webrtc-r0.patch b/packages/net-www/chromium-stable/files/chromium-webrtc-r0.patch
new file mode 100644
index 0000000..921cc62
--- /dev/null
+++ b/packages/net-www/chromium-stable/files/chromium-webrtc-r0.patch
@@ -0,0 +1,37 @@
+Upstream: Yes, https://webrtc-review.googlesource.com/9384
+Reason: Fixes musl builds of webrtc
+
+From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Date: Fri, 13 Oct 2017 15:49:32 +0200
+Subject: [PATCH] IWYU: Include math.h for round(3).
+
+math.h was being implicitly included, which can break the build with
+alternative libc implementations.
+
+Bug: None
+Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952
+Reviewed-on: https://webrtc-review.googlesource.com/9384
+Reviewed-by: Tommi <tommi@webrtc.org>
+Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa@intel.com>
+Cr-Commit-Position: refs/heads/master@{#20292}
+---
+ p2p/base/port.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/p2p/base/port.cc b/p2p/base/port.cc
+index a1b478d11..81aa0aadb 100644
+--- a/third_party/webrtc/p2p/base/port.cc
++++ b/third_party/webrtc/p2p/base/port.cc
+@@ -10,6 +10,8 @@
+
+ #include "p2p/base/port.h"
+
++#include <math.h>
++
+ #include <algorithm>
+ #include <vector>
+
+--
+2.15.0.rc2
+
diff --git a/packages/net-www/chromium-stable/files/crc32c-string-view-check.patch b/packages/net-www/chromium-stable/files/crc32c-string-view-check.patch
deleted file mode 100644
index 72a0926..0000000
--- a/packages/net-www/chromium-stable/files/crc32c-string-view-check.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Upstream: Yes
-Reason: Required for GCC 7.x & Clang
-Source: (below)
-
-From d0f929a5db87cb34d03afb0d8e8bfc95b8f786e3 Mon Sep 17 00:00:00 2001
-From: Victor Costan <costan@gmail.com>
-Date: Mon, 11 Sep 2017 13:18:27 -0700
-Subject: [PATCH] More conservative check for <string_view> availability. (#4)
-
-has_include(<string_view>) does not imply that the header can be
-included and will work. The assumption fails on MSVC and libc++ [1, 2].
-Conversely, checking that __cplusplus > 201402L is not sufficient on its
-own either, as the toolchain on Mac OS 10.12 passes that check but does
-not contain a <string_view> header.
-
-[1] https://crbug.com/759349
-[2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79433
----
- third_party/crc32c/src/include/crc32c/crc32c.h | 10 +++-------
- third_party/crc32c/src/src/crc32c_unittest.cc | 6 ++----
- 2 files changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/third_party/crc32c/src/include/crc32c/crc32c.h b/include/crc32c/crc32c.h
-index 9f1973a..8ecab0d 100644
---- a/third_party/crc32c/src/include/crc32c/crc32c.h
-+++ b/third_party/crc32c/src/include/crc32c/crc32c.h
-@@ -33,22 +33,18 @@ inline uint32_t Crc32c(const std::string& string) {
- string.size());
- }
-
--#if defined(__has_include)
-+#if __cplusplus > 201402L
- #if __has_include(<string_view>)
--// Visual Studio provides a <string_view> header even in C++11 mode. When
--// included, the header issues an #error. (C1189)
--#if !defined(_MSC_VER) || __cplusplus >= 201703L
- #include <string_view>
-
--// Comptues the CRC32C of the bytes in the string_view.
-+// Computes the CRC32C of the bytes in the string_view.
- inline uint32_t Crc32c(const std::string_view& string_view) {
- return Crc32c(reinterpret_cast<const uint8_t*>(string_view.data()),
- string_view.size());
- }
-
--#endif // !defined(_MSC_VER) || __cplusplus >= 201703L
- #endif // __has_include(<string_view>)
--#endif // defined(__has_include)
-+#endif // __cplusplus > 201402L
-
- } // namespace crc32c
-
-diff --git a/third_party/crc32c/src/src/crc32c_unittest.cc b/src/crc32c_unittest.cc
-index 7a9c765..69babb3 100644
---- a/third_party/crc32c/src/src/crc32c_unittest.cc
-+++ b/third_party/crc32c/src/src/crc32c_unittest.cc
-@@ -95,9 +95,8 @@ TEST(CRC32CTest, Crc32cStdString) {
- EXPECT_EQ(static_cast<uint32_t>(0x113fdb5c), crc32c::Crc32c(buf));
- }
-
--#if defined(__has_include)
-+#if __cplusplus > 201402L
- #if __has_include(<string_view>)
--#if !defined(_MSC_VER) || __cplusplus >= 201703L
-
- TEST(CRC32CTest, Crc32cStdStringView) {
- uint8_t buf[32];
-@@ -118,9 +117,8 @@ TEST(CRC32CTest, Crc32cStdStringView) {
- EXPECT_EQ(static_cast<uint32_t>(0x113fdb5c), crc32c::Crc32c(view));
- }
-
--#endif // !defined(_MSC_VER) || __cplusplus >= 201703L
- #endif // __has_include(<string_view>)
--#endif // defined(__has_include)
-+#endif // __cplusplus > 201402L
-
- #define TESTED_EXTEND Extend
- #include "./crc32c_extend_unittests.h"
diff --git a/packages/net-www/exlibs/chromium.exlib b/packages/net-www/exlibs/chromium.exlib
index ab10c47..30f1d37 100644
--- a/packages/net-www/exlibs/chromium.exlib
+++ b/packages/net-www/exlibs/chromium.exlib
@@ -88,6 +88,7 @@ DEPENDENCIES="
dev-libs/libxslt[>=1.1.26]
dev-libs/nspr[>=4.0]
dev-libs/nss[>=3.12.3] [[ note = [ see base/nss_util.cc for the version requirement ] ]]
+ dev-libs/re2
media/ffmpeg[>=3.0]
media-libs/flac
media-libs/fontconfig
@@ -105,7 +106,7 @@ DEPENDENCIES="
x11-dri/libdrm
x11-libs/cairo[X]
x11-libs/gdk-pixbuf:2.0
- x11-libs/harfbuzz[>=1.4.2]
+ x11-libs/harfbuzz[>=1.5.0]
x11-libs/libX11
x11-libs/libxcb
x11-libs/libXScrnSaver
@@ -173,7 +174,6 @@ chromium_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
@@ -182,29 +182,33 @@ chromium_src_prepare() {
third_party/analytics
third_party/angle
third_party/angle/src/common/third_party/base
- third_party/angle/src/common/third_party/murmurhash
+ third_party/angle/src/common/third_party/smhasher
third_party/angle/src/third_party/compiler
third_party/angle/src/third_party/libXNVCtrl
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
third_party/catapult/third_party/polymer
- third_party/catapult/third_party/py_vulcanize
- third_party/catapult/third_party/py_vulcanize/third_party/rcssmin
- third_party/catapult/third_party/py_vulcanize/third_party/rjsmin
+ third_party/catapult/common/py_vulcanize/third_party/rcssmin
+ third_party/catapult/common/py_vulcanize/third_party/rjsmin
third_party/catapult/tracing/third_party/d3
third_party/catapult/tracing/third_party/gl-matrix
third_party/catapult/tracing/third_party/jszip
third_party/catapult/tracing/third_party/mannwhitneyu
third_party/catapult/tracing/third_party/oboe
+ third_party/catapult/tracing/third_party/pako
third_party/ced
third_party/cld_2
third_party/cld_3
third_party/crc32c
third_party/cros_system_api
third_party/devscripts
+ third_party/devtools-node-modules
third_party/dom_distiller_js
third_party/fips181
third_party/flatbuffers
@@ -259,6 +263,7 @@ chromium_src_prepare() {
third_party/protobuf/third_party/six
third_party/qcms
third_party/sfntly
+ third_party/s2cellid
third_party/skia
third_party/skia/third_party/gif
third_party/skia/third_party/vulkan
@@ -294,9 +299,6 @@ chromium_src_prepare() {
third_party/yasm/run_yasm.py
)
- # TODO: package re2
- keeplibs+=( third_party/re2 )
-
# TODO: keep libvpx (58.0.3029.81 fails to compile with the current libvpx-1.6.1)
keeplibs+=( third_party/libvpx )
keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
@@ -331,14 +333,12 @@ chromium_src_prepare() {
}
chromium_src_configure() {
- # re2: not yet packaged
# libevent: https://bugs.gentoo.org/593458
# libvpx: WebRTC depends on unreleased APIs, see
# https://bugs.chromium.org/p/chromium/issues/detail?id=697843
local gn_system_libraries="
ffmpeg
flac
- harfbuzz-ng
icu
libdrm
libjpeg
@@ -348,6 +348,7 @@ chromium_src_configure() {
libxslt
openh264
opus
+ re2
snappy
yasm
zlib
@@ -413,6 +414,9 @@ chromium_src_configure() {
# Disable deprecated
myconf_gn+=" use_gconf=false"
+ # See third_party/BUILD.gn, required for chromium to search for system harfbuzz
+ myconf_gn+=" use_system_harfbuzz=true"
+
# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
# Note: These are for Exherbo use ONLY. For your own distribution, please get
# your own set of keys.
@@ -551,8 +555,6 @@ chromium_src_install() {
doins libwidevinecdmadapter.so
- doman chrome.1
-
dodir /usr/$(exhost --target)/bin
dosym ${dest}/chromium-launcher.sh /usr/$(exhost --target)/bin/chromium-browser