1.17.73

3 files changed, 43 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2a33ec13d88..19bed6ff91da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = brave
 	pkgdesc = A web browser that stops ads and trackers by default
-	pkgver = 1.16.76
+	pkgver = 1.17.73
 	pkgrel = 1
 	url = https://www.brave.com/download
 	arch = x86_64
@@ -27,27 +27,19 @@ pkgbase = brave
 	optdepends = org.freedesktop.secrets: password storage backend on GNOME / Xfce
 	optdepends = kwallet: for storing passwords in KWallet on KDE desktops
 	optdepends = sccache: For faster builds
-	source = https://github.com/brave/brave-browser/archive/v1.16.76.tar.gz
+	source = https://github.com/brave/brave-browser/archive/v1.17.73.tar.gz
 	source = brave-launcher
 	source = brave-browser.desktop
-	source = https://github.com/stha09/chromium-patches/releases/download/chromium-86-patchset-6/chromium-86-patchset-6.tar.xz
+	source = chromium-launcher-6.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v6.tar.gz
+	source = https://github.com/stha09/chromium-patches/releases/download/chromium-87-patchset-9/chromium-87-patchset-9.tar.xz
 	source = brave-custom-build.patch
-	source = fix-invalid-end-iterator-usage-in-CookieMonster.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/fix-invalid-end-iterator-usage-in-CookieMonster.patch?h=packages/chromium&id=a702396adb03e094bfbe836ff05a451465fc986d
-	source = only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch?h=packages/chromium&id=a702396adb03e094bfbe836ff05a451465fc986d
-	source = remove-dead-reloc-in-nonalloc-LD-flags.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/remove-dead-reloc-in-nonalloc-LD-flags.patch?h=packages/chromium&id=a702396adb03e094bfbe836ff05a451465fc986d
-	source = check-for-enable-accelerated-video-decode-on-Linux.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/check-for-enable-accelerated-video-decode-on-Linux.patch?h=packages/chromium&id=a702396adb03e094bfbe836ff05a451465fc986d
-	source = xproto-fix-underflow-in-Fp1616ToDouble.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/xproto-fix-underflow-in-Fp1616ToDouble.patch?h=packages/chromium&id=a702396adb03e094bfbe836ff05a451465fc986d
-	source = chromium-skia-harmony.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-skia-harmony.patch?h=packages/chromium&id=a702396adb03e094bfbe836ff05a451465fc986d
-	sha256sums = 1cf73c0c86947c268cdce3a02d3a1fbcd52e4f5a754fac5fea0cd36555d518ad
+	source = chromium-skia-harmony.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-skia-harmony.patch?h=packages/chromium&id=63e8313d989fbb6f05b8886cefff67a643d3d888
+	sha256sums = 090b705dab4e89f8b3ebc5abf879a1eb1b44ce0d29fa15b6a49cecdc1efe7888
 	sha256sums = 725e2d0c32da4b3de2c27a02abaf2f5acca7a25dcea563ae458c537ac4ffc4d5
 	sha256sums = fa6ed4341e5fc092703535b8becaa3743cb33c72f683ef450edd3ef66f70d42d
-	sha256sums = 6f9ab35fa2c9e6e34ec454b829b7b87adaebc10cacecd1ac1daa67035ee44aba
-	sha256sums = a6ab368b3e8f1768501cebdf0fe4bab331d16eb0aff581b42fa32b208081acf7
-	sha256sums = 69d8b7a439db1af4713245ddf5f44ca647283ba833a8733e848033ebdaf03cdc
-	sha256sums = 7514c6c81a64a5457b66494a366fbb39005563eecc48d1a39033dd06aec4e300
-	sha256sums = 7cace84d7494190e7882d3e637820646ec8d64808f0a2128c515bd44991a3790
-	sha256sums = 03d03a39b2afa40083eb8ccb9616a51619f71da92348effc8ee289cbda10128b
-	sha256sums = 1ec617b362bf97cce4254debd04d8396f17dec0ae1071b52ec8c1c3d86dbd322
+	sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1
+	sha256sums = c99934bcd2f3ae8ea9620f5f59a94338b2cf739647f04c28c8a551d9083fa7e9
+	sha256sums = d492ca5946e8faba67be4893e89677c7053bdecafe06eed1df652bd37a948286
 	sha256sums = 771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1
 
 pkgname = brave
