upgpkg: ungoogled-chromium 94.0.4606.81-1

upstream release

3 files changed, 59 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4b78226b1f2e..27f4a1ddb812 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ungoogled-chromium
 	pkgdesc = A lightweight approach to removing Google web service dependency
-	pkgver = 94.0.4606.71
+	pkgver = 94.0.4606.81
 	pkgrel = 1
 	url = https://github.com/Eloston/ungoogled-chromium
 	arch = x86_64
@@ -50,32 +50,34 @@ pkgbase = ungoogled-chromium
 	optdepends = kwallet: support for storing passwords in KWallet on Plasma
 	provides = chromium
 	conflicts = chromium
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-94.0.4606.71.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-94.0.4606.81.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-94-patchset-3/chromium-94-patchset-3.tar.xz
 	source = replace-blacklist-with-ignorelist.patch
 	source = add-a-TODO-about-a-missing-pnacl-flag.patch
 	source = use-ffile-compilation-dir.patch
+	source = pipewire-do-not-typecheck-the-portal-session_handle.patch
 	source = sql-make-VirtualCursor-standard-layout-type.patch
 	source = chromium-93-ffmpeg-4.4.patch
 	source = chromium-94-ffmpeg-roll.patch
 	source = unexpire-accelerated-video-decode-flag.patch
 	source = use-oauth2-client-switches-as-default.patch
-	source = ungoogled-chromium-94.0.4606.71-1.tar.gz::https://github.com/Eloston/ungoogled-chromium/archive/94.0.4606.71-1.tar.gz
+	source = ungoogled-chromium-94.0.4606.81-1.tar.gz::https://github.com/Eloston/ungoogled-chromium/archive/94.0.4606.81-1.tar.gz
 	source = chromium-drirc-disable-10bpc-color-configs.conf
 	source = wayland-egl.patch
-	sha256sums = cabbba2e608c5ec110850b14ee5fead2608c44447a52edb80e2ba8261be3dc5b
+	sha256sums = 7071aa2b2caf48094c2ae816395948b4daec940606f4982ad5bbf68e5d2de598
 	sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
 	sha256sums = 22692bddaf2761c6ddf9ff0bc4722972bca4d4c5b2fd3e5dbdac7eb60d914320
 	sha256sums = d3344ba39b8c6ed202334ba7f441c70d81ddf8cdb15af1aa8c16e9a3a75fbb35
 	sha256sums = d53da216538f2e741a6e048ed103964a91a98e9a3c10c27fdfa34d4692fdc455
 	sha256sums = 921010cd8fab5f30be76c68b68c9b39fac9e21f4c4133bb709879592bbdf606e
+	sha256sums = 1889d890ff512a8b82a0f88972e78c78131177d8034750ff53577dfad99b3e3e
 	sha256sums = dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150
 	sha256sums = 1a9e074f417f8ffd78bcd6874d8e2e74a239905bf662f76a7755fa40dc476b57
 	sha256sums = 56acb6e743d2ab1ed9f3eb01700ade02521769978d03ac43226dec94659b3ace
 	sha256sums = 2a97b26c3d6821b15ef4ef1369905c6fa3e9c8da4877eb9af4361452a425290b
 	sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
-	sha256sums = 04a73a707205ab6461213fbfd25ecade807e6b609b14aa632a1ec777e3903b4b
+	sha256sums = dfb162c8824f98095bc5fa8928d44bcb5fb66a19873a5976b8059abe20cad6fe
 	sha256sums = babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb
 	sha256sums = 34d08ea93cb4762cb33c7cffe931358008af32265fc720f2762f0179c3973574
 
diff --git a/PKGBUILD b/PKGBUILD
index f3c9cbbfc032..298bea4a8ce5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=ungoogled-chromium
-pkgver=94.0.4606.71
+pkgver=94.0.4606.81
 pkgrel=1
 _launcher_ver=8
 _gcc_patchset=3
@@ -32,17 +32,19 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
         replace-blacklist-with-ignorelist.patch
         add-a-TODO-about-a-missing-pnacl-flag.patch
         use-ffile-compilation-dir.patch
+        pipewire-do-not-typecheck-the-portal-session_handle.patch
         sql-make-VirtualCursor-standard-layout-type.patch
         chromium-93-ffmpeg-4.4.patch
         chromium-94-ffmpeg-roll.patch
         unexpire-accelerated-video-decode-flag.patch
         use-oauth2-client-switches-as-default.patch)
