upgpkg: inox 66.0.3359.139-1

2 files changed, 113 insertions, 125 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f4779897d2f3..30e12dda8fde 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = inox
 	pkgdesc = Chromium Spin-off to enhance privacy by disabling data transmission to Google
-	pkgver = 65.0.3325.181
+	pkgver = 66.0.3359.139
 	pkgrel = 1
 	url = https://www.chromium.org/Home
 	install = inox.install
 	arch = x86_64
 	license = BSD
+	makedepends = python
 	makedepends = python2
 	makedepends = gperf
 	makedepends = yasm
@@ -13,10 +14,10 @@ pkgbase = inox
 	makedepends = ninja
 	makedepends = nodejs
 	makedepends = git
-	makedepends = libva
 	makedepends = clang
-	makedepends = llvm
 	makedepends = lld
+	makedepends = llvm
+	makedepends = libva
 	depends = gtk3
 	depends = nss
 	depends = alsa-lib
@@ -34,7 +35,6 @@ pkgbase = inox
 	depends = hicolor-icon-theme
 	depends = flac
 	depends = fontconfig
-	depends = libvpx
 	depends = icu
 	depends = opus
 	depends = minizip
@@ -52,50 +52,47 @@ pkgbase = inox
 	optdepends = libva-intel-driver: for hardware video acceleration with Intel GPUs
 	optdepends = libva-mesa-driver: for hardware video acceleration with AMD/ATI GPUs
 	optdepends = libva-vdpau-driver: for hardware video acceleration with NVIDIA GPUs
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-65.0.3325.181.tar.xz
-	source = chromium-launcher-5.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v5.tar.gz
-	source = chromium-65.0.3325.181.txt::https://chromium.googlesource.com/chromium/src.git/+/65.0.3325.181?format=TEXT
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/product_logo_16.png
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/product_logo_22.png
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/product_logo_24.png
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/product_logo_32.png
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/product_logo_48.png
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/product_logo_64.png
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/product_logo_128.png
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/product_logo_256.png
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/fix-crash-in-is_cfi-true-builds-with-unbundled-ICU.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/chromium-skia-harmony.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/chromium-widevine.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/chromium-clang-r2.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/chromium-math.h-r0.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/chromium-stdint.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/chromium-vaapi-init-r16.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/chromium-vaapi-r16.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0001-fix-building-without-safebrowsing.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0002-fix-building-without-reporting.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0003-disable-autofill-download-manager.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0004-disable-google-url-tracker.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0005-disable-default-extensions.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0006-modify-default-prefs.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0007-disable-web-resource-service.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0008-restore-classic-ntp.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0009-disable-google-ipv6-probes.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0010-disable-gcm-status-check.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0011-add-duckduckgo-search-engine.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0012-branding.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0013-disable-missing-key-warning.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0014-disable-translation-lang-fetch.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0015-disable-update-pings.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0016-chromium-sandbox-pie.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0017-disable-new-avatar-menu.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0018-disable-first-run-behaviour.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0019-disable-battery-status-service.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0020-launcher-branding.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/0021-disable-rlz.patch
-	source = https://raw.githubusercontent.com/gcarq/inox-patchset/65.0.3325.181/9000-disable-metrics.patch
-	sha256sums = 93666448c6b96ec83e6a35a64cff40db4eb92a154fe1db4e7dab4761d0e38687
-	sha256sums = 4dc3428f2c927955d9ae117f2fb24d098cc6dd67adb760ac9c82b522ec8b0587
-	sha256sums = 2771c049b66c9aba3b945fe065f2610f164d55506eb5d71751a26aaf8b40d4ee
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-66.0.3359.139.tar.xz
+	source = chromium-launcher-6.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v6.tar.gz
+	source = chromium-66.0.3359.139.txt::https://chromium.googlesource.com/chromium/src/+/66.0.3359.139?format=TEXT
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/product_logo_16.png
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/product_logo_22.png
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/product_logo_24.png
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/product_logo_32.png
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/product_logo_48.png
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/product_logo_64.png
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/product_logo_128.png
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/product_logo_256.png
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/fix-crash-in-is_cfi-true-builds-with-unbundled-ICU.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/fix-frame-buttons-rendering-too-large-when-using-OSX.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/chromium-skia-harmony.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/chromium-widevine.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/chromium-vaapi-r18.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0001-fix-building-without-safebrowsing.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0002-fix-building-without-reporting.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0003-disable-autofill-download-manager.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0004-disable-google-url-tracker.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0005-disable-default-extensions.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0006-modify-default-prefs.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0007-disable-web-resource-service.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0008-restore-classic-ntp.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0009-disable-google-ipv6-probes.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0010-disable-gcm-status-check.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0011-add-duckduckgo-search-engine.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0012-branding.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0013-disable-missing-key-warning.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0014-disable-translation-lang-fetch.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0015-disable-update-pings.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0016-chromium-sandbox-pie.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0017-disable-new-avatar-menu.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0018-disable-first-run-behaviour.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0019-disable-battery-status-service.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0020-launcher-branding.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/0021-disable-rlz.patch
+	source = https://raw.githubusercontent.com/gcarq/inox-patchset/66.0.3359.139/9000-disable-metrics.patch
+	sha256sums = be75a5b5f8c5789d359238f374a43bf52ded49425f13ed68b8021c24e2e264b2
+	sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1
+	sha256sums = 34eb82c625b7050021a8d3334ceaa7fa3d042dd816c228c14abb52b29796f7b9
 	sha256sums = 71471fa4690894420f9e04a2e9a622af620d92ac2714a35f9a4c4e90fa3968dd
 	sha256sums = 4a533acefbbc1567b0d74a1c0903e9179b8c59c1beabe748850795815366e509
 	sha256sums = 7b88830c5e0e9819f514ad68aae885d427541a907e25607e47dee1b0f38975fd