diff --git a/PKGBUILD b/PKGBUILD
index 7ca90fa1f842..db160c0ce1ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -27,7 +27,7 @@ fi
 ##
 
 pkgname=brave
-pkgver=1.16.76
+pkgver=1.17.73
 pkgrel=1
 pkgdesc='A web browser that stops ads and trackers by default'
 arch=('x86_64')
@@ -41,21 +41,18 @@ optdepends=('cups: Printer support'
             'org.freedesktop.secrets: password storage backend on GNOME / Xfce'
             'kwallet: for storing passwords in KWallet on KDE desktops'
             'sccache: For faster builds')
-chromium_base_ver="86"
-patchset="6"
+chromium_base_ver="87"
+patchset="9"
 patchset_name="chromium-${chromium_base_ver}-patchset-${patchset}"
+_launcher_ver=6
 source=("https://github.com/brave/brave-browser/archive/v${pkgver}.tar.gz"
         'brave-launcher'
         'brave-browser.desktop'
+        "chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz"
         "https://github.com/stha09/chromium-patches/releases/download/${patchset_name}/${patchset_name}.tar.xz"
         'brave-custom-build.patch')
-arch_revision=a702396adb03e094bfbe836ff05a451465fc986d
+arch_revision=63e8313d989fbb6f05b8886cefff67a643d3d888
 for Patches in \
-        fix-invalid-end-iterator-usage-in-CookieMonster.patch \
-        only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch \
-        remove-dead-reloc-in-nonalloc-LD-flags.patch \
-        check-for-enable-accelerated-video-decode-on-Linux.patch \
-        xproto-fix-underflow-in-Fp1616ToDouble.patch \
         chromium-skia-harmony.patch
 do
   source+=("${Patches}::https://git.archlinux.org/svntogit/packages.git/plain/trunk/${Patches}?h=packages/chromium&id=${arch_revision}")
@@ -64,16 +61,12 @@ done
 # VAAPI patches from chromium-vaapi in AUR
 #source+=("vdpau-support.patch::https://aur.archlinux.org/cgit/aur.git/plain/vdpau-support.patch?h=chromium-vaapi&id=7c05464a8700b1a6144258320b2b33b352385f77")
 
