From 5cd4e9ca7f57ff5330fcdb5b9c9370711c78d656 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Mon, 20 Nov 2017 13:03:36 +0100 Subject: [PATCH] chromium: updated to 62.0.32.02.75 --- chromium/.footprint | 38 +++- chromium/.md5sum | 8 +- chromium/Pkgfile | 28 +-- chromium/breakpad-use-ucontext_t.patch | 225 +++++++++++++++++++++++ chromium/chromium-atk-r1.patch | 11 -- chromium/chromium-blink-gcc7.patch | 76 -------- chromium/chromium-gcc-r1.patch | 14 -- chromium/chromium-gn-bootstrap-r14.patch | 27 --- 8 files changed, 270 insertions(+), 157 deletions(-) create mode 100644 chromium/breakpad-use-ucontext_t.patch delete mode 100644 chromium/chromium-atk-r1.patch delete mode 100644 chromium/chromium-blink-gcc7.patch delete mode 100644 chromium/chromium-gcc-r1.patch delete mode 100644 chromium/chromium-gn-bootstrap-r14.patch diff --git a/chromium/.footprint b/chromium/.footprint index eb3a5d0..8c4f73c 100644 --- a/chromium/.footprint +++ b/chromium/.footprint @@ -87,8 +87,12 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Tests.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/accessibility/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/accessibility/accessibility_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/accessibility_test_runner/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/accessibility_test_runner/accessibility_test_runner_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/animation/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/animation/animation_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/application_test_runner/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/application_test_runner/application_test_runner_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/audits/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/audits/audits_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/audits2/ @@ -96,6 +100,10 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/audits2/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/audits2_worker.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/audits2_worker/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/audits2_worker/audits2_worker_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/audits_test_runner/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/audits_test_runner/audits_test_runner_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/bindings_test_runner/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/bindings_test_runner/bindings_test_runner_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/changes/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/changes/changes_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/cm/ @@ -112,8 +120,14 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/cookie_table/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/cookie_table/cookie_table_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/coverage/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/coverage/coverage_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/coverage_test_runner/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/coverage_test_runner/coverage_test_runner_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/data_grid/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/data_grid/data_grid_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/data_grid_test_runner/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/data_grid_test_runner/data_grid_test_runner_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/device_mode_test_runner/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/device_mode_test_runner/device_mode_test_runner_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/devices/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/devices/devices_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/devtools_compatibility.js @@ -164,6 +178,8 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/emulated_devices/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg drwxr-xr-x root/root usr/lib/chromium/resources/inspector/event_listeners/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/event_listeners/event_listeners_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/extensions_test_runner/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/extensions_test_runner/extensions_test_runner_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/formatter/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/formatter/formatter_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/formatter_worker.js @@ -174,6 +190,8 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/har_importer/ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/heap_snapshot_model/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/heap_snapshot_model/heap_snapshot_model_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/heap_snapshot_worker.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/heap_snapshot_worker/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/heap_snapshot_worker/heap_snapshot_worker_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/inline_editor/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/inline_editor/inline_editor_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/inspector.html @@ -184,34 +202,40 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/layer_viewer/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/layer_viewer/layer_viewer_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/layers/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/layers/layers_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/layers_test_runner/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/layers_test_runner/layers_test_runner_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/network/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/network/network_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/network_priorities/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/network_priorities/network_priorities_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/network_test_runner/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/network_test_runner/network_test_runner_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/object_ui/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/object_ui/object_ui_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/perf_ui/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/perf_ui/perf_ui_module.js -drwxr-xr-x root/root usr/lib/chromium/resources/inspector/product_registry/ --rw-r--r-- root/root usr/lib/chromium/resources/inspector/product_registry/product_registry_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/performance_test_runner/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/performance_test_runner/performance_test_runner_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/product_registry_impl/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/product_registry_impl/product_registry_impl_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/profiler/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/profiler/profiler_module.js -drwxr-xr-x root/root usr/lib/chromium/resources/inspector/protocol/ --rw-r--r-- root/root usr/lib/chromium/resources/inspector/protocol/protocol_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/profiler_test_runner/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/profiler_test_runner/profiler_test_runner_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/quick_open/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/quick_open/quick_open_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/resources/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/resources/resources_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/sass/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/sass/sass_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/sass_test_runner/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/sass_test_runner/sass_test_runner_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/screencast/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/screencast/screencast_module.js -drwxr-xr-x root/root usr/lib/chromium/resources/inspector/sdk/ --rw-r--r-- root/root usr/lib/chromium/resources/inspector/sdk/sdk_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/security/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/security/security_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/security_test_runner/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/security_test_runner/security_test_runner_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/settings/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/settings/settings_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/snippets/ @@ -220,6 +244,8 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/source_frame/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/source_frame/source_frame_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/sources/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/sources/sources_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/sources_test_runner/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/sources_test_runner/sources_test_runner_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/terminal/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/terminal/terminal_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/text_editor/ diff --git a/chromium/.md5sum b/chromium/.md5sum index 4de7894..9cf09e3 100644 --- a/chromium/.md5sum +++ b/chromium/.md5sum @@ -1,10 +1,8 @@ 4dbc4cd98731f133a3f6e0f47625ad08 breakpad-use-ucontext_t.patch -bf0629c03b3e3b957a9ee99c10b28210 chromium-61.0.3163.100.tar.xz -5b5a3ad8970846d3cead13249a101283 chromium-atk-r1.patch -034bc28a6988f3d6d1e7f291ec95365c chromium-blink-gcc7.patch +c754e1f63065d487fb134881de4932cd chromium-62.0.3202.75.tar.xz bce5db9dba2aec40a1a709797a907e2a chromium-build-toolchain.patch -ab7416d1494bb6a0a96fb72c9388580d chromium-gcc-r1.patch -22440a6f0c5660e90866d131a40fb0af chromium-gn-bootstrap-r14.patch +1e9f37377b470e26dc0fa609c1cdad9e chromium-gn-bootstrap-r17.patch b527005e021b14869a669e42c46b661d chromium.desktop 64968626706b07721983ac59fb3babbf chromium.sh +d1359f1c4cc42c9f74a862361d736ef1 crc32c-string-view-check.patch 3354997dd0bfde3443499133a6e16a85 last-commit-position.patch diff --git a/chromium/Pkgfile b/chromium/Pkgfile index 68cfc06..f707c6b 100644 --- a/chromium/Pkgfile +++ b/chromium/Pkgfile @@ -3,19 +3,17 @@ # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu # Maintainer: Jose V Beneyto, sepen at crux dot nu # Packager: Tadeusz Sosnierz, tadzikes gmail com -# Depends on: dbus-glib gperf gtk libevent libexif libgcrypt mesa3d ninja nodejs nss pciutils speech-dispatcher xorg-libxscrnsaver xorg-libxt xorg-libxtst yasm +# Depends on: dbus-glib gperf gtk gtk3 libevent libexif libgcrypt ninja nodejs nss pciutils speech-dispatcher xorg-libxscrnsaver xorg-libxt yasm name=chromium -version=61.0.3163.100 +version=62.0.3202.75 release=1 source=(https://commondatastorage.googleapis.com/$name-browser-official/$name-$version.tar.xz chromium-build-toolchain.patch last-commit-position.patch $name.sh $name.desktop breakpad-use-ucontext_t.patch - chromium-gcc-r1.patch - chromium-gn-bootstrap-r14.patch - chromium-atk-r1.patch - chromium-blink-gcc7.patch) + chromium-gn-bootstrap-r17.patch + crc32c-string-view-check.patch) build() { cd $name-$version @@ -40,16 +38,14 @@ build() { # we don't use git sources patch -p1 -i $SRC/last-commit-position.patch - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853347 - patch -p1 -i $SRC/chromium-blink-gcc7.patch + # Fix incorrect inclusion of in modes other than >= C++17 + patch -p1 -d third_party/crc32c/src -i $SRC/crc32c-string-view-check.patch # Fix build with glibc 2.26 patch -p1 -i $SRC/breakpad-use-ucontext_t.patch # Fixes from Gentoo - patch -p1 -i $SRC/chromium-gcc-r1.patch - patch -p1 -i $SRC/chromium-gn-bootstrap-r14.patch - patch -p1 -i $SRC/chromium-atk-r1.patch + patch -p1 -i $SRC/chromium-gn-bootstrap-r17.patch mkdir -p third_party/node/linux/node-linux-x64/bin ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ @@ -84,17 +80,13 @@ build() { 'use_system_libjpeg=true' ) - export TMPDIR="${PKGMK_WORK_DIR}/temp" - mkdir -p -m 755 "${TMPDIR}" || die +# export TMPDIR="${PKGMK_WORK_DIR}/temp" +# mkdir -p -m 755 "${TMPDIR}" || die python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args="${_gn_args[*]}" out/Release/gn gen out/Release --args="${_gn_args[*]}" --script-executable=/usr/bin/python2 - # Ninja, by default, sets the number of jobs to the number of availalble threads -# local JOBS=$(awk 'BEGIN{RS="-j|--jobs="} NR==2 {print $1}' <<< $MAKEFLAGS) -# test -n "$JOBS" && export JOBS="-j $JOBS" - JOBS="-j 2" - ninja $JOBS -C out/Release chrome chrome_sandbox + ninja -j ${JOBS-1} -C out/Release chrome chrome_sandbox install -m 0755 -D out/Release/chrome $PKG/usr/lib/$name/$name install -m 4755 -o root -g root -D out/Release/chrome_sandbox $PKG/usr/lib/$name/chrome-sandbox diff --git a/chromium/breakpad-use-ucontext_t.patch b/chromium/breakpad-use-ucontext_t.patch new file mode 100644 index 0000000..f323972 --- /dev/null +++ b/chromium/breakpad-use-ucontext_t.patch @@ -0,0 +1,225 @@ +From b6a312ed8e144a37da840ae50dbd39df5ffb7e9f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 2 Jul 2017 16:34:54 -0700 +Subject: [PATCH 2/2] replace struct ucontext with ucontext_t + +glibc 2.26 does not expose struct ucontext any longer + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + .../linux/dump_writer_common/ucontext_reader.cc | 30 +++++++++++----------- + .../linux/dump_writer_common/ucontext_reader.h | 10 ++++---- + .../src/client/linux/handler/exception_handler.cc | 8 +++--- + .../src/client/linux/handler/exception_handler.h | 2 +- + .../linux/microdump_writer/microdump_writer.cc | 2 +- + .../linux/minidump_writer/minidump_writer.cc | 2 +- + 6 files changed, 27 insertions(+), 27 deletions(-) + +diff --git a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +index c80724dd8..93b4d9f85 100644 +--- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc ++++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +@@ -40,15 +40,15 @@ namespace google_breakpad { + + #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(RawContextCPU *out, const ucontext *uc, + + #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(RawContextCPU *out, const ucontext *uc, + + #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(RawContextCPU *out, const ucontext *uc) { + + #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(RawContextCPU *out, const ucontext *uc, + + #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 --git a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +index b6e77b4b5..2369a9ad3 100644 +--- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h ++++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +@@ -41,21 +41,21 @@ namespace google_breakpad { + + // Wraps platform-dependent implementations of accessors to ucontext 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 + // 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 --git a/breakpad/src/client/linux/handler/exception_handler.cc b/breakpad/src/client/linux/handler/exception_handler.cc +index b63f973b8..f2688acaf 100644 +--- a/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/breakpad/src/client/linux/handler/exception_handler.cc +@@ -439,9 +439,9 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) { + // 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) { +@@ -452,7 +452,7 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) { + // FP state is not part of user ABI on ARM Linux. + // In case of MIPS Linux FP state is already part of struct ucontext + // 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::SimulateSignalDelivery(int sig) { + // 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 --git a/breakpad/src/client/linux/handler/exception_handler.h b/breakpad/src/client/linux/handler/exception_handler.h +index 591c31085..846df772f 100644 +--- a/breakpad/src/client/linux/handler/exception_handler.h ++++ b/breakpad/src/client/linux/handler/exception_handler.h +@@ -191,7 +191,7 @@ 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 +diff --git a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc +index 6f5b43559..a508667a0 100644 +--- a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc ++++ b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc +@@ -571,7 +571,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 --git a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc +index 86009b9f6..f2aec73d7 100644 +--- a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc ++++ b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc +@@ -1248,7 +1248,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 +-- +2.13.2 + diff --git a/chromium/chromium-atk-r1.patch b/chromium/chromium-atk-r1.patch deleted file mode 100644 index 32fa299..0000000 --- a/chromium/chromium-atk-r1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/chromium/chromium-blink-gcc7.patch b/chromium/chromium-blink-gcc7.patch deleted file mode 100644 index fb6118b..0000000 --- a/chromium/chromium-blink-gcc7.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- chromium-59.0.3071.86/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h.orig 2017-06-06 15:05:38.145247996 +0300 -+++ chromium-59.0.3071.86/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h 2017-06-06 15:06:13.866246667 +0300 -@@ -685,6 +685,31 @@ inline LinkedHashSet& Linked - return *this; - } - -+inline void SwapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) { -+ DCHECK(a.prev_); -+ DCHECK(a.next_); -+ DCHECK(b.prev_); -+ DCHECK(b.next_); -+ swap(a.prev_, b.prev_); -+ swap(a.next_, b.next_); -+ if (b.next_ == &a) { -+ DCHECK_EQ(b.prev_, &a); -+ b.next_ = &b; -+ b.prev_ = &b; -+ } else { -+ b.next_->prev_ = &b; -+ b.prev_->next_ = &b; -+ } -+ if (a.next_ == &b) { -+ DCHECK_EQ(a.prev_, &b); -+ a.next_ = &a; -+ a.prev_ = &a; -+ } else { -+ a.next_->prev_ = &a; -+ a.prev_->next_ = &a; -+ } -+} -+ - template - inline void LinkedHashSet::Swap(LinkedHashSet& other) { - impl_.Swap(other.impl_); -@@ -877,31 +902,6 @@ inline void LinkedHashSet::e - erase(Find(value)); - } - --inline void SwapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) { -- DCHECK(a.prev_); -- DCHECK(a.next_); -- DCHECK(b.prev_); -- DCHECK(b.next_); -- swap(a.prev_, b.prev_); -- swap(a.next_, b.next_); -- if (b.next_ == &a) { -- DCHECK_EQ(b.prev_, &a); -- b.next_ = &b; -- b.prev_ = &b; -- } else { -- b.next_->prev_ = &b; -- b.prev_->next_ = &b; -- } -- if (a.next_ == &b) { -- DCHECK_EQ(a.prev_, &b); -- a.next_ = &a; -- a.prev_ = &a; -- } else { -- a.next_->prev_ = &a; -- a.prev_->next_ = &a; -- } --} -- - inline void swap(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) { - DCHECK_NE(a.next_, &a); - DCHECK_NE(b.next_, &b); ---- chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.orig 2017-06-06 16:16:43.657661313 +0300 -+++ chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h 2017-06-06 16:16:50.911198032 +0300 -@@ -5,6 +5,7 @@ - #include "platform/PlatformExport.h" - #include "platform/wtf/ThreadSpecific.h" - -+#include - #include - - namespace gpu { diff --git a/chromium/chromium-gcc-r1.patch b/chromium/chromium-gcc-r1.patch deleted file mode 100644 index 2acd11e..0000000 --- a/chromium/chromium-gcc-r1.patch +++ /dev/null @@ -1,14 +0,0 @@ -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/chromium/chromium-gn-bootstrap-r14.patch b/chromium/chromium-gn-bootstrap-r14.patch deleted file mode 100644 index 3c44c85..0000000 --- a/chromium/chromium-gn-bootstrap-r14.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 96c271f8ab2be7ea4199078ea65ac50c6ada4685 -Author: Pawel Hajdan, Jr -Date: Wed Jul 26 21:51:54 2017 +0000 - - wip - -diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py -index 1390560f8e37..ff2ae57c46b0 100755 ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -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', -- 2.26.2