@@ -105,35 +102,32 @@ pkgbase = inox
 	sha256sums = 896993987d4ef9f0ac7db454f288117316c2c80ed0b6764019afd760db222dad
 	sha256sums = 3df9b3bbdc07fde63d9e400954dcc6ab6e0e5454f0ef6447570eef0549337354
 	sha256sums = e3fb73b43bb8c69ff517e66b2cac73d6e759fd240003eb35598df9af442422fe
+	sha256sums = bd5e0e61df3f89172590801aea7c8ac75162c10c7fe83e262e96a14388d1633a
 	sha256sums = feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3
 	sha256sums = d6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808
-	sha256sums = 4495e8b29dae242c79ffe4beefc5171eb3c7aacb7e9aebfd2d4d69b9d8c958d3
-	sha256sums = fe0ab86aa5b0072db730eccda3e1582ebed4af25815bfd49fe0da24cf63ca902
-	sha256sums = c00d2506f1078b38a8ebec474a7318e76a61db1298afb40088a34210f137210f
-	sha256sums = acae2de43c123f19523c4fca3af19c671acbe76f76bd40e285fe3b08cddb7044
-	sha256sums = 5bc4f5dc5e9c8d71cf273338f65e82efcebc902e645affb35659532dcf9ad1af
-	sha256sums = ae84e4eed9969057dd9d3ecff040e02480993c17ff05e9674d5e24e398704a60
-	sha256sums = b7261e4063b0532139b72f20675bb58c743d95022c7368019deb012b2c777f83
-	sha256sums = ef9000eaaa5c0a28f0e4cb31139c7f2b454192532d8469329f5f6f95c21769e0
+	sha256sums = 514f40accb2b4bc439df43f11bb7154a812eeb9fa61777b3d986cfa6bb109ebd
+	sha256sums = 6c5f41579c43b192aaa2fd2fa4de06280cb3d4b500621961cb5bfb48d95d471e
+	sha256sums = aa86ff1fc7b21d9d4523a681eeb46314f00e90558e9069252ab7c4f7b593f5f1
+	sha256sums = f639f11ced3432cb12a19528e4d9a7f1bbcb2f9fd46f2969d8d0b567e27ec407
 	sha256sums = fb91a7e30e2615e4eb0626b0fdcf97b92d4a727a52023730f408b02fee436c8d