-sha256sums=('1cf73c0c86947c268cdce3a02d3a1fbcd52e4f5a754fac5fea0cd36555d518ad'
+sha256sums=('090b705dab4e89f8b3ebc5abf879a1eb1b44ce0d29fa15b6a49cecdc1efe7888'
             '725e2d0c32da4b3de2c27a02abaf2f5acca7a25dcea563ae458c537ac4ffc4d5'
             'fa6ed4341e5fc092703535b8becaa3743cb33c72f683ef450edd3ef66f70d42d'
-            '6f9ab35fa2c9e6e34ec454b829b7b87adaebc10cacecd1ac1daa67035ee44aba'
-            'a6ab368b3e8f1768501cebdf0fe4bab331d16eb0aff581b42fa32b208081acf7'
-            '69d8b7a439db1af4713245ddf5f44ca647283ba833a8733e848033ebdaf03cdc'
-            '7514c6c81a64a5457b66494a366fbb39005563eecc48d1a39033dd06aec4e300'
-            '7cace84d7494190e7882d3e637820646ec8d64808f0a2128c515bd44991a3790'
-            '03d03a39b2afa40083eb8ccb9616a51619f71da92348effc8ee289cbda10128b'
-            '1ec617b362bf97cce4254debd04d8396f17dec0ae1071b52ec8c1c3d86dbd322'
+            '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1'
+            'c99934bcd2f3ae8ea9620f5f59a94338b2cf739647f04c28c8a551d9083fa7e9'
+            'd492ca5946e8faba67be4893e89677c7053bdecafe06eed1df652bd37a948286'
             '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1')
 
 # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
@@ -123,6 +116,7 @@ prepare() {
   npm install
   #npm run init || (npm run update_patches && npm run init)
   npm run init
+  #npm run sync -- --force
 
   msg2 "Apply Chromium patches..."
   cd src/
@@ -134,11 +128,10 @@ prepare() {
     third_party/libxml/chromium/*.cc
 
   # Upstream fixes
-  patch -Np1 -i "${srcdir}"/fix-invalid-end-iterator-usage-in-CookieMonster.patch
-  patch -Np1 -i "${srcdir}"/only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch
-  patch -Np1 -i "${srcdir}"/remove-dead-reloc-in-nonalloc-LD-flags.patch
-  patch -Np1 -i "${srcdir}"/check-for-enable-accelerated-video-decode-on-Linux.patch
-  patch -Np1 -i "${srcdir}"/xproto-fix-underflow-in-Fp1616ToDouble.patch
+
+  # Fixes for building with libstdc++ instead of libc++
+  patch -Np1 -i ../../patches/chromium-87-ServiceWorkerContainerHost-crash.patch
+  patch -Np1 -i ../../patches/chromium-87-openscreen-include.patch
 
   # https://crbug.com/skia/6663#c10
   patch -Np0 -i "${srcdir}"/chromium-skia-harmony.patch
@@ -154,11 +147,11 @@ prepare() {
     sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
         tools/generate_shim_headers/generate_shim_headers.py
 
+    sed -i $'s/\r$//' \
+        brave/vendor/bat-native-ads/src/bat/ads/internal/filters/ads_history_conversion_filter.cc
+
     msg2 "Add patches for custom build"
-    local _patch
-    for _patch in "$srcdir/brave-custom-build.patch" "$srcdir/patches"/*.patch; do
-      patch -Np1 -i "$_patch"
-    done
+    patch -Np1 -i "$srcdir/brave-custom-build.patch"
 
     # Remove bundled libraries for which we will use the system copies; this
     # *should* do what the remove_bundled_libraries.py script does, with the
diff --git a/brave-custom-build.patch b/brave-custom-build.patch
index 46550694b0fe..82e10a29a3cf 100644
--- a/brave-custom-build.patch
+++ b/brave-custom-build.patch
@@ -133,31 +133,31 @@ index 67bd13c94d..5e8e8736f5 100644
 --- a/brave/vendor/bat-native-ads/src/bat/ads/internal/filters/ads_history_conversion_filter.cc
 +++ b/brave/vendor/bat-native-ads/src/bat/ads/internal/filters/ads_history_conversion_filter.cc
 @@ -4,6 +4,7 @@
-  * You can obtain one at http://mozilla.org/MPL/2.0/. */

- 

- #include "bat/ads/internal/filters/ads_history_conversion_filter.h"

-+#include <algorithm>

- 

- namespace ads {

- 

-diff --git a/brave/components/ipfs/common/ipfs_utils.cc b/brave/components/ipfs/common/ipfs_utils.cc
+  * You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
+ #include "bat/ads/internal/filters/ads_history_conversion_filter.h"
++#include <algorithm>
+ 
+ namespace ads {
+ 
+diff --git a/brave/components/ipfs/ipfs_utils.cc b/brave/components/ipfs/ipfs_utils.cc
 index de984233dc..9414da92a3 100644
---- a/brave/components/ipfs/common/ipfs_utils.cc
-+++ b/brave/components/ipfs/common/ipfs_utils.cc
+--- a/brave/components/ipfs/ipfs_utils.cc
++++ b/brave/components/ipfs/ipfs_utils.cc
 @@ -6,6 +6,7 @@
- #include "brave/components/ipfs/common/ipfs_utils.h"
+ #include "brave/components/ipfs/ipfs_utils.h"
  
  #include <vector>
 +#include <algorithm>
  
  #include "url/gurl.h"
  #include "extensions/common/url_pattern.h"
-diff --git a/brave/components/ipfs/browser/translate_ipfs_uri.cc b/brave/components/ipfs/browser/translate_ipfs_uri.cc
+diff --git a/brave/components/ipfs/translate_ipfs_uri.cc b/brave/components/ipfs/translate_ipfs_uri.cc
 index d3bf012a5f..794ba63eb7 100644
---- a/brave/components/ipfs/browser/translate_ipfs_uri.cc
-+++ b/brave/components/ipfs/browser/translate_ipfs_uri.cc
+--- a/brave/components/ipfs/translate_ipfs_uri.cc
++++ b/brave/components/ipfs/translate_ipfs_uri.cc
 @@ -6,6 +6,7 @@
- #include "brave/components/ipfs/browser/translate_ipfs_uri.h"
+ #include "brave/components/ipfs/translate_ipfs_uri.h"
  
  #include <string>
 +#include <algorithm>