-sha256sums=('cabbba2e608c5ec110850b14ee5fead2608c44447a52edb80e2ba8261be3dc5b'
+sha256sums=('7071aa2b2caf48094c2ae816395948b4daec940606f4982ad5bbf68e5d2de598'
             '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
             '22692bddaf2761c6ddf9ff0bc4722972bca4d4c5b2fd3e5dbdac7eb60d914320'
             'd3344ba39b8c6ed202334ba7f441c70d81ddf8cdb15af1aa8c16e9a3a75fbb35'
             'd53da216538f2e741a6e048ed103964a91a98e9a3c10c27fdfa34d4692fdc455'
             '921010cd8fab5f30be76c68b68c9b39fac9e21f4c4133bb709879592bbdf606e'
+            '1889d890ff512a8b82a0f88972e78c78131177d8034750ff53577dfad99b3e3e'
             'dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150'
             '1a9e074f417f8ffd78bcd6874d8e2e74a239905bf662f76a7755fa40dc476b57'
             '56acb6e743d2ab1ed9f3eb01700ade02521769978d03ac43226dec94659b3ace'
@@ -55,7 +57,7 @@ source=(${source[@]}
         chromium-drirc-disable-10bpc-color-configs.conf
         wayland-egl.patch)
 sha256sums=(${sha256sums[@]}
-            '04a73a707205ab6461213fbfd25ecade807e6b609b14aa632a1ec777e3903b4b'
+            'dfb162c8824f98095bc5fa8928d44bcb5fb66a19873a5976b8059abe20cad6fe'
             'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb'
             '34d08ea93cb4762cb33c7cffe931358008af32265fc720f2762f0179c3973574')
 
@@ -123,6 +125,9 @@ prepare() {
   patch -Rp1 -i ../add-a-TODO-about-a-missing-pnacl-flag.patch
   patch -Rp1 -i ../use-ffile-compilation-dir.patch
 
+  # Fix desktop sharing via Pipewire with xdg-desktop-portal 1.10
+  patch -Np1 -d third_party/webrtc <../pipewire-do-not-typecheck-the-portal-session_handle.patch
+
   # https://chromium-review.googlesource.com/c/chromium/src/+/2862724
   patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch
 
diff --git a/pipewire-do-not-typecheck-the-portal-session_handle.patch b/pipewire-do-not-typecheck-the-portal-session_handle.patch
new file mode 100644
index 000000000000..59bfa3d1838c
--- /dev/null
+++ b/pipewire-do-not-typecheck-the-portal-session_handle.patch
@@ -0,0 +1,44 @@
+From 408e4da26f1b782005ab10307c83892055d7ef45 Mon Sep 17 00:00:00 2001
+From: Robert Mader <robert.mader@posteo.de>
+Date: Mon, 20 Sep 2021 15:15:31 +0200
+Subject: [PATCH] Pipewire: Do not typecheck the portal session_handle
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Desktop sharing via Pipewire will break for clients updating to
+xdg-desktop-portal 1.10 due to a bug fix in the API implementation[1].
+
+This ports over a fix from OBS Studio[2] that also is used in the
+downstream Firefox WebRTC copy[3].
+
+1: https://github.com/flatpak/xdg-desktop-portal/pull/609
+2: https://github.com/obsproject/obs-studio/pull/5294
+3: https://phabricator.services.mozilla.com/D126053
+Bug: webrtc:13192
+Change-Id: I497dd1bb53cc39dee3732c2e0014e2e36a7afb6c
+Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/232329
+Reviewed-by: Erik Språng <sprang@webrtc.org>
+Reviewed-by: Tommi <tommi@webrtc.org>
+Commit-Queue: Tommi <tommi@webrtc.org>
+Cr-Commit-Position: refs/heads/main@{#35153}
+---
+ modules/desktop_capture/linux/base_capturer_pipewire.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/modules/desktop_capture/linux/base_capturer_pipewire.cc b/modules/desktop_capture/linux/base_capturer_pipewire.cc
+index 2d5e973..45229b2 100644
+--- a/modules/desktop_capture/linux/base_capturer_pipewire.cc
++++ b/modules/desktop_capture/linux/base_capturer_pipewire.cc
+@@ -801,8 +801,9 @@ void BaseCapturerPipeWire::OnSessionRequestResponseSignal(
+   Scoped<GVariant> response_data;
+   g_variant_get(parameters, "(u@a{sv})", &portal_response,
+                 response_data.receive());
+-  g_variant_lookup(response_data.get(), "session_handle", "s",
+-                   &that->session_handle_);
++  Scoped<GVariant> session_handle(
++      g_variant_lookup_value(response_data.get(), "session_handle", nullptr));
++  that->session_handle_ = g_variant_dup_string(session_handle.get(), nullptr);
+ 
+   if (!that->session_handle_ || portal_response) {
+     RTC_LOG(LS_ERROR)