-	sha256sums = 72cd12b9064573fc1c7d88d606985ef180efdcec3815b0185c6038ec8216a471
-	sha256sums = 034cce5fb219a293284a4c01f7e4d7ad6ab262eb6fb9065dc65a4b18e885da7f
-	sha256sums = 7781ecd43e3c28f7d1e9158e043d6f98a190b5ee3c2c5ebe91644ea27e0b42ee
-	sha256sums = a5dde3ff6cd4adeef7eb099839d8d17a3bfeb89ec6bb66eba3e89d741743c9c0
-	sha256sums = cf050473adae5b83680346b369997b5ead55dce282515f185e4096c5ed39f11d
-	sha256sums = 3190a507dfa00e863a0e622b5738db5cf19947f696ac7a790f427510cc15d1e1
+	sha256sums = 7193573d2c4c5e9af35c5364ae6b92d714ebdd8224221cd7326a3afde5abc5a1
+	sha256sums = f93dd17ffd5407cb2384be5e90b5ef00e02762ab456656072ecb67d9e1b61ad4
+	sha256sums = a28f1428accff9e967c4d0f970fac05c156b96534bc9eefb60f0175116ed7db2
+	sha256sums = f657866cbce253c6854cf30c9564ef59198509ed8274832d4d3e0bad303a89ca
+	sha256sums = 306b29cdfd2def2353b6c4a582fb6fcc7989a6fe009412d4abf2e2daf84ff9d1
+	sha256sums = 3a8979ca0cae33a836d27f825ac2e15028c2656efce2ee70c1f8ce7d094f5c1c
 	sha256sums = 6fdea7a737959b226165dc3b6dd347de1e09e6e237acc444116df007ba0a7c57
 	sha256sums = 6427fea42b1cc6cf9aaae883c75c2209360344125827e1d6b15666faaf3c10a9
 	sha256sums = 60ecb418ff8728f67ac9617216f68dcc1ba0fa4d4e47e2da1fc4e63b5c91bfea
-	sha256sums = f80106b8127b60a62c006653154a26ebe68dd4aec5c551bae5321fa4e5ccef3f
-	sha256sums = 795686bf0dd7bfac0f596155be8fc7ed3f6294a6b764f793cd1614085562ce38
-	sha256sums = 5dc10c49cfc3ea65505e07366420eda0fc4878d0b0cebbfbcd8ad7daa88b3ded
+	sha256sums = c918a2495273f1ae6ab94d3c215b97c00943a5e8cf14c7025c58a955dca71f53
+	sha256sums = 44db6f3733332167518e947c72c9661b74c757aeed1b4912f94f3f34aeea067a
+	sha256sums = 7e12969dda184e24eccd6e5bf2b8244ba1336c2dc2dbf0494c153d09923723fd
 	sha256sums = e407da0596e044971631c0883a83bd75665535f1b913df32ba08ca8cd5d4b16e
-	sha256sums = cb2bd17fbbd9184f15eb24d3b23deca92d06cb4b9ec31bd6944504e130d69ff8
-	sha256sums = c17556772059a64873ddac383f2976e3befb5c07c3019b641c989ffb5683c4cd
+	sha256sums = a6d29b8c041e0a367ad68e817c703e03bed63bff26c47d7d94ae280af45b9457
+	sha256sums = e297609b4673e3b35c5843a9c3e49ab1b04bc9a02e9e178d5cee58b6ca8cda01
 	sha256sums = 80d2974001708c288a54c24e1dc896ef25916552b740765f6066a244c05ffcd5
 	sha256sums = dbe942b1eaba525ca6b81d398462a70360fc2043cbfe5d4105657c3bd721e592
