From f76e5b58947d6573d9efc45d38e3d456fe429be6 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 5 Oct 2021 13:12:33 -0700
Subject: Updated to 93.0

---
 ...-Don-t-typecheck-the-pipewire-session_han.patch | 40 ----------------------
 PKGBUILD                                           |  8 ++---
 2 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 0002-Bug-1731495-Don-t-typecheck-the-pipewire-session_han.patch

diff --git a/0002-Bug-1731495-Don-t-typecheck-the-pipewire-session_han.patch b/0002-Bug-1731495-Don-t-typecheck-the-pipewire-session_han.patch
deleted file mode 100644
index 28504ad..0000000
--- a/0002-Bug-1731495-Don-t-typecheck-the-pipewire-session_han.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Sun, 19 Sep 2021 17:26:30 +0200
-Subject: [PATCH] Bug 1731495 - Don't typecheck the pipewire session_handle.
- r?rmader
-
-Since xdg-desktop-portal 1.10.0, the type is "o" (an object path string)
-instead of "s" (a normal string). g_variant_lookup fails if the type
-doesn't match exactly, even though both are strings.
-
-Use g_variant_lookup_value to get the field value, telling it not to
-typecheck. Use g_variant_dup_string to extract the string, which doesn't
-care about the exact type, so this code should work with all versions of
-xdg-desktop-portal.
-
-Following a similar fix to OBS, see
-https://github.com/obsproject/obs-studio/commit/ef0540c0d7df.
----
- .../desktop_capture/linux/base_capturer_pipewire.cc       | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc b/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-index 236fc09c8a96b..2c4489fb62c6c 100644
---- a/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-+++ b/third_party/libwebrtc/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-@@ -589,8 +589,12 @@ void BaseCapturerPipeWire::OnSessionRequestResponseSignal(
-   guint32 portal_response;
-   GVariant* response_data;
-   g_variant_get(parameters, "(u@a{sv})", &portal_response, &response_data);
--  g_variant_lookup(response_data, "session_handle", "s",
--                   &that->session_handle_);
-+
-+  GVariant* session_handle =
-+      g_variant_lookup_value(response_data, "session_handle", NULL);
-+  that->session_handle_ = g_variant_dup_string(session_handle, NULL);
-+
-+  g_variant_unref(session_handle);
-   g_variant_unref(response_data);
- 
-   if (!that->session_handle_ || portal_response) {
diff --git a/PKGBUILD b/PKGBUILD
index f7786a4..7ac6001 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _modclang=1
 _modpgo=0
 
 pkgname=firefox
-pkgver=92.0.1
+pkgver=93.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64 aarch64)
@@ -44,7 +44,6 @@ conflicts=(firefox-esr)
 source=(
         "https://archive.mozilla.org/pub/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.xz"{,.asc}
         0001-Use-remoting-name-for-GDK-application-names.patch
-        0002-Bug-1731495-Don-t-typecheck-the-pipewire-session_han.patch
         $pkgname.desktop
         identity-icons-brand.svg
         distribution.ini
@@ -58,10 +57,9 @@ source=(
         arc4_remove-health-reporting.patch
         arc4_remove-system-addons.patch
         )
-b2sums=('021aaed695994145f4dec0a6d251bc57c3bcaa7a0772be060f1b2167d330ce70b14ef2867ecce24d8b833b814506196d290c2e1984db593d2cc1e4029ff0b8d8'
+b2sums=('f4315a81ea5709fbf622ea39a4b259e44e8bafad95468d3f41fa8413dd1d5d92e260f549aacafe8b6af04f0c036fb9d59fe8531f0e2fa8de5dffcc403b33f2e1'
         'SKIP'
         'cfd09442eb344fb80b2233da86a101082926b9942849d988d0e43cac4cb6c15690dc8eae42514e114260b712c206cacd81f773e401cf8f861ee4b805fb872643'
-        'f9cdd0843e18779145cba3812f4727111fea0ee4d182d38df873aeed222533b77d3f4eb4aaa20ceed5296195948e157e3beb8aed6c22a6fe591ed33f5ad3994b'
         'e18f2c22e394ca3b6758bc130245b254947e4d15921be3da443d6d7c3c4b0d22ead1b39fbc10a4f896edd19e2a1dffbd1cbb34dc4beb0621a6ddb70ccc53b3a7'
         '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34'
         '877eda442eb4730600dccf209a6e961ad3122ab456bbfda4ff041e8493ebaaf96224ac218360931259ff4214482f6bf65b3a3052f977ade1a274f38ffd859535'
@@ -83,8 +81,6 @@ prepare() {
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
   patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1731495
-  patch -Np1 -i ../0002-Bug-1731495-Don-t-typecheck-the-pipewire-session_han.patch
 
   if [ "${_modclang}" == "0" ]; then
     # Apply gcc lto patches
-- 
cgit v1.2.1