diff --git a/extra/firefox/0001-Use-remoting-name-for-GDK-application-names.patch b/extra/firefox/0001-Use-remoting-name-for-GDK-application-names.patch index 07b7fda7c..f30777294 100644 --- a/extra/firefox/0001-Use-remoting-name-for-GDK-application-names.patch +++ b/extra/firefox/0001-Use-remoting-name-for-GDK-application-names.patch @@ -9,10 +9,10 @@ Subject: [PATCH] Use remoting name for GDK application names 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index ec8eb1ff1075..3da127bf1d1d 100644 +index ce001e93821f..3be817c5cbd5 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -4323,11 +4323,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { +@@ -4348,11 +4348,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { // consistently. // Set program name to the one defined in application.ini. @@ -26,7 +26,7 @@ index ec8eb1ff1075..3da127bf1d1d 100644 // Initialize GTK here for splash. diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp -index 7090bd2ef350..76bda087be72 100644 +index c8bbd9a373f5..a6a2186f20fb 100644 --- a/widget/gtk/nsAppShell.cpp +++ b/widget/gtk/nsAppShell.cpp @@ -27,6 +27,8 @@ @@ -38,7 +38,7 @@ index 7090bd2ef350..76bda087be72 100644 #include "ScreenHelperGTK.h" #include "HeadlessScreenHelper.h" #include "mozilla/widget/ScreenManager.h" -@@ -256,13 +258,9 @@ nsresult nsAppShell::Init() { +@@ -257,13 +259,9 @@ nsresult nsAppShell::Init() { // See https://bugzilla.gnome.org/show_bug.cgi?id=747634 // // Only bother doing this for the parent process, since it's the one diff --git a/extra/firefox/0002-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch b/extra/firefox/0002-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.patch deleted file mode 100644 index bcd5e2582..000000000 --- a/extra/firefox/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/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD index 42b5e3ffb..0b5ab912d 100644 --- a/extra/firefox/PKGBUILD +++ b/extra/firefox/PKGBUILD @@ -10,7 +10,7 @@ highmem=1 pkgname=firefox -pkgver=96.0.3 +pkgver=97.0 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org" arch=(x86_64) @@ -26,14 +26,14 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'speech-dispatcher: Text-to-Speech' 'hunspell-en_US: Spell checking, American English' 'xdg-desktop-portal: Screensharing with Wayland') -options=(!emptydirs !makeflags !strip !lto) +options=(!emptydirs !makeflags !strip !lto !debug) source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} build-arm-libopus.patch 0001-Use-remoting-name-for-GDK-application-names.patch $pkgname.desktop identity-icons-brand.svg) -sha256sums=('1a741d6fcf20e6833a90169f41d29141ea4610f58b848e06091a683af6304dea' +sha256sums=('6c8a7dcb47122d033383fd62a1bcaefff0290a6c23d057898e8ff9c72749df28' 'SKIP' - '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9' + '8de6c0ecc70d2763936be6df4b91a3d2e806765bf510f987d6f2ffa2377c3f01' '5ead90994f91bed3231c2661977c69fc276cfbe278a1ab904daa544c9455ff42' '298eae9de76ec53182f38d5c549d0379569916eebf62149f9d7f4a7edef36abf' 'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9')