-	sha256sums = 8ff834ed3f34fbbc969d2ec0abb3010033d1f3a3aa2db9fc81608e955a7d561c
+	sha256sums = f53b4d111fc119bd61ca662aab7db530649086ef6af1cd8c779027da088143a9
 
 pkgname = inox
 
diff --git a/PKGBUILD b/PKGBUILD
index 89fcaa5ab341..33f841846d50 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,9 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=inox
-pkgver=65.0.3325.181
+pkgver=66.0.3359.139
 pkgrel=1
-_launcher_ver=5
+_launcher_ver=6
 pkgdesc="Chromium Spin-off to enhance privacy by disabling data transmission to Google"
 arch=('x86_64')
 url="https://www.chromium.org/Home"
@@ -15,8 +15,8 @@ license=('BSD')
 depends=('gtk3' 'nss' 'alsa-lib' 'xdg-utils' 'libxss' 'libcups' 'libgcrypt'
          'ttf-font' 'systemd' 'dbus' 'libpulse' 'pciutils' 'json-glib'
          'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('python2' 'gperf' 'yasm' 'mesa' 'ninja' 'nodejs' 'git' 'libva'
-             'clang' 'llvm' 'lld')
+makedepends=('python' 'python2' 'gperf' 'yasm' 'mesa' 'ninja' 'nodejs' 'git'
+             'clang' 'lld' 'llvm' 'libva')
 optdepends=('pepper-flash: support for Flash content'
             'kdialog: needed for file dialogs in KDE'
             'gnome-keyring: for storing passwords in GNOME keyring'
@@ -27,19 +27,15 @@ optdepends=('pepper-flash: support for Flash content'
 install=inox.install
 source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz
         chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz
-        chromium-$pkgver.txt::https://chromium.googlesource.com/chromium/src.git/+/$pkgver?format=TEXT
+        chromium-$pkgver.txt::https://chromium.googlesource.com/chromium/src/+/$pkgver?format=TEXT
         https://raw.githubusercontent.com/gcarq/inox-patchset/$pkgver/product_logo_{16,22,24,32,48,64,128,256}.png
         # Patches from Arch Linux
         https://raw.githubusercontent.com/gcarq/inox-patchset/$pkgver/fix-crash-in-is_cfi-true-builds-with-unbundled-ICU.patch
+        https://raw.githubusercontent.com/gcarq/inox-patchset/$pkgver/fix-frame-buttons-rendering-too-large-when-using-OSX.patch
         https://raw.githubusercontent.com/gcarq/inox-patchset/$pkgver/chromium-skia-harmony.patch
         https://raw.githubusercontent.com/gcarq/inox-patchset/$pkgver/chromium-widevine.patch
-        # Patches from Gentoo
-        https://raw.githubusercontent.com/gcarq/inox-patchset/$pkgver/chromium-clang-r2.patch
-        https://raw.githubusercontent.com/gcarq/inox-patchset/$pkgver/chromium-math.h-r0.patch
-        https://raw.githubusercontent.com/gcarq/inox-patchset/$pkgver/chromium-stdint.patch
         # Misc
-        https://raw.githubusercontent.com/gcarq/inox-patchset/$pkgver/chromium-vaapi-init-r16.patch
-        https://raw.githubusercontent.com/gcarq/inox-patchset/$pkgver/chromium-vaapi-r16.patch
+        https://raw.githubusercontent.com/gcarq/inox-patchset/$pkgver/chromium-vaapi-r18.patch
         # Inox patchset
         https://raw.githubusercontent.com/gcarq/inox-patchset/$pkgver/0001-fix-building-without-safebrowsing.patch
         https://raw.githubusercontent.com/gcarq/inox-patchset/$pkgver/0002-fix-building-without-reporting.patch
@@ -63,9 +59,9 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
         https://raw.githubusercontent.com/gcarq/inox-patchset/$pkgver/0020-launcher-branding.patch
         https://raw.githubusercontent.com/gcarq/inox-patchset/$pkgver/0021-disable-rlz.patch
         https://raw.githubusercontent.com/gcarq/inox-patchset/$pkgver/9000-disable-metrics.patch)
-sha256sums=('93666448c6b96ec83e6a35a64cff40db4eb92a154fe1db4e7dab4761d0e38687'
-            '4dc3428f2c927955d9ae117f2fb24d098cc6dd67adb760ac9c82b522ec8b0587'
-            '2771c049b66c9aba3b945fe065f2610f164d55506eb5d71751a26aaf8b40d4ee'
+sha256sums=('be75a5b5f8c5789d359238f374a43bf52ded49425f13ed68b8021c24e2e264b2'
+            '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1'
+            '34eb82c625b7050021a8d3334ceaa7fa3d042dd816c228c14abb52b29796f7b9'
             '71471fa4690894420f9e04a2e9a622af620d92ac2714a35f9a4c4e90fa3968dd'
             '4a533acefbbc1567b0d74a1c0903e9179b8c59c1beabe748850795815366e509'
             '7b88830c5e0e9819f514ad68aae885d427541a907e25607e47dee1b0f38975fd'
@@ -75,35 +71,32 @@ sha256sums=('93666448c6b96ec83e6a35a64cff40db4eb92a154fe1db4e7dab4761d0e38687'
             '896993987d4ef9f0ac7db454f288117316c2c80ed0b6764019afd760db222dad'
             '3df9b3bbdc07fde63d9e400954dcc6ab6e0e5454f0ef6447570eef0549337354'
             'e3fb73b43bb8c69ff517e66b2cac73d6e759fd240003eb35598df9af442422fe'
+            'bd5e0e61df3f89172590801aea7c8ac75162c10c7fe83e262e96a14388d1633a'
             'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3'
             'd6fdcb922e5a7fbe15759d39ccc8ea4225821c44d98054ce0f23f9d1f00c9808'
-            '4495e8b29dae242c79ffe4beefc5171eb3c7aacb7e9aebfd2d4d69b9d8c958d3'
-            'fe0ab86aa5b0072db730eccda3e1582ebed4af25815bfd49fe0da24cf63ca902'
-            'c00d2506f1078b38a8ebec474a7318e76a61db1298afb40088a34210f137210f'
-            'acae2de43c123f19523c4fca3af19c671acbe76f76bd40e285fe3b08cddb7044'
-            '5bc4f5dc5e9c8d71cf273338f65e82efcebc902e645affb35659532dcf9ad1af'
-            'ae84e4eed9969057dd9d3ecff040e02480993c17ff05e9674d5e24e398704a60'
-            'b7261e4063b0532139b72f20675bb58c743d95022c7368019deb012b2c777f83'
-            'ef9000eaaa5c0a28f0e4cb31139c7f2b454192532d8469329f5f6f95c21769e0'
+            '514f40accb2b4bc439df43f11bb7154a812eeb9fa61777b3d986cfa6bb109ebd'
+            '6c5f41579c43b192aaa2fd2fa4de06280cb3d4b500621961cb5bfb48d95d471e'
+            'aa86ff1fc7b21d9d4523a681eeb46314f00e90558e9069252ab7c4f7b593f5f1'
+            'f639f11ced3432cb12a19528e4d9a7f1bbcb2f9fd46f2969d8d0b567e27ec407'
             'fb91a7e30e2615e4eb0626b0fdcf97b92d4a727a52023730f408b02fee436c8d'
-            '72cd12b9064573fc1c7d88d606985ef180efdcec3815b0185c6038ec8216a471'
-            '034cce5fb219a293284a4c01f7e4d7ad6ab262eb6fb9065dc65a4b18e885da7f'
-            '7781ecd43e3c28f7d1e9158e043d6f98a190b5ee3c2c5ebe91644ea27e0b42ee'
-            'a5dde3ff6cd4adeef7eb099839d8d17a3bfeb89ec6bb66eba3e89d741743c9c0'
-            'cf050473adae5b83680346b369997b5ead55dce282515f185e4096c5ed39f11d'
-            '3190a507dfa00e863a0e622b5738db5cf19947f696ac7a790f427510cc15d1e1'
+            '7193573d2c4c5e9af35c5364ae6b92d714ebdd8224221cd7326a3afde5abc5a1'
+            'f93dd17ffd5407cb2384be5e90b5ef00e02762ab456656072ecb67d9e1b61ad4'
+            'a28f1428accff9e967c4d0f970fac05c156b96534bc9eefb60f0175116ed7db2'
+            'f657866cbce253c6854cf30c9564ef59198509ed8274832d4d3e0bad303a89ca'
+            '306b29cdfd2def2353b6c4a582fb6fcc7989a6fe009412d4abf2e2daf84ff9d1'
+            '3a8979ca0cae33a836d27f825ac2e15028c2656efce2ee70c1f8ce7d094f5c1c'
             '6fdea7a737959b226165dc3b6dd347de1e09e6e237acc444116df007ba0a7c57'
             '6427fea42b1cc6cf9aaae883c75c2209360344125827e1d6b15666faaf3c10a9'
             '60ecb418ff8728f67ac9617216f68dcc1ba0fa4d4e47e2da1fc4e63b5c91bfea'
-            'f80106b8127b60a62c006653154a26ebe68dd4aec5c551bae5321fa4e5ccef3f'
-            '795686bf0dd7bfac0f596155be8fc7ed3f6294a6b764f793cd1614085562ce38'
-            '5dc10c49cfc3ea65505e07366420eda0fc4878d0b0cebbfbcd8ad7daa88b3ded'
+            'c918a2495273f1ae6ab94d3c215b97c00943a5e8cf14c7025c58a955dca71f53'
+            '44db6f3733332167518e947c72c9661b74c757aeed1b4912f94f3f34aeea067a'
+            '7e12969dda184e24eccd6e5bf2b8244ba1336c2dc2dbf0494c153d09923723fd'
             'e407da0596e044971631c0883a83bd75665535f1b913df32ba08ca8cd5d4b16e'
-            'cb2bd17fbbd9184f15eb24d3b23deca92d06cb4b9ec31bd6944504e130d69ff8'
-            'c17556772059a64873ddac383f2976e3befb5c07c3019b641c989ffb5683c4cd'
+            'a6d29b8c041e0a367ad68e817c703e03bed63bff26c47d7d94ae280af45b9457'
+            'e297609b4673e3b35c5843a9c3e49ab1b04bc9a02e9e178d5cee58b6ca8cda01'
             '80d2974001708c288a54c24e1dc896ef25916552b740765f6066a244c05ffcd5'
             'dbe942b1eaba525ca6b81d398462a70360fc2043cbfe5d4105657c3bd721e592'
-            '8ff834ed3f34fbbc969d2ec0abb3010033d1f3a3aa2db9fc81608e955a7d561c')
+            'f53b4d111fc119bd61ca662aab7db530649086ef6af1cd8c779027da088143a9')
 
 # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
 # Keys are the names in the above script; values are the dependencies in Arch
@@ -117,7 +110,7 @@ declare -gA _system_libs=(
   [libdrm]=
   [libjpeg]=libjpeg
   #[libpng]=libpng            # https://crbug.com/752403#c10
-  [libvpx]=libvpx
+  #[libvpx]=libvpx
   [libwebp]=libwebp
   #[libxml]=libxml2           # https://crbug.com/736026
   [libxslt]=libxslt
@@ -146,26 +139,31 @@ prepare() {
   fi
   echo "LASTCHANGE=$_chrome_build_hash-" >build/util/LASTCHANGE
 
+  # Allow building against system libraries in official builds
+  sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+    tools/generate_shim_headers/generate_shim_headers.py
+
   # Enable support for the Widevine CDM plugin
   # libwidevinecdm.so is not included, but can be copied over from Chrome
   # (Version string doesn't seem to matter so let's go with "Pinkie Pie")
   sed "s/@WIDEVINE_VERSION@/Pinkie Pie/" ../chromium-widevine.patch |
     patch -Np1
 
+  # Work around broken screen sharing in Google Meet
+  # https://crbug.com/829916#c16
+  sed -i 's/"Chromium/"Chrome/' chrome/common/chrome_content_client_constants.cc
+
   # https://crbug.com/822820
   patch -Np1 -i ../fix-crash-in-is_cfi-true-builds-with-unbundled-ICU.patch
 
+  # https://crbug.com/821881
+  patch -Np1 -i ../fix-frame-buttons-rendering-too-large-when-using-OSX.patch
+
   # https://crbug.com/skia/6663#c10
   patch -Np4 -i ../chromium-skia-harmony.patch
 
-  # Fixes from Gentoo
-  patch -Np1 -i ../chromium-clang-r2.patch
-  patch -Np1 -i ../chromium-math.h-r0.patch
-  patch -Np1 -i ../chromium-stdint.patch
-
   msg2 'Applying VA-API patches'
-  patch -Np1 -i ../chromium-vaapi-init-r16.patch
-  patch -Np1 -i ../chromium-vaapi-r16.patch
+  patch -Np1 -i ../chromium-vaapi-r18.patch
 
   msg2 'Applying Inox patchset'
   # Apply patches to fix building
@@ -193,14 +191,9 @@ prepare() {
   patch -Np1 -i ../0021-disable-rlz.patch
   patch -Np1 -i ../9000-disable-metrics.patch
 
-  # Use Python 2
-  find . -name '*.py' -exec sed -i -r 's|/usr/bin/python$|&2|g' {} +
+  # Force script incompatible with Python 3 to use /usr/bin/python2
+  sed -i '1s|python$|&2|' third_party/dom_distiller_js/protoc_plugins/*.py
 
-  # There are still a lot of relative calls which need a workaround
-  mkdir -p "$srcdir/python2-path"
-  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
-
-  # Setup nodejs dependency
   mkdir -p third_party/node/linux/node-linux-x64/bin
   ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
 
@@ -237,10 +230,6 @@ build() {
     export CCACHE_SLOPPINESS=time_macros
   fi
 
-  export PATH="$srcdir/python2-path:$PATH"
-  export TMPDIR="$srcdir/temp"
-  mkdir -p "$TMPDIR"
-
   export CC=clang
   export CXX=clang++
   export AR=llvm-ar
@@ -250,10 +239,8 @@ build() {
     'custom_toolchain="//build/toolchain/linux/unbundle:default"'
     'host_toolchain="//build/toolchain/linux/unbundle:default"'
     'clang_use_chrome_plugins=false'
-    'is_cfi=true'
-    'symbol_level=0'
+    'is_official_build=true' # implies is_cfi=true on x86_64
     'is_debug=false'
-    'fatal_linker_warnings=false'
     'treat_warnings_as_errors=false'
     'fieldtrial_testing_like_official_build=true'
     'remove_webcore_debug_symbols=true'
@@ -261,7 +248,6 @@ build() {
     'proprietary_codecs=true'
     'link_pulseaudio=true'
     'use_gnome_keyring=false'
-    'use_gold=false'
     'use_sysroot=false'
     'linux_use_bundled_binutils=false'
     'use_custom_libcxx=false'
@@ -277,7 +263,15 @@ build() {
     'safe_browsing_mode=0'
   )
 
+  # Facilitate deterministic builds (taken from build/config/compiler/BUILD.gn)
+  CFLAGS+='   -Wno-builtin-macro-redefined'
+  CXXFLAGS+=' -Wno-builtin-macro-redefined'
+  CPPFLAGS+=' -D__DATE__=  -D__TIME__=  -D__TIMESTAMP__='
+
   if check_option strip y; then
+    _flags+=('symbol_level=0')
+
+    # Mimic exclude_unwind_tables=true
     CFLAGS+='   -fno-unwind-tables -fno-asynchronous-unwind-tables'
     CXXFLAGS+=' -fno-unwind-tables -fno-asynchronous-unwind-tables'
     CPPFLAGS+=' -DNO_UNWIND_TABLES'