97.0-1

5 files changed, 19 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a90db3b2b663..88c15133a11d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-appmenu
 	pkgdesc = Firefox from extra with appmenu patch
-	pkgver = 96.0.3
+	pkgver = 97.0
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
 	arch = x86_64
@@ -47,30 +47,29 @@ 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=96.0.3
+	provides = firefox=97.0
 	conflicts = firefox
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
 	options = !lto
-	source = https://archive.mozilla.org/pub/firefox/releases/96.0.3/source/firefox-96.0.3.source.tar.xz
-	source = https://archive.mozilla.org/pub/firefox/releases/96.0.3/source/firefox-96.0.3.source.tar.xz.asc
+	options = !debug
+	source = https://archive.mozilla.org/pub/firefox/releases/97.0/source/firefox-97.0.source.tar.xz
+	source = https://archive.mozilla.org/pub/firefox/releases/97.0/source/firefox-97.0.source.tar.xz.asc
 	source = 0001-Use-remoting-name-for-GDK-application-names.patch
-	source = 0002-Bug-1745560-Add-missing-stub-for-wl_proxy_marshal_fl.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 = 1a741d6fcf20e6833a90169f41d29141ea4610f58b848e06091a683af6304dea
+	sha256sums = 6c8a7dcb47122d033383fd62a1bcaefff0290a6c23d057898e8ff9c72749df28
 	sha256sums = SKIP
-	sha256sums = 5ead90994f91bed3231c2661977c69fc276cfbe278a1ab904daa544c9455ff42
-	sha256sums = 8a893ae44955c90a0fb4a504134773293054ab57a41ba7931df98c8cf5449549
+	sha256sums = 8de6c0ecc70d2763936be6df4b91a3d2e806765bf510f987d6f2ffa2377c3f01
 	sha256sums = 34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c
 	sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
 	sha256sums = 46724a625f51c358abaee488a7ce75673078e96ba009459339120b8dd11dec25
-	sha256sums = 0efba173f3e16aaf1726aedfd89e64159d9094cb337b9ec98b4e005824ef13e3
+	sha256sums = 4ad7d369e79281d2bd9c7364e21b174d76df16558ac21d4400d6ac9f1e04f897
 	sha256sums = e08d0bc5b7e562f5de6998060e993eddada96d93105384960207f7bdf2e1ed6e
 
 pkgname = firefox-appmenu
diff --git a/0001-Use-remoting-name-for-GDK-application-names.patch b/0001-Use-remoting-name-for-GDK-application-names.patch
index 07b7fda7c91e..f307772948eb 100644
--- a/0001-Use-remoting-name-for-GDK-application-names.patch
+++ b/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/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 bcd5e25822c0..000000000000
--- 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 <kdaudt@alpinelinux.org>
-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 f77af4367b91..ffde697d69e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=firefox-appmenu
 _pkgname=firefox
-pkgver=96.0.3
+pkgver=97.0
 pkgrel=1
 pkgdesc="Firefox from extra with appmenu patch"
 arch=(x86_64)
@@ -26,23 +26,21 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'xdg-desktop-portal: Screensharing with Wayland')
 provides=("firefox=$pkgver")
 conflicts=("firefox")
-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}
         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
         fix-wayland-build.patch
         unity-menubar.patch
         fix_csd_window_buttons.patch)
-sha256sums=('1a741d6fcf20e6833a90169f41d29141ea4610f58b848e06091a683af6304dea'
+sha256sums=('6c8a7dcb47122d033383fd62a1bcaefff0290a6c23d057898e8ff9c72749df28'
             'SKIP'
-            '5ead90994f91bed3231c2661977c69fc276cfbe278a1ab904daa544c9455ff42'
-            '8a893ae44955c90a0fb4a504134773293054ab57a41ba7931df98c8cf5449549'
+            '8de6c0ecc70d2763936be6df4b91a3d2e806765bf510f987d6f2ffa2377c3f01' 
             '34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c'
             'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
             '46724a625f51c358abaee488a7ce75673078e96ba009459339120b8dd11dec25'
-            '0efba173f3e16aaf1726aedfd89e64159d9094cb337b9ec98b4e005824ef13e3'
+            '4ad7d369e79281d2bd9c7364e21b174d76df16558ac21d4400d6ac9f1e04f897'
             'e08d0bc5b7e562f5de6998060e993eddada96d93105384960207f7bdf2e1ed6e')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
 
diff --git a/unity-menubar.patch b/unity-menubar.patch
index b44e7ef6dd55..dc9ffd1c3662 100644
--- a/unity-menubar.patch
+++ b/unity-menubar.patch
@@ -5083,8 +5083,8 @@
  #  include "mozilla/a11y/LocalAccessible.h"
  #endif
 @@ -168,6 +170,8 @@ class nsWindow final : public nsBaseWidg
-                                   nsIScreen* aTargetScreen = nullptr) override;
-   virtual void HideWindowChrome(bool aShouldHide) override;
+                           nsIScreen* aTargetScreen = nullptr) override;
+   void HideWindowChrome(bool aShouldHide) override;
  
 +  void SetMenuBar(mozilla::UniquePtr<nsMenuBar> aMenuBar);
 +