uppkg -> 101.0.4951.64-1

4 files changed, 73 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fa32eb6e6ced..ee67f7348aab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ungoogled-chromium-xdg
 	pkgdesc = A lightweight approach to removing Google web service dependency - without creating a useless ~/.pki directory
-	pkgver = 101.0.4951.54
+	pkgver = 101.0.4951.64
 	pkgrel = 1
 	url = https://github.com/Eloston/ungoogled-chromium
 	arch = x86_64
@@ -52,9 +52,11 @@ pkgbase = ungoogled-chromium-xdg
 	conflicts = chromium
 	options = debug
 	options = !lto
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-101.0.4951.54.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-101.0.4951.64.tar.xz
 	source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz
 	source = https://github.com/stha09/chromium-patches/releases/download/chromium-101-patchset-4/chromium-101-patchset-4.tar.xz
+	source = fix-no-member-named-tie-in-namespace-std.patch
+	source = iwyu-add-utility-for-std-exchange.patch
 	source = enable-GlobalMediaControlsCastStartStop.patch
 	source = chromium-libxml-unbundle.patch
 	source = sql-make-VirtualCursor-standard-layout-type.patch
@@ -62,13 +64,15 @@ pkgbase = ungoogled-chromium-xdg
 	source = xdg-basedir.patch
 	source = no-omnibox-suggestion-autocomplete.patch
 	source = index.html
-	source = ungoogled-chromium-101.0.4951.54-1.tar.gz::https://github.com/Eloston/ungoogled-chromium/archive/101.0.4951.54-1.tar.gz
+	source = ungoogled-chromium-101.0.4951.64-1.tar.gz::https://github.com/Eloston/ungoogled-chromium/archive/101.0.4951.64-1.tar.gz
 	source = chromium-drirc-disable-10bpc-color-configs.conf
 	source = ozone-add-va-api-support-to-wayland.patch
 	source = wayland-egl.patch
-	sha256sums = c26cc6fd453d9a42a6b5e46fa4f3ee62ed368bb78101512b6816bc5d8f4200b5
+	sha256sums = 9c5896e4135563453ac10d15698c18ef61eb5535dc611325b230ece4c5a8d8f7
 	sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
 	sha256sums = 8ed519d21ccd8b382ddd384e9c15306a60d2e3495f48a62dea07c9be9bbffebd
+	sha256sums = 7ad0106161bbf25e2e603ae1a723ae4217155ebb26eb4778363ad396e8c14156
+	sha256sums = 6f666ef0acb08704ca58cc0d5e97e7ce64d8fea51042e593adae1ce15a61231c
 	sha256sums = 779fb13f2494209d3a7f1f23a823e59b9dded601866d3ab095937a1a04e19ac6
 	sha256sums = fd3bf124aacc45f2d0a4f1dd86303fa7f2a3d4f4eeaf33854631d6cb39e12485
 	sha256sums = b94b2e88f63cfb7087486508b8139599c89f96d7a4181c61fec4b4e250ca327a
@@ -76,7 +80,7 @@ pkgbase = ungoogled-chromium-xdg
 	sha256sums = cd844867b5b2197ad097662fee32579a7091dfba1d46cb438c4c7e696690440a
 	sha256sums = ff1591fa38e0ede7e883dc7494b813641b7a1a7cb1ded00d9baaee987c1dbea8
 	sha256sums = a4cdd2b86f32d5302c2792be841ff40d982b19bb58a4e63df9d77f4c706b8665
-	sha256sums = 8c5da085191a8586bf52ff3bbd0548f1af0fe1792c5db8530d4b158df83a092b
+	sha256sums = eb70d0260f121faa6e2efd8e80a5e258f23474a214ff9f4f112bdcffdaaadd83
 	sha256sums = babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb
 	sha256sums = 07bdc1b3fc8f0d0a4804d111c46ce3343cd7824de562f2848d429b917ce4bcfd
 	sha256sums = 34d08ea93cb4762cb33c7cffe931358008af32265fc720f2762f0179c3973574
diff --git a/PKGBUILD b/PKGBUILD
index 11f8843f45f7..65fb0ea456ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=ungoogled-chromium-xdg
-pkgver=101.0.4951.54
+pkgver=101.0.4951.64
 pkgrel=1
 _launcher_ver=8
 _gcc_patchset=4
@@ -31,6 +31,8 @@ options=('debug' '!lto') # Chromium adds its own flags for ThinLTO
 source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz
         https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver/chromium-launcher-$_launcher_ver.tar.gz
         https://github.com/stha09/chromium-patches/releases/download/chromium-${pkgver%%.*}-patchset-$_gcc_patchset/chromium-${pkgver%%.*}-patchset-$_gcc_patchset.tar.xz
+        fix-no-member-named-tie-in-namespace-std.patch
+        iwyu-add-utility-for-std-exchange.patch
         enable-GlobalMediaControlsCastStartStop.patch
         chromium-libxml-unbundle.patch
         sql-make-VirtualCursor-standard-layout-type.patch
