From bb936ee0eedb07cde233ae356da983d6743f482c Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Wed, 9 Feb 2022 14:14:27 -0800 Subject: Updated to 91.6.0 --- ...-Add-missing-stub-for-wl_proxy_marshal_fl.patch | 28 ---------------------- PKGBUILD | 10 ++++---- 2 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 0002-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch diff --git a/0002-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch b/0002-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch deleted file mode 100644 index bcd5e25..0000000 --- a/0002-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Kevin Daudt -Date: Sun, 12 Dec 2021 13:38:48 +0000 -Subject: [PATCH] Bug 1745560 - Add missing stub for wl_proxy_marshal_flags, - r=stransky - -Firefox fails to build against wayland 1.20 because this symbol is missing - -Differential Revision: https://phabricator.services.mozilla.com/D133583 ---- - widget/gtk/mozwayland/mozwayland.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c -index 7a448e6321e2..1a86468b4f3d 100644 ---- a/widget/gtk/mozwayland/mozwayland.c -+++ b/widget/gtk/mozwayland/mozwayland.c -@@ -200,3 +200,10 @@ MOZ_EXPORT int wl_list_empty(const struct wl_list* list) { return -1; } - - MOZ_EXPORT void wl_list_insert_list(struct wl_list* list, - struct wl_list* other) {} -+ -+MOZ_EXPORT struct wl_proxy* wl_proxy_marshal_flags( -+ struct wl_proxy* proxy, uint32_t opcode, -+ const struct wl_interface* interface, uint32_t version, uint32_t flags, -+ ...) { -+ return NULL; -+} diff --git a/PKGBUILD b/PKGBUILD index e690ed0..a656cbe 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,6 @@ # Maintainer: jc_gargma -# Maintainer (Arch): Figue +# Maintainer (AUR): Figue +# Maintainer (AUR): Luna Jernberg # Contributor: Aqua-sama # Contributor (Arch: Jan Alexander Steffens (heftig) # Contributor (Arch): Ionut Biru @@ -19,7 +20,7 @@ _modpgo=0 _pkgname=firefox pkgname=${_pkgname}-esr -pkgver=91.5.0 +pkgver=91.6.0 _pkgver=${pkgver}esr pkgrel=1 pkgdesc="Standalone web browser from mozilla.org" @@ -47,7 +48,6 @@ provides=(firefox) 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-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch $pkgname.desktop identity-icons-brand.svg distribution.ini @@ -61,10 +61,9 @@ source=( arc4_remove-health-reporting.patch arc4_remove-system-addons.patch ) -b2sums=('21b25ded0d0541d2a5c0964ffe5e28a3b238b5dac1c0969383f8a41cb6a0fff8522c4ccfbd1cd309a5c52be9377ca9af446949dd3d9923cf36ce0e6603ff520a' +b2sums=('d06496790b1421db2e0d9419ad29cc44b53b4140b85efedb8fc16e61c4e2320eb85441fae2af3678cd8f15f04890cb0d156bcc79a324e56eafcf3a61530aefb2' 'SKIP' 'cfd09442eb344fb80b2233da86a101082926b9942849d988d0e43cac4cb6c15690dc8eae42514e114260b712c206cacd81f773e401cf8f861ee4b805fb872643' - '3b9cc149b520375a12dec279f67e9d0abc527d92e000b848a78628f5afacd5b1883e16b5698e78db18378cb64851ca61bac2ccb4769395e76638578cda77998f' '1c3af4cc5199cf7b9f3aad9ceab98b3e8a3dc0d38f50896ed2f32ac648f1e904a1cdda5da559964885989edbfab4c4bf65448e9a0f71d946c77ec0ab5a6aff4c' '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34' '877eda442eb4730600dccf209a6e961ad3122ab456bbfda4ff041e8493ebaaf96224ac218360931259ff4214482f6bf65b3a3052f977ade1a274f38ffd859535' @@ -80,7 +79,6 @@ prepare() { # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052 patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch - patch -Np1 -i ../0002-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch if [ "${_modpgo}" == "1" ]; then # Add the custom mozconfig for clang pgo -- cgit v1.2.1