aboutsummaryrefslogtreecommitdiffstats
path: root/community/chromium
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-12-19 15:46:24 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2018-12-19 21:01:04 +0100
commite2485db796656beda0c45fc60aed2bb66d36070f (patch)
treeff82059197063498fe3e355b683776ff8a67b76f /community/chromium
parentc40c42dae6e2da6c0bb0ce52f23dad837b330229 (diff)
downloadaports-e2485db796656beda0c45fc60aed2bb66d36070f.tar.bz2
aports-e2485db796656beda0c45fc60aed2bb66d36070f.tar.xz
community/chromium: upgrade to 71.0.3578.98
Diffstat (limited to 'community/chromium')
-rw-r--r--community/chromium/APKBUILD73
-rw-r--r--community/chromium/chromium-71-gcc-0.patch57
-rw-r--r--community/chromium/chromium-clang-r2.patch23
-rw-r--r--community/chromium/chromium-cors-string-r0.patch51
-rw-r--r--community/chromium/chromium-fix_harfbuzz_2.patch80
-rw-r--r--community/chromium/chromium-gcc.patch64
-rw-r--r--community/chromium/chromium-libjpeg-r0.patch62
-rw-r--r--community/chromium/chromium-libwebp-shim-r0.patch43
-rw-r--r--community/chromium/chromium-remove-unknown-clang-warnings.patch20
-rw-r--r--community/chromium/default-pthread-stacksize.patch10
-rw-r--r--community/chromium/gcc8-alignof.patch17
-rw-r--r--community/chromium/gn-bootstrap-remove-sysroot-related-options.patch25
-rw-r--r--community/chromium/gn_bootstrap.patch94
-rw-r--r--community/chromium/last-commit-position.patch26
-rw-r--r--community/chromium/musl-hacks.patch12
-rw-r--r--community/chromium/no-execinfo.patch75
-rw-r--r--community/chromium/secure_getenv.patch8
17 files changed, 255 insertions, 485 deletions
diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD
index 25414f8c67..da5ad03357 100644
--- a/community/chromium/APKBUILD
+++ b/community/chromium/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname=chromium
-pkgver=68.0.3440.106
+pkgver=71.0.3578.98
pkgrel=0
pkgdesc="chromium web browser"
url="http://www.chromium.org/"
@@ -46,6 +46,7 @@ makedepends="$depends_dev
libjpeg-turbo-dev
libpng-dev
libusb-dev
+ libva-dev
libwebp-dev
libxcomposite-dev
libxcursor-dev
@@ -88,8 +89,7 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/$pkgn
google-api.keys
default-pthread-stacksize.patch
- gn_bootstrap.patch
- last-commit-position.patch
+ gn-bootstrap-remove-sysroot-related-options.patch
musl-fixes.patch
musl-fixes-breakpad.patch
musl-hacks.patch
@@ -100,18 +100,15 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/$pkgn
resolver.patch
swiftshader.patch
secure_getenv.patch
- chromium-clang-r2.patch
chromium-use-alpine-target.patch
- chromium-remove-unknown-clang-warnings.patch
chromium-gcc-r1.patch
chromium-skia-harmony.patch
- chromium-cors-string-r0.patch
- chromium-libjpeg-r0.patch
- chromium-libwebp-shim-r0.patch
media-base.patch
musl-crashpad.patch
- chromium-gcc.patch
+ chromium-71-gcc-0.patch
+ gcc8-alignof.patch
+ chromium-fix_harfbuzz_2.patch
"
builddir="$srcdir"/$pkgname-$pkgver
@@ -146,9 +143,9 @@ prepare() {
# reusable system library settings
local use_system="
+ ffmpeg
flac
fontconfig
- freetype
harfbuzz-ng
libdrm
libevent
@@ -173,21 +170,6 @@ prepare() {
\! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
-delete
done
-# freetype
-# harfbuzz-ng
-
- # pdfium uses internal headers in freetype
- # we copy from freetype sources
- # https://bugs.chromium.org/p/pdfium/issues/detail?id=733
- # should be fixed in freetype:
- # https://savannah.nongnu.org/bugs/index.php?51156
-# mkdir -p "third_party/freetype/src/src/psnames/"
-# cp "$srcdir"/pstables-2.8.h third_party/freetype/src/src/psnames/pstables.h
-
- # Work around bug in v8 in which GCC 6 optimizes away null pointer checks
- # https://bugs.chromium.org/p/v8/issues/detail?id=3782
- # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69234
-# CFLAGS="$CFLAGS -fno-delete-null-pointer-checks"
msg "Replacing gyp files"
python build/linux/unbundle/replace_gn_files.py --system-libraries \
@@ -209,8 +191,8 @@ build() {
##############################################################
eval "$(base64 -d < $srcdir/google-api.keys)"
- export CC=clang
- export CXX=clang++
+# export CC=clang
+# export CXX=clang++
local _ca=""
#case "$CARCH" in
@@ -222,18 +204,18 @@ build() {
#esac
msg "Bootstrapping GN"
- local _c=$(_gn_flags is_clang=true \
+ local _c=$(_gn_flags is_clang=false \
use_sysroot=false \
treat_warnings_as_errors=false \
fatal_linker_warnings=false \
binutils_path=\"/usr/bin\" \
- use_gold=false \
+ use_gold=true \
use_allocator=\"none\" \
use_allocator_shim=false \
)
- AR="ar" CC="$CC" CXX="$CXX" LD="$CXX" \
- python tools/gn/bootstrap/bootstrap.py -s -v --no-clean --gn-gen-args "$_c $_ca"
+ AR="ar" CC="${CC:-gcc}" CXX="${CXX:-g++}" LD="${CXX:-g++}" \
+ python tools/gn/bootstrap/bootstrap.py -s -v --gn-gen-args "$_c $_ca"
msg "Configuring build"
_c=$(_gn_flags \
@@ -253,7 +235,7 @@ build() {
google_default_client_secret=\"$_google_default_client_secret\" \
host_toolchain=\"//build/toolchain/linux/unbundle:default\" \
icu_use_data_file=true \
- is_clang=true \
+ is_clang=false \
is_debug=$_is_debug \
linux_use_bundled_binutils=false \
proprietary_codecs=true \
@@ -265,14 +247,15 @@ build() {
use_cups=true \
use_custom_libcxx=false \
use_gnome_keyring=false \
- use_gold=false \
+ use_gold=true \
use_lld=false \
use_pulseaudio=false \
use_sysroot=false \
use_system_harfbuzz=true \
+ use_vaapi=true \
)
- AR="ar" CC="$CC" CXX="$CXX" LD="$CXX" NM=/usr/bin/nm \
+ AR="ar" CC="${CC:-gcc}" CXX="${CXX:-g++}" LD="${CXX:-g++}" NM=/usr/bin/nm \
out/Release/gn gen out/$_buildtype --args="$_c $_ca"
msg "Ninja turtles GO!"
@@ -346,33 +329,29 @@ chromedriver() {
mv "$pkgdir"/usr/bin/chromedriver "$subpkgdir"/usr/bin
}
-sha512sums="ab94f89e614919932d4d960bac8e5450c4d3f26dea4892e6591762bfaeeb4707a090352d4a952bcb55e34fde4950db22a36004788efd26ffb22b28770e9795c4 chromium-68.0.3440.106.tar.xz
+sha512sums="dbeb90e16c6c05422c1f43e8fe747d60dab49c1fffdd0f33824ca24429f3871bda649eb1e6402470d3d9bb701e47d55d2fff4f46530e3f43e72f516d1837aad6 chromium-71.0.3578.98.tar.xz
a3bb959c65944ae2fb765725cedcffd743a58bc0c2cd1f1999d15fe79801d00f3474b08b4ed7b48859ed921eb57093d0ad09d90f201d729ed9b8a419a591ed29 pstables-2.8.h
b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60 chromium-launcher.sh
f6d962b9e4c22dd42183df3db5d3202dab33eccecafb1bf63ca678147289581262db1e5e64cbe8f9c212beefb0a6717bb8d311e497f56b55fe95b8bab2db493f chromium.conf
e182c998a43d22d1c76a86c561619afd1fca8c2be668265ad5e2f81a3806f7a154272cc027a2f8b370fb69446892c69e5967a4be76082325c14245ee7915234c chromium.desktop
2d8237a940ea691bd10b08315429677a587f7ef9692a0cca53bfd066eae82998a6c71f402a8669e9de39f94d7f3280745d1628ea6eac5d76ca7116844d4e0dac google-api.keys
-05fb6d9434565a7a73f5c18d470ae600bf4afbe15d0e4a7c2770bf2596a0bd2788cdfeb37e0b566fc3d26ff2d0791b70488b2c184e3286cff5a1fa25e17582cd default-pthread-stacksize.patch
-46e141a932860c6db1f655c8b188b8c41bce0dbb1654c066379fa53063ce6cc3bf8be156bd8e73e103c7d9e956e436732e2f7db0653f9847eb26cbfebc441a10 gn_bootstrap.patch
-8fbfd67a0b6bbdf08364e810bd85b4a80dda9af73fefe3aba8010d9b33022d458a785c628515bbda9c743b8a0293d57cfe18fcc5aa2313c845c6fb948c2335f9 last-commit-position.patch
+230d1819b9d644ebaa6e194e948d662add8d237a99cc3d6b0f8a2fc2b331b43a3cd0766746f1c76c1a114f1730b40504c532d0c40aafa8cbc45022663cbcc245 default-pthread-stacksize.patch
+1c7398a68ee01b9d61c1bb1a3e6dfcc88662da42b9012844040bd86e858228dc480c7f21d2c52829e9959e4a3f6e39b8c5cb22f8f7c8394322c8347d828b6625 gn-bootstrap-remove-sysroot-related-options.patch
9cd1defffb55cd1290e82b233a623e962775e19f001b26ae8f74330f3467499fd16067d607ca8e2b0b9b8d8988cd7ea2af93df65d7cc3d9299b8bc2b472c712e musl-fixes.patch
90efbc89151c77f32434364dcbaabaf9d9a207f4a77f147cd51b3fe100832fbfb3a9fb665303a79a3d788e400f4f41890de202ccbb7bd1fc6252e33c6e74e429 musl-fixes-breakpad.patch
-507a8db2317f1f6ec18dec6cb5894b716e9b2542b58887bab9319bc6d4c66fe4a4d09b200ca8e3f11b32e380b282442a27e7a1b358d3c25eef0fa7655e9dc134 musl-hacks.patch
+0aa3176f1021332088740d6e4fe2eadbe375240df0690c8449426a42a674fdf58e8a1fda85ca527dc1b4451e964d54564283fd81e3b7df059f5bcfccb8e07e84 musl-hacks.patch
95ead57f7338649351948d100e32e5ec1eeadb02bffa136ff15c6c515eceb8013c444be092d777c1b62b945bfb83b97778ba4d3a0ccc2d7c2c9a0a8cd8ee0f01 musl-libc++.patch
9b75d6ac720d1b8ddc597f0f472bc400ff866a733f12b3a4cd3e7e18e724549c5f8e056c7e0d0462ef083bff5e677f8cef6b89b22f4740a40ad6398978269373 musl-sandbox.patch
-0c413940a26c3823213724036d217f43a7de9bca4ae026c5f56d4280800cc7dd4a5cf6efea98dbb102513eda6c29ceae20debb9b938b0fb61628822ecdec0799 no-execinfo.patch
+6403abf957e3497c19578c19567582d65846d532e071211421166944614219dad21e31a3589b484836919d7c1e5904d4dd8c6faf40dc514c043fe14a2ff718ef no-execinfo.patch
db7f676d3476820c29f234b1f8f17a74e82b72d67fc727c715307734fd238e3cb0f99d8b5320d45f820b62c01163283c4829caa37afd6a9ca7592a54d3c65819 no-mallinfo.patch
6833054ef89da20c0de63faac2f87ff250b5aca3ac785fc404da4a9e03c4e00df9d7da009788e611d113cdf3be2ba50f933d85d6baf20f2df6a3711cceff5152 resolver.patch
6b0812725a0fc562527f3556dc4979fec72d1ba92f26a5e78ff2016c39bb2c155a0ff95fc22101f9c097d14b84182d6615276f4247f60ae7833ab45da8366e6d swiftshader.patch
-de2d6ebc75d0496a9424ea6c025b052d6d59f38477338b0e2a5c21ccec11e774244fd5d340195c523f7a3c02ccfd8ac81486958008bc8b221c848dfa2c71bd50 secure_getenv.patch
-38670c9bdc87b3779593eab141ac23741fa47c774ba491f273239a453566979583e352b032caf350ed485bbc006addca0f689b8c439646c2d37e28e3f3ea476c chromium-clang-r2.patch
+1b8647ab4081ec27f142eb564841b603dbf4c41118502e43b061d06f8866ebd1418d676457ed9ee0dc0a759e0369a29219bea98e74f687ddcba5d4513ca460ba secure_getenv.patch
246c43a0ab557671119ebc4ecb292925ebfee25312fb50e739a179dc085d23b9623bec2d7baecdd37ebd9318f8770664f20c12de6383def74cd89b7845d149ce chromium-use-alpine-target.patch
-838892a2873145f96659aade410c0b48a03b6e95bdfc3ed5bb88868792caca327ae6843020a4ca209693445831a4a0ad1b0e4f195851b60812a129aa7ff2bf7c chromium-remove-unknown-clang-warnings.patch
6e2bcbed44786c6c0d3beda935269f30fdcdf07c400defa6bf73f8359a60b1d59cc2f80dbc106be651a535635995641321d9e524b18919d3975bd6008a641d59 chromium-gcc-r1.patch
cbd99d51178fa5c2c3dee1eb4990240ca2ff829cee9151384e36bc3c634698c0ecaf9b51c99e901f38d0a37eef7187fe5ad39b9b7f528f7a9066a855a0c6e49f chromium-skia-harmony.patch
-e2df9816ce01a8175ae45682f48805dd3ab55154a0e9e7b1b5edabd8584f4326bfa25ad7f94dc174c968e72183fff1416e50e2d75671b17b52f2337c16d6c605 chromium-cors-string-r0.patch
-30e641d99c804740e18e2c1541907a209a8b54aedb01089473d1f5df721bf55f105400fa7aa2a75bc489f59e740657e79408555395d3cd77d13d15c1569b505d chromium-libjpeg-r0.patch
-0f8345102f33f16abea3731d76767cb04b06d8422fa8e4c9f7bcc2c18dc8ede5332559c5dd0db25be740939abfd8045adc8de38ec5973367ffe0624e8d9f8b5f chromium-libwebp-shim-r0.patch
589a7acf149d44db081da2dd24a7769f2b9572a8cc64d2aad78577a64768d3b6fb2bfa02292b5260acd2c4a28c3ae9b82847ff901ce8a21baeca0b46dcda0ca9 media-base.patch
05c1af43038f76014f5f8b605085310414242f2bfad0e3258ddb29a08e7f4307de31b2d551b0a291986cc7d5a01cf3a003ac864216877195bb4310fd33193f0f musl-crashpad.patch
-662eff1417530eed19142c154c40c0a3ffa56e5e2cf30d07683cbbd7cb34860e394e57de31e3552653515ffd654efb762621e2712304fbb8edb0ecdd932d8154 chromium-gcc.patch"
+74fcae35afd964e2dc09508325465ee0d2efd13b94941eaf6464da1f4b32a34b326cf2c290fffcfc930acefda51a64dfbc980527900849efb5a94922cc17bc20 chromium-71-gcc-0.patch
+9bfc532fd1e84e30362ac41fcd68253e17ee4cb5e986ceb5bb122e3235e4617e295ce9dddfdfbbd0b9d3e67267096152da2a19e3bb4bb9111c7fdb22fa398872 gcc8-alignof.patch
+4e6bfecdece829306b8c2ea2a4b6d9b0598f97e5b164e0f468e765ffa10cac6b9e57c8814b79eb1244a314d81e8954654111a2e1e056b2c450b369994337cb40 chromium-fix_harfbuzz_2.patch"
diff --git a/community/chromium/chromium-71-gcc-0.patch b/community/chromium/chromium-71-gcc-0.patch
new file mode 100644
index 0000000000..8ffadff20b
--- /dev/null
+++ b/community/chromium/chromium-71-gcc-0.patch
@@ -0,0 +1,57 @@
+From 65be571f6ac2f7942b4df9e50b24da517f829eec Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Date: Mon, 15 Oct 2018 20:26:10 +0000
+Subject: [PATCH] google_util: Explicitly use std::initializer_list with
+ base::NoDestructor
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Follow-up to ac53c5c53 ("Remove CR_DEFINE_STATIC_LOCAL from /components").
+Due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84849, having
+base::NoDestructor<T<U>> and passing an initializer list of Us does not
+work if this is not done explicitly, as GCC incorrectly fails to determine
+which constructor overload to use:
+
+ ../../components/google/core/common/google_util.cc: In function ‘bool google_util::{anonymous}::IsCanonicalHostGoogleHostname(base::StringPiece, google_util::SubdomainPermission)’:
+ ../../components/google/core/common/google_util.cc:120:24: error: call of overloaded ‘NoDestructor(<brace-enclosed initializer list>)’ is ambiguous
+ {GOOGLE_TLD_LIST});
+
+See also: https://chromium-review.googlesource.com/c/chromium/src/+/1170905
+
+Bug: 819294
+Change-Id: Ie1490b6646d7998d636c485769caabf56c1cf44c
+Reviewed-on: https://chromium-review.googlesource.com/c/1275854
+Reviewed-by: Peter Kasting <pkasting@chromium.org>
+Commit-Queue: Raphael Kubo da Costa (CET) <raphael.kubo.da.costa@intel.com>
+Cr-Commit-Position: refs/heads/master@{#599733}
+---
+ components/google/core/common/google_util.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/components/google/core/common/google_util.cc b/components/google/core/common/google_util.cc
+index a44c84393820..7733848a0443 100644
+--- components/google/core/common/google_util.cc
++++ components/google/core/common/google_util.cc
+@@ -117,7 +117,7 @@ bool IsCanonicalHostGoogleHostname(base::StringPiece canonical_host,
+ StripTrailingDot(&tld);
+
+ static base::NoDestructor<std::set<std::string>> google_tlds(
+- {GOOGLE_TLD_LIST});
++ std::initializer_list<std::string>({GOOGLE_TLD_LIST}));
+ return base::ContainsKey(*google_tlds, tld.as_string());
+ }
+
+@@ -132,7 +132,8 @@ bool IsGoogleSearchSubdomainUrl(const GURL& url) {
+ StripTrailingDot(&host);
+
+ static base::NoDestructor<std::set<std::string>> google_subdomains(
+- {"ipv4.google.com", "ipv6.google.com"});
++ std::initializer_list<std::string>(
++ {"ipv4.google.com", "ipv6.google.com"}));
+
+ return base::ContainsKey(*google_subdomains, host.as_string());
+ }
+--
+2.19.1
+
diff --git a/community/chromium/chromium-clang-r2.patch b/community/chromium/chromium-clang-r2.patch
deleted file mode 100644
index 1c2955796f..0000000000
--- a/community/chromium/chromium-clang-r2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 83337d5..8cb93e3 100644
---- ./build/config/compiler/BUILD.gn
-+++ ./build/config/compiler/BUILD.gn
-@@ -488,18 +488,6 @@ config("compiler") {
- }
- }
-
-- if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
-- target_os != "chromeos") {
-- cflags += [
-- # TODO(hans): Remove this once Clang generates better optimized debug info
-- # by default. https://crbug.com/765793
-- "-Xclang",
-- "-mllvm",
-- "-Xclang",
-- "-instcombine-lower-dbg-declare=0",
-- ]
-- }
--
- # Print absolute paths in diagnostics. There is no precedent for doing this
- # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
- # Windows developers rely on it (crbug.com/636109) so only do this on Windows.
diff --git a/community/chromium/chromium-cors-string-r0.patch b/community/chromium/chromium-cors-string-r0.patch
deleted file mode 100644
index 74096a7862..0000000000
--- a/community/chromium/chromium-cors-string-r0.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 01d891fa0790950549c7bedb34edf869827a372e Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@lge.com>
-Date: Thu, 31 May 2018 17:03:37 +0000
-Subject: [PATCH] CORS legacy: add missing string include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The cors_legacy.h file includes declarations using std::string, but
-it is not declared due to missing #include <string>.
-
-Also drop unneeded declarations in .cpp file.
-
-Change-Id: I00df799f84a6c3530c2f12f1e52d24c7d9bd6bfd
-Reviewed-on: https://chromium-review.googlesource.com/1080707
-Reviewed-by: Tom Sepez <tsepez@chromium.org>
-Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
-Cr-Commit-Position: refs/heads/master@{#563282}
----
- services/network/public/cpp/cors/cors_legacy.cc | 2 --
- services/network/public/cpp/cors/cors_legacy.h | 1 +
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/services/network/public/cpp/cors/cors_legacy.cc b/services/network/public/cpp/cors/cors_legacy.cc
-index 8f32ac3be64e..f01af63619b5 100644
---- ./services/network/public/cpp/cors/cors_legacy.cc
-+++ ./services/network/public/cpp/cors/cors_legacy.cc
-@@ -5,8 +5,6 @@
- #include "services/network/public/cpp/cors/cors_legacy.h"
-
- #include <algorithm>
--#include <string>
--#include <vector>
-
- #include "url/gurl.h"
- #include "url/url_util.h"
-diff --git a/services/network/public/cpp/cors/cors_legacy.h b/services/network/public/cpp/cors/cors_legacy.h
-index d2cdf026ca3a..dc9295a92c47 100644
---- ./services/network/public/cpp/cors/cors_legacy.h
-+++ ./services/network/public/cpp/cors/cors_legacy.h
-@@ -5,6 +5,7 @@
- #ifndef SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_
- #define SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_
-
-+#include <string>
- #include <vector>
-
- #include "base/component_export.h"
---
-2.17.1
-
diff --git a/community/chromium/chromium-fix_harfbuzz_2.patch b/community/chromium/chromium-fix_harfbuzz_2.patch
new file mode 100644
index 0000000000..95678c1292
--- /dev/null
+++ b/community/chromium/chromium-fix_harfbuzz_2.patch
@@ -0,0 +1,80 @@
+From 7ae38170a117e909bb28e1470842b68de3501197 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppymaster@gmail.com>
+Date: Sun, 21 Oct 2018 10:06:53 -0400
+Subject: [PATCH] blink: add 'const' modifier for harfbuzz hb_codepoint_t
+ pointers
+
+This resolves a build failure against harfbuzz 2.0.
+
+Based on a patch by Alexandre Fierreira.
+
+Bug: https://bugs.gentoo.org/669034
+---
+ .../renderer/platform/fonts/shaping/harfbuzz_face.cc | 2 +-
+ .../renderer/platform/fonts/skia/skia_text_metrics.cc | 9 +++++++--
+ .../renderer/platform/fonts/skia/skia_text_metrics.h | 2 +-
+ 3 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
+index 8e7d91ca371f..e279a5876cb3 100644
+--- third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
++++ third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc
+@@ -139,7 +139,7 @@ static hb_position_t HarfBuzzGetGlyphHorizontalAdvance(hb_font_t* hb_font,
+ static void HarfBuzzGetGlyphHorizontalAdvances(hb_font_t* font,
+ void* font_data,
+ unsigned count,
+- hb_codepoint_t* first_glyph,
++ const hb_codepoint_t* first_glyph,
+ unsigned int glyph_stride,
+ hb_position_t* first_advance,
+ unsigned int advance_stride,
+diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
+index 77ec6209fab9..9f9070921448 100644
+--- third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
++++ third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc
+@@ -18,6 +18,11 @@ T* advance_by_byte_size(T* p, unsigned byte_size) {
+ return reinterpret_cast<T*>(reinterpret_cast<uint8_t*>(p) + byte_size);
+ }
+
++template <class T>
++T* advance_by_byte_size_const(T* p, unsigned byte_size) {
++ return reinterpret_cast<T*>(reinterpret_cast<const uint8_t*>(p) + byte_size);
++}
++
+ } // namespace
+
+ SkiaTextMetrics::SkiaTextMetrics(const SkPaint* paint) : paint_(paint) {
+@@ -39,7 +44,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(hb_codepoint_t codepoint,
+ }
+
+ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count,
+- hb_codepoint_t* glyphs,
++ const hb_codepoint_t* glyphs,
+ unsigned glyph_stride,
+ hb_position_t* advances,
+ unsigned advance_stride) {
+@@ -48,7 +53,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count,
+ // array that copy them to a regular array.
+ Vector<Glyph, 256> glyph_array(count);
+ for (unsigned i = 0; i < count;
+- i++, glyphs = advance_by_byte_size(glyphs, glyph_stride)) {
++ i++, glyphs = advance_by_byte_size_const(glyphs, glyph_stride)) {
+ glyph_array[i] = *glyphs;
+ }
+ Vector<SkScalar, 256> sk_width_array(count);
+diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
+index 787d8af0375a..3bc4407c641b 100644
+--- third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
++++ third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h
+@@ -19,7 +19,7 @@ class SkiaTextMetrics final {
+
+ void GetGlyphWidthForHarfBuzz(hb_codepoint_t, hb_position_t* width);
+ void GetGlyphWidthForHarfBuzz(unsigned count,
+- hb_codepoint_t* first_glyph,
++ const hb_codepoint_t* first_glyph,
+ unsigned glyph_stride,
+ hb_position_t* first_advance,
+ unsigned advance_stride);
+--
+2.19.1
+
diff --git a/community/chromium/chromium-gcc.patch b/community/chromium/chromium-gcc.patch
deleted file mode 100644
index fe7cb22e17..0000000000
--- a/community/chromium/chromium-gcc.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 823d20044c74ff8524954b2f3b01a51f390567b0 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jose.dapena@lge.com>
-Date: Tue, 29 May 2018 18:38:39 +0000
-Subject: [PATCH] GCC: workaround GCC bug "std::map::insert(value_type &&) not
- selected"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There are several calls following this pattern:
-std:map<A, std::unique_ptr<B>> map;
- A a;
- std::unique_ptr<B> b;
- map.insert({a, std::move(b)});
-
-This fails in gcc < 7.3 because the operator for inserting from &&
-is not present, as reported here:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82522
-
-So apply a workaround that makes the move steps explicit.
-
-Change-Id: I54cea26eac6e74a3d9c2d17a37e3c4c9ce62fd74
-Reviewed-on: https://chromium-review.googlesource.com/1076471
-Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
-Reviewed-by: Dan Elphick <delphick@chromium.org>
-Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
-Cr-Commit-Position: refs/heads/master@{#562519}
----
- content/browser/background_fetch/background_fetch_context.cc | 5 ++++-
- content/renderer/input/input_event_prediction.cc | 5 ++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/content/browser/background_fetch/background_fetch_context.cc b/content/browser/background_fetch/background_fetch_context.cc
-index 5dec01f82db31..649d4595ba83e 100644
---- ./content/browser/background_fetch/background_fetch_context.cc
-+++ ./content/browser/background_fetch/background_fetch_context.cc
-@@ -222,7 +222,10 @@ void BackgroundFetchContext::InitializeController(
-
- scheduler_->AddJobController(controller.get());
-
-- job_controllers_.insert({unique_id, std::move(controller)});
-+ // Workaround for GLIBC C++ < 7.3 that fails to insert with braces
-+ // See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82522
-+ auto pair = std::make_pair(unique_id, std::move(controller));
-+ job_controllers_.insert(std::move(pair));
- std::move(done_closure).Run();
- }
-
-diff --git a/content/renderer/input/input_event_prediction.cc b/content/renderer/input/input_event_prediction.cc
-index 89636c9736da5..f1bce36364ed9 100644
---- ./content/renderer/input/input_event_prediction.cc
-+++ ./content/renderer/input/input_event_prediction.cc
-@@ -119,7 +119,10 @@ void InputEventPrediction::UpdateSinglePointer(
- if (predictor != pointer_id_predictor_map_.end()) {
- predictor->second->Update(data);
- } else {
-- pointer_id_predictor_map_.insert({event.id, SetUpPredictor()});
-+ // Workaround for GLIBC C++ < 7.3 that fails to insert with braces
-+ // See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82522
-+ auto pair = std::make_pair(event.id, SetUpPredictor());
-+ pointer_id_predictor_map_.insert(std::move(pair));
- pointer_id_predictor_map_[event.id]->Update(data);
- }
- }
diff --git a/community/chromium/chromium-libjpeg-r0.patch b/community/chromium/chromium-libjpeg-r0.patch
deleted file mode 100644
index 93bd305df8..0000000000
--- a/community/chromium/chromium-libjpeg-r0.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From c6b0194f7a4d9f494b2d51f46d2c332e2e5f4050 Mon Sep 17 00:00:00 2001
-From: Daniel Bratell <bratell@opera.com>
-Date: Mon, 28 May 2018 13:13:01 +0000
-Subject: [PATCH] Use the same libjpeg in all of blink/platform
-
-The normal libjpeg renames some symbols with macros so if its
-headers are included together with libjpeg-turbo's headers
-in the same translation unit, there will be an inconsistent
-renaming of libjpeg symbols. This happened in some extreme
-jumbo configuration and resulted in confising linker errors.
-
-This patch changes an include so that jpeglib.h becomes included
-the same way everywhere.
-
-Change-Id: I7f122d0919d58371bb40dc0097a766b857b9815e
-Reviewed-on: https://chromium-review.googlesource.com/1073423
-Reviewed-by: Kentaro Hara <haraken@chromium.org>
-Commit-Queue: Daniel Bratell <bratell@opera.com>
-Cr-Commit-Position: refs/heads/master@{#562243}
----
- .../renderer/platform/image-encoders/image_encoder.cc | 11 +++++++++++
- .../renderer/platform/image-encoders/image_encoder.h | 2 --
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc
-index 0c7f14c7c0e4..4c450f5d6783 100644
---- ./third_party/blink/renderer/platform/image-encoders/image_encoder.cc
-+++ ./third_party/blink/renderer/platform/image-encoders/image_encoder.cc
-@@ -4,6 +4,17 @@
-
- #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
-
-+#include "build/build_config.h"
-+
-+#if defined(OS_WIN)
-+#include <basetsd.h> // Included before jpeglib.h because of INT32 clash
-+#endif // OS_WIN
-+#include <stdio.h> // Needed by jpeglib.h
-+
-+#include "jpeglib.h" // for JPEG_MAX_DIMENSION
-+
-+#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION
-+
- namespace blink {
-
- bool ImageEncoder::Encode(Vector<unsigned char>* dst,
-diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.h b/third_party/blink/renderer/platform/image-encoders/image_encoder.h
-index 0d1460f34827..40306097d507 100644
---- ./third_party/blink/renderer/platform/image-encoders/image_encoder.h
-+++ ./third_party/blink/renderer/platform/image-encoders/image_encoder.h
-@@ -7,8 +7,6 @@
-
- #include "third_party/blink/renderer/platform/platform_export.h"
- #include "third_party/blink/renderer/platform/wtf/vector.h"
--#include "third_party/libjpeg/jpeglib.h" // for JPEG_MAX_DIMENSION
--#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION
- #include "third_party/skia/include/core/SkStream.h"
- #include "third_party/skia/include/encode/SkJpegEncoder.h"
- #include "third_party/skia/include/encode/SkPngEncoder.h"
---
-2.17.1
-
diff --git a/community/chromium/chromium-libwebp-shim-r0.patch b/community/chromium/chromium-libwebp-shim-r0.patch
deleted file mode 100644
index 04effddee0..0000000000
--- a/community/chromium/chromium-libwebp-shim-r0.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/build/linux/unbundle/libwebp.gn b/build/linux/unbundle/libwebp.gn
-index ab92adecf400..12574d87be58 100644
---- ./build/linux/unbundle/libwebp.gn
-+++ ./build/linux/unbundle/libwebp.gn
-@@ -2,12 +2,34 @@
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-
-+import("//build/config/linux/pkg_config.gni")
-+import("//build/shim_headers.gni")
-+
-+pkg_config("system_libwebp") {
-+ packages = [
-+ "libwebp",
-+ "libwebpdemux",
-+ "libwebpmux",
-+ ]
-+}
-+
-+shim_headers("libwebp_shim") {
-+ root_path = "src"
-+ headers = [
-+ "webp/decode.h",
-+ "webp/demux.h",
-+ "webp/encode.h",
-+ "webp/mux.h",
-+ "webp/mux_types.h",
-+ "webp/types.h",
-+ ]
-+}
-+
- source_set("libwebp_webp") {
-- libs = [
-- "webp",
-- "webpdemux",
-- "webpmux",
-+ deps = [
-+ ":libwebp_shim",
- ]
-+ public_configs = [ ":system_libwebp" ]
- }
-
- group("libwebp") {
diff --git a/community/chromium/chromium-remove-unknown-clang-warnings.patch b/community/chromium/chromium-remove-unknown-clang-warnings.patch
deleted file mode 100644
index 83bbbbb88d..0000000000
--- a/community/chromium/chromium-remove-unknown-clang-warnings.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- build/config/compiler/BUILD.gn.orig
-+++ build/config/compiler/BUILD.gn
-@@ -1399,14 +1399,14 @@
- "-Wno-user-defined-warnings",
-
- # TODO(thakis): https://crbug.com/753973
-- "-Wno-enum-compare-switch",
-+ #"-Wno-enum-compare-switch",
-
- # TODO(hans): https://crbug.com/766891
-- "-Wno-null-pointer-arithmetic",
-+ #"-Wno-null-pointer-arithmetic",
-
- # Ignore warnings about MSVC optimization pragmas.
- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
-- "-Wno-ignored-pragma-optimize",
-+ #"-Wno-ignored-pragma-optimize",
- ]
- } else if (use_xcode_clang) {
- cflags += [
diff --git a/community/chromium/default-pthread-stacksize.patch b/community/chromium/default-pthread-stacksize.patch
index 75b50479e5..16e4d21e6e 100644
--- a/community/chromium/default-pthread-stacksize.patch
+++ b/community/chromium/default-pthread-stacksize.patch
@@ -6,19 +6,18 @@
+ return (1 << 23);
--- chrome/app/shutdown_signal_handlers_posix.cc.orig
+++ chrome/app/shutdown_signal_handlers_posix.cc
-@@ -184,12 +184,20 @@
+@@ -184,11 +184,19 @@
g_shutdown_pipe_read_fd = pipefd[0];
g_shutdown_pipe_write_fd = pipefd[1];
- #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
+ #if !defined(ADDRESS_SANITIZER)
+# if defined(__GLIBC__)
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
+# else
+ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2 * 8; // match up musls 2k PTHREAD_STACK_MIN with glibcs 16k
+# endif
#else
- // ASan instrumentation and -finstrument-functions (used for keeping the
- // shadow stacks) bloat the stack frames, so we need to increase the stack
- // size to avoid hitting the guard page.
+ // ASan instrumentation bloats the stack frames, so we need to increase the
+ // stack size to avoid hitting the guard page.
+# if defined(__GLIBC__)
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
+# else
@@ -27,3 +26,4 @@
#endif
ShutdownDetector* detector = new ShutdownDetector(
g_shutdown_pipe_read_fd, shutdown_callback, task_runner);
+
diff --git a/community/chromium/gcc8-alignof.patch b/community/chromium/gcc8-alignof.patch
new file mode 100644
index 0000000000..90aa32872c
--- /dev/null
+++ b/community/chromium/gcc8-alignof.patch
@@ -0,0 +1,17 @@
+--- mojo/public/c/system/macros.h.orig 2018-09-06 10:11:54.336432699 -0400
++++ mojo/public/c/system/macros.h 2018-09-06 10:13:56.555727572 -0400
+@@ -27,7 +27,13 @@
+ (sizeof(void*) == 4 ? 32 : 0)
+
+ // Like the C++11 |alignof| operator.
+-#if __cplusplus >= 201103L
++#if defined(__GNUC__) && __GNUC__ >= 8
++// GCC 8 has changed the alignof operator to return the minimal alignment
++// required by the target ABI, instead of the preferred alignment.
++// This means that on 32-bit x86, it will return 4 instead of 8.
++// Use __alignof__ instead to avoid this.
++#define MOJO_ALIGNOF(type) __alignof__(type)
++#elif __cplusplus >= 201103L
+ #define MOJO_ALIGNOF(type) alignof(type)
+ #elif defined(__GNUC__)
+ #define MOJO_ALIGNOF(type) __alignof__(type)
diff --git a/community/chromium/gn-bootstrap-remove-sysroot-related-options.patch b/community/chromium/gn-bootstrap-remove-sysroot-related-options.patch
new file mode 100644
index 0000000000..9e542bce36
--- /dev/null
+++ b/community/chromium/gn-bootstrap-remove-sysroot-related-options.patch
@@ -0,0 +1,25 @@
+See: https://chromium.googlesource.com/chromium/src/tools/gn/+/6630c2e334d7bc179e95a3d543a8eca3201d6725%5E%21/#F0
+diff --git a/bootstrap/bootstrap.py b/bootstrap/bootstrap.py
+index 261fddd..1945852 100755
+--- tools/gn/bootstrap/bootstrap.py
++++ tools/gn/bootstrap/bootstrap.py
+@@ -46,10 +46,6 @@
+ '--build-path',
+ help='The directory in which to build gn, '
+ 'relative to the src directory. (eg. out/Release)')
+- parser.add_option(
+- '--with-sysroot',
+- action='store_true',
+- help='Download and build with the Debian sysroot.')
+ parser.add_option('-v', '--verbose', help='ignored')
+ parser.add_option(
+ '--skip-generate-buildfiles',
+@@ -76,8 +72,6 @@
+ '--no-last-commit-position',
+ '--out-path=' + gn_build_dir,
+ ]
+- if not options.with_sysroot:
+- cmd.append('--no-sysroot')
+ if options.debug:
+ cmd.append('--debug')
+ subprocess.check_call(cmd)
diff --git a/community/chromium/gn_bootstrap.patch b/community/chromium/gn_bootstrap.patch
deleted file mode 100644
index 5929742125..0000000000
--- a/community/chromium/gn_bootstrap.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/base/message_loop/message_pump_libevent.cc b/base/message_loop/message_pump_libevent.cc
-index dc5efc6..a9f1ec0 100644
---- base/message_loop/message_pump_libevent.cc
-+++ base/message_loop/message_pump_libevent.cc
-@@ -14,7 +14,7 @@
- #include "base/files/file_util.h"
- #include "base/logging.h"
- #include "base/posix/eintr_wrapper.h"
--#include "base/third_party/libevent/event.h"
-+#include "event.h"
- #include "base/time/time.h"
- #include "base/trace_event/trace_event.h"
- #include "build/build_config.h"
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 2bf25e5..0ddc537 100755
---- tools/gn/bootstrap/bootstrap.py
-+++ tools/gn/bootstrap/bootstrap.py
-@@ -32,6 +32,7 @@ SRC_ROOT = os.path.dirname(os.path.dirname(GN_ROOT))
-
- is_win = sys.platform.startswith('win')
- is_linux = sys.platform.startswith('linux')
-+is_gnu_linux = is_linux and platform.libc_ver()[0].startswith('glibc')
- is_mac = sys.platform.startswith('darwin')
- is_aix = sys.platform.startswith('aix')
- is_posix = is_linux or is_mac or is_aix
-@@ -184,7 +185,7 @@ def build_gn_with_ninja_manually(tempdir, options):
- {'ENABLE_MUTEX_PRIORITY_INHERITANCE': 'false'})
-
- write_buildflag_header_manually(root_gen_dir, 'base/allocator/buildflags.h',
-- {'USE_ALLOCATOR_SHIM': 'true' if is_linux else 'false'})
-+ {'USE_ALLOCATOR_SHIM': 'true' if is_gnu_linux else 'false'})
-
- write_buildflag_header_manually(root_gen_dir,
- 'base/debug/debugging_buildflags.h',
-@@ -438,8 +439,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/third_party/superfasthash/superfasthash.c',
- ])
- static_libraries['base']['sources'].extend([
-- 'base/allocator/allocator_check.cc',
-- 'base/allocator/allocator_extension.cc',
- 'base/at_exit.cc',
- 'base/base_paths.cc',
- 'base/base_switches.cc',
-@@ -641,26 +640,6 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/time/time_conversion_posix.cc',
- 'base/trace_event/heap_profiler_allocation_register_posix.cc',
- ])
-- static_libraries['libevent'] = {
-- 'sources': [
-- 'base/third_party/libevent/buffer.c',
-- 'base/third_party/libevent/evbuffer.c',
-- 'base/third_party/libevent/evdns.c',
-- 'base/third_party/libevent/event.c',
-- 'base/third_party/libevent/event_tagging.c',
-- 'base/third_party/libevent/evrpc.c',
-- 'base/third_party/libevent/evutil.c',
-- 'base/third_party/libevent/http.c',
-- 'base/third_party/libevent/log.c',
-- 'base/third_party/libevent/poll.c',
-- 'base/third_party/libevent/select.c',
-- 'base/third_party/libevent/signal.c',
-- 'base/third_party/libevent/strlcpy.c',
-- ],
-- 'tool': 'cc',
-- 'include_dirs': [],
-- 'cflags': cflags + ['-DHAVE_CONFIG_H'],
-- }
-
- if is_linux or is_aix:
- static_libraries['xdg_user_dirs'] = {
-@@ -767,17 +746,12 @@ def write_gn_ninja(path, root_gen_dir, options):
- '-D_LIBCXXABI_NO_EXCEPTIONS',
- ]
- }
-- static_libraries['base']['sources'].extend([
-- 'base/allocator/allocator_shim.cc',
-- 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
-- ])
-- libs.extend(['-lrt', '-latomic'])
-- static_libraries['libevent']['include_dirs'].extend([
-- os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'linux')
-- ])
-- static_libraries['libevent']['sources'].extend([
-- 'base/third_party/libevent/epoll.c',
-- ])
-+ if is_gnu_linux:
-+ static_libraries['base']['sources'].extend([
-+ 'base/allocator/allocator_shim.cc',
-+ 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
-+ ])
-+ libs.extend(['-lrt', '-levent'])
- else:
- ldflags.extend(['-pthread'])
- libs.extend(['-lrt'])
diff --git a/community/chromium/last-commit-position.patch b/community/chromium/last-commit-position.patch
deleted file mode 100644
index fdef5adf3b..0000000000
--- a/community/chromium/last-commit-position.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- tools/gn/gn_main.cc.orig 2015-11-12 11:49:56.260549036 +0000
-+++ tools/gn/gn_main.cc 2015-11-12 11:50:14.780931485 +0000
-@@ -11,13 +11,7 @@
- #include "tools/gn/standard_out.h"
- #include "tools/gn/switches.h"
-
--// Only the GN-generated build makes this header for now.
--// TODO(brettw) consider adding this if we need it in GYP.
--#if defined(GN_BUILD)
--#include "tools/gn/last_commit_position.h"
--#else
- #define LAST_COMMIT_POSITION "UNKNOWN"
--#endif
-
- namespace {
-
---- tools/gn/BUILD.gn.orig 2015-11-12 11:50:43.513524769 +0000
-+++ tools/gn/BUILD.gn 2015-11-12 11:50:57.697817632 +0000
-@@ -227,7 +227,6 @@
-
- deps = [
- ":gn_lib",
-- ":last_commit_position",
- "//base",
- "//build/config/sanitizers:deps",
- ]
diff --git a/community/chromium/musl-hacks.patch b/community/chromium/musl-hacks.patch
index 790d173993..eff59ae5bc 100644
--- a/community/chromium/musl-hacks.patch
+++ b/community/chromium/musl-hacks.patch
@@ -1,11 +1,11 @@
---- ./base/debug/stack_trace.cc.orig
-+++ ./base/debug/stack_trace.cc
-@@ -214,7 +214,7 @@
-
- std::string StackTrace::ToString() const {
+--- base/debug/stack_trace.cc.orig 2018-12-08 14:11:25.303475116 +0100
++++ base/debug/stack_trace.cc 2018-12-08 18:00:43.874946999 +0100
+@@ -229,7 +229,7 @@
+ }
+ std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
std::stringstream stream;
-#if !defined(__UCLIBC__) && !defined(_AIX)
+#if defined(__GLIBC__) && !defined(_AIX)
- OutputToStream(&stream);
+ OutputToStreamWithPrefix(&stream, prefix_string);
#endif
return stream.str();
diff --git a/community/chromium/no-execinfo.patch b/community/chromium/no-execinfo.patch
index c91fbd7c64..95451f256b 100644
--- a/community/chromium/no-execinfo.patch
+++ b/community/chromium/no-execinfo.patch
@@ -1,82 +1,77 @@
-diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc
-index 7696be8..20ebe67 100644
---- a/base/debug/stack_trace_posix.cc
-+++ base/debug/stack_trace_posix.cc
+--- base/debug/stack_trace_posix.cc.orig 2017-07-27 14:05:05.534241443 +0000
++++ base/debug/stack_trace_posix.cc 2017-07-27 14:07:54.669231362 +0000
@@ -26,7 +26,7 @@
#if !defined(USE_SYMBOLIZE)
#include <cxxabi.h>
#endif
-#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__)
++#if defined(__GLIBC__) && !defined(_AIX)
#include <execinfo.h>
#endif
-@@ -82,7 +82,7 @@ void DemangleSymbols(std::string* text) {
+@@ -80,7 +80,7 @@
// Note: code in this function is NOT async-signal safe (std::string uses
// malloc internally).
-#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__)
++#if defined(__GLIBC__) && !defined(_AIX)
std::string::size_type search_from = 0;
while (search_from < text->size()) {
// Look for the start of a mangled symbol, from search_from.
-@@ -129,7 +129,7 @@ class BacktraceOutputHandler {
+@@ -115,7 +115,7 @@
+ search_from = mangled_start + 2;
+ }
+ }
+-#endif // !defined(__UCLIBC__) && !defined(_AIX)
++#endif // defined(__GLIBC__) && !defined(_AIX)
+ }
+ #endif // !defined(USE_SYMBOLIZE)
+
+@@ -127,7 +127,7 @@
virtual ~BacktraceOutputHandler() {}
};
-#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__)
++#if defined(__GLIBC__) && !defined(_AIX)
void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
// This should be more than enough to store a 64-bit number in hex:
// 16 hex digits + 1 for null-terminator.
-@@ -705,6 +705,10 @@ class SandboxSymbolizeHelper {
- } // namespace
-
- bool EnableInProcessStackDumping() {
-+#if defined(OS_LINUX) && !defined(__GLIBC__)
-+// let system handler deal with the dumps
-+ return true;
-+#else
- #if defined(USE_SYMBOLIZE)
- SandboxSymbolizeHelper::GetInstance();
- #endif // USE_SYMBOLIZE
-@@ -738,6 +742,7 @@ bool EnableInProcessStackDumping() {
- #endif // !defined(OS_LINUX)
-
- return success;
-+#endif
+@@ -204,7 +204,7 @@
+ }
+ #endif // defined(USE_SYMBOLIZE)
}
+-#endif // !defined(__UCLIBC__) && !defined(_AIX)
++#endif // defined(__GLIBC__) && !defined(_AIX)
- void SetStackDumpFirstChanceCallback(bool (*handler)(int, void*, void*)) {
-@@ -749,7 +754,7 @@ StackTrace::StackTrace(size_t count) {
+ void PrintToStderr(const char* output) {
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+@@ -721,7 +721,7 @@
// NOTE: This code MUST be async-signal safe (it's used by in-process
// stack dumping signal handler). NO malloc or stdio is allowed here.
-#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__)
++#if defined(__GLIBC__) && !defined(_AIX)
count = std::min(arraysize(trace_), count);
// Though the backtrace API man page does not list any possible negative
-@@ -764,13 +769,13 @@ void StackTrace::Print() const {
- // NOTE: This code MUST be async-signal safe (it's used by in-process
- // stack dumping signal handler). NO malloc or stdio is allowed here.
+@@ -827,13 +827,13 @@
+ // NOTE: This code MUST be async-signal safe (it's used by in-process
+ // stack dumping signal handler). NO malloc or stdio is allowed here.
-#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__)
++#if defined(__GLIBC__) && !defined(_AIX)
PrintBacktraceOutputHandler handler;
- ProcessBacktrace(trace_, count_, &handler);
+ ProcessBacktrace(trace_, count_, prefix_string, &handler);
#endif
}
-#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__)
- void StackTrace::OutputToStream(std::ostream* os) const {
++#if defined(__GLIBC__) && !defined(_AIX)
+ void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
+ const char* prefix_string) const {
StreamBacktraceOutputHandler handler(os);
- ProcessBacktrace(trace_, count_, &handler);
-diff --git a/third_party/WebKit/Source/platform/wtf/Assertions.cpp b/third_party/WebKit/Source/platform/wtf/Assertions.cpp
-index 9bdece7..0c76188 100644
---- ./third_party/blink/renderer/platform/wtf/assertions.cc
-+++ ./third_party/blink/renderer/platform/wtf/assertions.cc
+--- third_party/blink/renderer/platform/wtf/assertions.cc.orig 2017-09-11 12:27:06.948854813 +0000
++++ third_party/blink/renderer/platform/wtf/assertions.cc 2017-09-11 12:29:34.639862433 +0000
@@ -56,7 +56,7 @@
#include <windows.h>
#endif
diff --git a/community/chromium/secure_getenv.patch b/community/chromium/secure_getenv.patch
index 7a1e7fb0f6..842a11532d 100644
--- a/community/chromium/secure_getenv.patch
+++ b/community/chromium/secure_getenv.patch
@@ -1,5 +1,5 @@
---- ./third_party/angle/third_party/vulkan-validation-layers/src/loader/loader.c.orig
-+++ ./third_party/angle/third_party/vulkan-validation-layers/src/loader/loader.c
+--- ./third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig
++++ ./third_party/angle/third_party/vulkan-loader/src/loader/loader.c
@@ -37,6 +37,9 @@
#include <CoreFoundation/CoreFoundation.h>
#include <sys/param.h>
@@ -19,8 +19,8 @@
#else
#pragma message( \
"Warning: Falling back to non-secure getenv for environmental lookups! Consider" \
---- ./third_party/angle/third_party/vulkan-validation-layers/BUILD.gn.orig
-+++ ./third_party/angle/third_party/vulkan-validation-layers/BUILD.gn
+--- ./third_party/angle/third_party/vulkan-loader/BUILD.gn.orig
++++ ./third_party/angle/third_party/vulkan-loader/BUILD.gn
@@ -264,8 +264,7 @@
cflags = [ "/wd4201" ]
}