diff options
author | nikatar | 2021-09-28 12:39:24 +0300 |
---|---|---|
committer | nikatar | 2021-09-28 12:39:24 +0300 |
commit | b7bbbc14467a4f3be6697f86eefd259fa9097e92 (patch) | |
tree | c9b2d93109924b77ccf097137d6b5e6ca824e65b | |
parent | 2e82379b2d1158a7532ceebee5e0f6c056f60da0 (diff) | |
download | aur-b7bbbc14467a4f3be6697f86eefd259fa9097e92.tar.gz |
92.0.1-1
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | 0002-Bug-1731495-Don-t-typecheck-the-pipewire-session_han.patch | 40 | ||||
-rw-r--r-- | PKGBUILD | 9 |
3 files changed, 54 insertions, 7 deletions
@@ -1,6 +1,6 @@ pkgbase = firefox-appmenu pkgdesc = Firefox from extra with appmenu patch - pkgver = 92.0 + pkgver = 92.0.1 pkgrel = 1 url = https://www.mozilla.org/firefox/ arch = x86_64 @@ -43,23 +43,25 @@ pkgbase = firefox-appmenu optdepends = speech-dispatcher: Text-to-Speech optdepends = hunspell-en_US: Spell checking, American English optdepends = xdg-desktop-portal: Screensharing with Wayland - provides = firefox=92.0 + provides = firefox=92.0.1 conflicts = firefox options = !emptydirs options = !makeflags options = !strip - source = https://archive.mozilla.org/pub/firefox/releases/92.0/source/firefox-92.0.source.tar.xz - source = https://archive.mozilla.org/pub/firefox/releases/92.0/source/firefox-92.0.source.tar.xz.asc + source = https://archive.mozilla.org/pub/firefox/releases/92.0.1/source/firefox-92.0.1.source.tar.xz + source = https://archive.mozilla.org/pub/firefox/releases/92.0.1/source/firefox-92.0.1.source.tar.xz.asc source = 0001-Use-remoting-name-for-GDK-application-names.patch + source = 0002-Bug-1731495-Don-t-typecheck-the-pipewire-session_han.patch source = firefox.desktop source = identity-icons-brand.svg source = fix-wayland-build.patch source = unity-menubar.patch source = fix_csd_window_buttons.patch validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353 - sha256sums = 299a472373021cc9194449c9f4bb962d5f74ef05e8af0448c589761ea34fbc84 + sha256sums = 9096b22e162cd299080d5eef8f3627a71a594ceba2b89e3000f2c3e8ea603eb1 sha256sums = SKIP sha256sums = d7c7a65c4b7ec9ea40df129724ffb369d3f775b0514e3c267c52eec6d284b5e6 + sha256sums = 8f313d96c845723f54996d660a201d747dfa8da791f19a827aba55cb81261e38 sha256sums = 34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9 sha256sums = 46724a625f51c358abaee488a7ce75673078e96ba009459339120b8dd11dec25 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 000000000000..28504ad941e6 --- /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) { @@ -7,7 +7,7 @@ pkgname=firefox-appmenu _pkgname=firefox -pkgver=92.0 +pkgver=92.0.1 pkgrel=1 pkgdesc="Firefox from extra with appmenu patch" arch=(x86_64) @@ -28,14 +28,16 @@ conflicts=("firefox") options=(!emptydirs !makeflags !strip) source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$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 fix-wayland-build.patch unity-menubar.patch fix_csd_window_buttons.patch) -sha256sums=('299a472373021cc9194449c9f4bb962d5f74ef05e8af0448c589761ea34fbc84' +sha256sums=('9096b22e162cd299080d5eef8f3627a71a594ceba2b89e3000f2c3e8ea603eb1' 'SKIP' 'd7c7a65c4b7ec9ea40df129724ffb369d3f775b0514e3c267c52eec6d284b5e6' + '8f313d96c845723f54996d660a201d747dfa8da791f19a827aba55cb81261e38' '34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c' 'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9' '46724a625f51c358abaee488a7ce75673078e96ba009459339120b8dd11dec25' @@ -65,6 +67,9 @@ 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 + # actual appmenu patch from ubuntu repos # http://archive.ubuntu.com/ubuntu/pool/main/f/firefox/firefox_80.0+build2-0ubuntu0.16.04.1.debian.tar.xz patch -Np1 -i ../unity-menubar.patch |