@@ -38,9 +40,11 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
         xdg-basedir.patch
         no-omnibox-suggestion-autocomplete.patch
         index.html)
-sha256sums=('c26cc6fd453d9a42a6b5e46fa4f3ee62ed368bb78101512b6816bc5d8f4200b5'
+sha256sums=('9c5896e4135563453ac10d15698c18ef61eb5535dc611325b230ece4c5a8d8f7'
             '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
             '8ed519d21ccd8b382ddd384e9c15306a60d2e3495f48a62dea07c9be9bbffebd'
+            '7ad0106161bbf25e2e603ae1a723ae4217155ebb26eb4778363ad396e8c14156'
+            '6f666ef0acb08704ca58cc0d5e97e7ce64d8fea51042e593adae1ce15a61231c'
             '779fb13f2494209d3a7f1f23a823e59b9dded601866d3ab095937a1a04e19ac6'
             'fd3bf124aacc45f2d0a4f1dd86303fa7f2a3d4f4eeaf33854631d6cb39e12485'
             'b94b2e88f63cfb7087486508b8139599c89f96d7a4181c61fec4b4e250ca327a'
@@ -58,7 +62,7 @@ source=(${source[@]}
         ozone-add-va-api-support-to-wayland.patch
         wayland-egl.patch)
 sha256sums=(${sha256sums[@]}
-            '8c5da085191a8586bf52ff3bbd0548f1af0fe1792c5db8530d4b158df83a092b'
+            'eb70d0260f121faa6e2efd8e80a5e258f23474a214ff9f4f112bdcffdaaadd83'
             'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb'
             '07bdc1b3fc8f0d0a4804d111c46ce3343cd7824de562f2848d429b917ce4bcfd'
             '34d08ea93cb4762cb33c7cffe931358008af32265fc720f2762f0179c3973574')
@@ -109,6 +113,8 @@ prepare() {
   patch -Np1 -i ../use-oauth2-client-switches-as-default.patch
 
   # Upstream fixes
+  patch -Np1 -i ../fix-no-member-named-tie-in-namespace-std.patch
+  patch -Np1 -i ../iwyu-add-utility-for-std-exchange.patch
   # Revert kGlobalMediaControlsCastStartStop enabled by default
   # https://crbug.com/1314342
   patch -Rp1 -F3 -i ../enable-GlobalMediaControlsCastStartStop.patch
diff --git a/fix-no-member-named-tie-in-namespace-std.patch b/fix-no-member-named-tie-in-namespace-std.patch
new file mode 100644
index 000000000000..96154345765e
--- /dev/null
+++ b/fix-no-member-named-tie-in-namespace-std.patch
@@ -0,0 +1,28 @@
+From 68c9c63c0b148ff5246a0cdad59000697bbd8645 Mon Sep 17 00:00:00 2001
+From: Maksim Sisov <msisov@igalia.com>
+Date: Tue, 12 Apr 2022 15:11:34 +0000
+Subject: [PATCH] Fix no member named 'tie' in namespace 'std'
+
+Bug: None
+Change-Id: I8a097af2b16b738fa9bbb8231536bca85522f350
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3581869
+Auto-Submit: Maksim Sisov <msisov@igalia.com>
+Reviewed-by: Matt Menke <mmenke@chromium.org>
+Commit-Queue: Matt Menke <mmenke@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#991529}
+---
+ net/base/address_list.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/net/base/address_list.h b/net/base/address_list.h
+index 029af1aded3..a93093e41f3 100644
+--- a/net/base/address_list.h
++++ b/net/base/address_list.h
+@@ -8,6 +8,7 @@
+ #include <stdint.h>
+ 
+ #include <string>
++#include <tuple>
+ #include <utility>
+ #include <vector>
+ 
diff --git a/iwyu-add-utility-for-std-exchange.patch b/iwyu-add-utility-for-std-exchange.patch
new file mode 100644
index 000000000000..3bc4693e19fb
--- /dev/null
+++ b/iwyu-add-utility-for-std-exchange.patch
@@ -0,0 +1,27 @@
+From 9dd0503835dc875807ab63efb1f477bffed2a852 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Mon, 25 Apr 2022 23:18:30 +0000
+Subject: [PATCH] IWYU: add utility for std::exchange
+
+Bug: 957519
+Change-Id: I307d520fdc34d2452018ed32a505e7e519739410
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3604643
+Reviewed-by: Wez <wez@chromium.org>
+Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
+Cr-Commit-Position: refs/heads/main@{#995855}
+---
+ base/third_party/symbolize/symbolize.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/base/third_party/symbolize/symbolize.h b/base/third_party/symbolize/symbolize.h
+index 99029a968d5..278078f6071 100644
+--- a/base/third_party/symbolize/symbolize.h
++++ b/base/third_party/symbolize/symbolize.h
+@@ -61,6 +61,7 @@
+ #ifdef HAVE_SYMBOLIZE
+ 
+ #include <algorithm>
++#include <utility>
+ 
+ #if defined(__ELF__)  // defined by gcc
+ #if defined(__OpenBSD__)