chromium: 62.0.3202.94 -> 63.0.3239.84
This commit is contained in:
Danny Rawlins
parent
0a3ea25c51
commit
0a8c1b3ce2
|
|
@ -97,6 +97,8 @@ 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/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/audits2/audits2_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/audits2_test_runner/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/audits2_test_runner/audits2_test_runner_module.js
|
||||
-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
|
||||
|
|
@ -232,6 +234,8 @@ 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_test_runner/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/sdk_test_runner/sdk_test_runner_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/
|
||||
|
|
@ -256,8 +260,6 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/timeline_model/
|
|||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/timeline_model/timeline_model_module.js
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/toolbox.html
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/toolbox.js
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/unit_test_runner.html
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/unit_test_runner.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/workspace_diff/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/workspace_diff/workspace_diff_module.js
|
||||
-rw-r--r-- root/root usr/lib/chromium/snapshot_blob.bin
|
||||
|
|
@ -282,8 +284,9 @@ drwxr-xr-x root/root usr/share/icons/hicolor/256x256/apps/
|
|||
drwxr-xr-x root/root usr/share/icons/hicolor/48x48/
|
||||
drwxr-xr-x root/root usr/share/icons/hicolor/48x48/apps/
|
||||
-rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/chromium.png
|
||||
drwxr-xr-x root/root usr/share/icons/hicolor/64x64/
|
||||
drwxr-xr-x root/root usr/share/icons/hicolor/64x64/apps/
|
||||
-rw-r--r-- root/root usr/share/icons/hicolor/64x64/apps/chromium.png
|
||||
drwxr-xr-x root/root usr/share/man/
|
||||
drwxr-xr-x root/root usr/share/man/man1/
|
||||
-rw-r--r-- root/root usr/share/man/man1/chromium.1.gz
|
||||
drwxr-xr-x root/root usr/share/pixmaps/
|
||||
lrwxrwxrwx root/root usr/share/pixmaps/chromium.png -> /usr/share/icons/hicolor/48x48/apps/chromium.png
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
4dbc4cd98731f133a3f6e0f47625ad08 breakpad-use-ucontext_t.patch
|
||||
98cf7b6eca255e2422f96094eccc1887 chromium-62.0.3202.94.tar.xz
|
||||
1e9f37377b470e26dc0fa609c1cdad9e chromium-gn-bootstrap-r17.patch
|
||||
b527005e021b14869a669e42c46b661d chromium.desktop
|
||||
85285d9ed3e6205c60774475dc5149b7 chromium-63.0.3239.84.tar.xz
|
||||
e2edf460318c9227ec4726440d8731ca chromium-clang-r1.patch
|
||||
5f413e9d719b2f0f7ab12e951eb3a7f9 chromium-exclude_unwind_tables.patch
|
||||
60b6e9c55e584db6872c1349a6630572 chromium-webrtc-r0.patch
|
||||
64968626706b07721983ac59fb3babbf chromium.sh
|
||||
d1359f1c4cc42c9f74a862361d736ef1 crc32c-string-view-check.patch
|
||||
3354997dd0bfde3443499133a6e16a85 last-commit-position.patch
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/UqOs8cuhLT/03McuxF4XRTKRqLjEQDj+s5EF+LNf2GF1wY3QjHXuIu8TXYyLsEcltsqojAxxMB+J7vNveW7kAA=
|
||||
SHA256 (Pkgfile) = 645723d8f78bea8168d624bd791b269767b8b6c7970bcf6f1fe2cd0a592f59b8
|
||||
SHA256 (.footprint) = b706fe319357b624c6652ab38bdaaa96a6e0070e2be5802f4c38a5bceafa8374
|
||||
SHA256 (chromium-62.0.3202.94.tar.xz) = cabc4d267bf08aabe11c5739048c43dde18c61acf595223a1c3aa1d3499558d4
|
||||
RWSE3ohX2g5d/RjUS6/LriMrtOYA1wQyaKhGXFucdUDbB2AUXkJnVLdk1vMSAPZbWE59RzHta9q4Ab9Wk4ifV9CfGvo6U7ZlcA0=
|
||||
SHA256 (Pkgfile) = a94e127b30357279b226866ae0aa17b08f22e7c94d3264bfda187cc02edef944
|
||||
SHA256 (.footprint) = 2b57eade7d1a318c8a6993c87aa7f9359fdc36fbf74906498b712e73c5bf1ce2
|
||||
SHA256 (chromium-63.0.3239.84.tar.xz) = 6de2754dfc333675ae6a67ae13c95666009b35c84f847b058edbf312e42fa3af
|
||||
SHA256 (last-commit-position.patch) = d3dc397956a26ec045e76c25c57a1fac5fc0acff94306b2a670daee7ba15709e
|
||||
SHA256 (chromium.sh) = 7b182d0ae1e9ef841f8cd0b403a304babd548bf60b5e3808b2144bebdbb7c154
|
||||
SHA256 (chromium.desktop) = caf015652ac7ce9403a5cb6c7bec3dc597222b20c5842059ee15674e2c9209cc
|
||||
SHA256 (breakpad-use-ucontext_t.patch) = 6e9a345f810d36068ee74ebba4708c70ab30421dad3571b6be5e9db635078ea8
|
||||
SHA256 (chromium-gn-bootstrap-r17.patch) = d81319f168dad0e411c8e810f73daa2f56ff579578771bd9c9bb1aa2d7c09a8b
|
||||
SHA256 (crc32c-string-view-check.patch) = 35435e8dae76737baafecdc76d74a1c97281c4179e416556e033a06a31468e6d
|
||||
SHA256 (chromium-exclude_unwind_tables.patch) = e53dc6f259acd39df13874f8a0f440528fae764b859dd71447991a5b1fac7c9c
|
||||
SHA256 (chromium-clang-r1.patch) = ab5368a3e3a67fa63b33fefc6788ad5b4a79089ef4db1011a14c3bee9fdf70c6
|
||||
SHA256 (chromium-webrtc-r0.patch) = bcb2f4588cf5dcf75cde855c7431e94fdcc34bdd68b876a90f65ab9938594562
|
||||
|
|
|
|||
|
|
@ -4,35 +4,53 @@
|
|||
# Depends on: dbus-glib gperf gtk gtk3 libevent libexif libgcrypt ninja nodejs nss pciutils speech-dispatcher xorg-libxscrnsaver xorg-libxt yasm
|
||||
|
||||
name=chromium
|
||||
version=62.0.3202.94
|
||||
version=63.0.3239.84
|
||||
release=1
|
||||
source=(https://commondatastorage.googleapis.com/$name-browser-official/$name-$version.tar.xz
|
||||
last-commit-position.patch $name.sh $name.desktop
|
||||
breakpad-use-ucontext_t.patch
|
||||
chromium-gn-bootstrap-r17.patch
|
||||
crc32c-string-view-check.patch)
|
||||
last-commit-position.patch $name.sh
|
||||
chromium-exclude_unwind_tables.patch
|
||||
chromium-clang-r1.patch
|
||||
chromium-webrtc-r0.patch)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
||||
if [ -n "$(pkginfo -i | grep '^ccache ')" ]; then
|
||||
# Avoid falling back to preprocessor mode when sources contain time macros
|
||||
export CCACHE_SLOPPINESS=time_macros
|
||||
fi
|
||||
|
||||
export CFLAGS="$CFLAGS $(pkg-config --cflags nspr)"
|
||||
export LDFLAGS="$LDFLAGS $(pkg-config --libs nspr)"
|
||||
|
||||
# we don't use git sources
|
||||
patch -p1 -i $SRC/last-commit-position.patch
|
||||
|
||||
# Fix incorrect inclusion of <string_view> 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
|
||||
# https://chromium-review.googlesource.com/c/chromium/src/+/71257
|
||||
patch -p1 -i $SRC/chromium-exclude_unwind_tables.patch
|
||||
|
||||
# Fixes from Gentoo
|
||||
patch -p1 -i $SRC/chromium-gn-bootstrap-r17.patch
|
||||
patch -p1 -i $SRC/chromium-clang-r1.patch
|
||||
patch -p1 -i $SRC/chromium-webrtc-r0.patch
|
||||
|
||||
mkdir -p third_party/node/linux/node-linux-x64/bin
|
||||
ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
|
||||
|
||||
# for LIB in ffmpeg flac harfbuzz-ng libjpeg \
|
||||
# libjpeg_turbo libpng libwebp libxslt yasm; do
|
||||
# find -type f -path "*third_party/$LIB/*" \
|
||||
# \! -path "*third_party/$LIB/chromium/*" \
|
||||
# \! -path "*third_party/$LIB/google/*" \
|
||||
# \! -path "*base/third_party/icu/*" \
|
||||
# \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
|
||||
# -delete
|
||||
# done
|
||||
|
||||
# /usr/bin/python2 build/linux/unbundle/replace_gn_files.py \
|
||||
# --system-libraries ffmpeg flac harfbuzz-ng libjpeg libxml libevent \
|
||||
# libpng libwebp libxslt opus yasm freetype
|
||||
# /usr/bin/python2 third_party/libaddressinput/chromium/tools/update-strings.py
|
||||
|
||||
_gn_args=(
|
||||
'blink_gc_plugin=false'
|
||||
'clang_use_chrome_plugins=false'
|
||||
|
|
@ -54,13 +72,13 @@ build() {
|
|||
'use_gconf=false'
|
||||
'use_gnome_keyring=false'
|
||||
'use_gold=false'
|
||||
'use_gtk3=true'
|
||||
'use_kerberos=false'
|
||||
'use_pulseaudio=false'
|
||||
'use_sysroot=false'
|
||||
'use_system_libjpeg=true'
|
||||
)
|
||||
|
||||
python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args="${_gn_args[*]}"
|
||||
/usr/bin/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 -j ${JOBS-1} -C out/Release chrome chrome_sandbox
|
||||
|
|
@ -71,21 +89,32 @@ build() {
|
|||
install -d $PKG/usr/lib/$name/locales
|
||||
install -m 0644 out/Release/locales/en-US.pak $PKG/usr/lib/$name/locales
|
||||
cp -a out/Release/resources $PKG/usr/lib/$name
|
||||
install -m 0644 -D out/Release/chrome.1 $PKG/usr/share/man/man1/$name.1
|
||||
|
||||
install -m 0644 -D chrome/installer/linux/common/desktop.template $PKG/usr/share/applications/$name.desktop
|
||||
install -m 0644 -D chrome/app/resources/manpage.1.in $PKG/usr/share/man/man1/$name.1
|
||||
|
||||
sed -i \
|
||||
-e "s/@@MENUNAME@@/Chromium/g" \
|
||||
-e "s/@@PACKAGE@@/chromium/g" \
|
||||
-e "s/@@USR_BIN_SYMLINK_NAME@@/chromium/g" \
|
||||
$PKG/usr/share/applications/$name.desktop \
|
||||
$PKG/usr/share/man/man1/$name.1
|
||||
|
||||
# fix v8 natives
|
||||
cp -a out/Release/{natives,snapshot}_blob.bin $PKG/usr/lib/$name
|
||||
|
||||
for size in 22 24 48 128 256; do
|
||||
for size in 16 32; do
|
||||
install -m 0644 -D chrome/app/theme/default_100_percent/$name/product_logo_${size}.png \
|
||||
/usr/share/icons/hicolor/${size}x${size}/apps/$name.png
|
||||
done
|
||||
|
||||
for size in 22 24 48 64 128 256; do
|
||||
install -m 0644 -D chrome/app/theme/$name/product_logo_${size}.png \
|
||||
$PKG/usr/share/icons/hicolor/${size}x${size}/apps/$name.png
|
||||
done
|
||||
|
||||
# fix icu installation
|
||||
cp -a out/Release/icudtl.dat $PKG/usr/lib/$name
|
||||
install -m 0644 -D out/Release/icudtl.dat $PKG/usr/lib/$name/icudtl.dat
|
||||
|
||||
install -d $PKG/usr/share/pixmaps
|
||||
ln -sf /usr/share/icons/hicolor/48x48/apps/$name.png $PKG/usr/share/pixmaps/$name.png
|
||||
install -m 0644 -D $SRC/$name.desktop $PKG/usr/share/applications/$name.desktop
|
||||
install -m 0755 -D $SRC/$name.sh $PKG/usr/bin/$name
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,225 +0,0 @@
|
|||
From b6a312ed8e144a37da840ae50dbd39df5ffb7e9f Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
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 <raj.khem@gmail.com>
|
||||
---
|
||||
.../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
|
||||
|
||||
21
chromium/chromium-clang-r1.patch
Normal file
21
chromium/chromium-clang-r1.patch
Normal file
|
|
@ -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.
|
||||
44
chromium/chromium-exclude_unwind_tables.patch
Normal file
44
chromium/chromium-exclude_unwind_tables.patch
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
From 1fc37227522ccd314f82ec893ed15c6129296604 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Jensen <pauljensen@chromium.org>
|
||||
Date: Wed, 11 Oct 2017 08:37:34 -0400
|
||||
Subject: [PATCH] Move exclude_unwind_tables back into declare_args
|
||||
|
||||
There is desire to adjust this flag manually.
|
||||
|
||||
BUG=762629
|
||||
R=thakis@chromium.org
|
||||
|
||||
Change-Id: I3bd134c19270cd1f729b3ea078674e734493d4ab
|
||||
---
|
||||
|
||||
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
|
||||
index ad40fd9..50e19a4 100644
|
||||
--- a/build/config/compiler/compiler.gni
|
||||
+++ b/build/config/compiler/compiler.gni
|
||||
@@ -68,18 +68,18 @@
|
||||
|
||||
# Whether or not we should use position independent code.
|
||||
use_pic = true
|
||||
+
|
||||
+ # Exclude unwind tables for official builds as unwinding can be done from
|
||||
+ # stack dumps produced by Crashpad at a later time "offline" in the crash
|
||||
+ # server. For unofficial (e.g. development) builds and non-Chrome branded
|
||||
+ # (e.g. Cronet which doesn't use Crashpad, crbug.com/479283) builds it's
|
||||
+ # useful to be able to unwind at runtime.
|
||||
+ exclude_unwind_tables = (is_chrome_branded && is_official_build) ||
|
||||
+ (is_chromecast && !is_cast_desktop_build && !is_debug)
|
||||
}
|
||||
|
||||
assert(!is_cfi || use_thin_lto, "CFI requires ThinLTO")
|
||||
|
||||
-# Exclude unwind tables for official builds as unwinding can be done from stack
|
||||
-# dumps produced by Crashpad at a later time "offline" in the crash server.
|
||||
-# For unofficial (e.g. development) builds and non-Chrome branded (e.g. Cronet
|
||||
-# which doesn't use Crashpad, crbug.com/479283) builds it's useful to be able
|
||||
-# to unwind at runtime.
|
||||
-exclude_unwind_tables = (is_chrome_branded && is_official_build) ||
|
||||
- (is_chromecast && !is_cast_desktop_build && !is_debug)
|
||||
-
|
||||
# If true, optimize for size. Does not affect windows builds.
|
||||
# Linux & Mac favor speed over size.
|
||||
# TODO(brettw) it's weird that Mac and desktop Linux are different. We should
|
||||
|
|
@ -1,68 +0,0 @@
|
|||
--- 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')
|
||||
34
chromium/chromium-webrtc-r0.patch
Normal file
34
chromium/chromium-webrtc-r0.patch
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
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
|
||||
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
[Desktop Entry]
|
||||
Name=Chromium
|
||||
Comment=Browser
|
||||
Exec=chromium
|
||||
Icon=chromium.png
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Application;Network;
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
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
|
||||
---
|
||||
include/crc32c/crc32c.h | 10 +++-------
|
||||
src/crc32c_unittest.cc | 6 ++----
|
||||
2 files changed, 5 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/include/crc32c/crc32c.h b/include/crc32c/crc32c.h
|
||||
index 9f1973a..8ecab0d 100644
|
||||
--- a/include/crc32c/crc32c.h
|
||||
+++ b/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/src/crc32c_unittest.cc b/src/crc32c_unittest.cc
|
||||
index 7a9c765..69babb3 100644
|
||||
--- a/src/crc32c_unittest.cc
|
||||
+++ b/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"
|
||||
Loading…
Reference in New Issue
Block a user