diff options
author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-09-21 16:06:49 -0700 |
---|---|---|
committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-09-21 16:06:49 -0700 |
commit | 66f27ae71ed799a18125546219d187b54ec5943d (patch) | |
tree | 1b492fe9b4131d077b6f8d9f8436a548749ab032 | |
parent | Updated to 92.0 (diff) | |
download | firefox-66f27ae71ed799a18125546219d187b54ec5943d.tar.xz |
Rebuild with xdg portals patch
-rw-r--r-- | 0002-Bug-1731495-Don-t-typecheck-the-pipewire-session_han.patch | 40 | ||||
-rw-r--r-- | PKGBUILD | 6 |
2 files changed, 45 insertions, 1 deletions
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 new file mode 100644 index 0000000..28504ad --- /dev/null +++ b/0002-Bug-1731495-Don-t-typecheck-the-pipewire-session_han.patch @@ -0,0 +1,40 @@ +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) { @@ -19,7 +19,7 @@ _modpgo=0 pkgname=firefox pkgver=92.0 -pkgrel=1 +pkgrel=2 pkgdesc="Standalone web browser from mozilla.org" arch=(x86_64 aarch64) license=(MPL GPL LGPL) @@ -44,6 +44,7 @@ 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 @@ -60,6 +61,7 @@ source=( b2sums=('782fa226c11d793383a577b1c355933ce83d153596574e864e1a357ab19ac18ff5489aaccc18a326a76af9f51bbfeb3fc5834503c7923b86f7490685588d767a' 'SKIP' 'cfd09442eb344fb80b2233da86a101082926b9942849d988d0e43cac4cb6c15690dc8eae42514e114260b712c206cacd81f773e401cf8f861ee4b805fb872643' + 'f9cdd0843e18779145cba3812f4727111fea0ee4d182d38df873aeed222533b77d3f4eb4aaa20ceed5296195948e157e3beb8aed6c22a6fe591ed33f5ad3994b' 'e18f2c22e394ca3b6758bc130245b254947e4d15921be3da443d6d7c3c4b0d22ead1b39fbc10a4f896edd19e2a1dffbd1cbb34dc4beb0621a6ddb70ccc53b3a7' '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34' '877eda442eb4730600dccf209a6e961ad3122ab456bbfda4ff041e8493ebaaf96224ac218360931259ff4214482f6bf65b3a3052f977ade1a274f38ffd859535' @@ -81,6 +83,8 @@ 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 |