92.0-1

5 files changed, 31 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f09637d8d32a..1d5aa41cd060 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-appmenu
 	pkgdesc = Firefox from extra with appmenu patch
-	pkgver = 91.0.2
+	pkgver = 92.0
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
 	arch = x86_64
@@ -43,13 +43,13 @@ 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=91.0.2
+	provides = firefox=92.0
 	conflicts = firefox
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
-	source = https://archive.mozilla.org/pub/firefox/releases/91.0.2/source/firefox-91.0.2.source.tar.xz
-	source = https://archive.mozilla.org/pub/firefox/releases/91.0.2/source/firefox-91.0.2.source.tar.xz.asc
+	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 = 0001-Use-remoting-name-for-GDK-application-names.patch
 	source = firefox.desktop
 	source = identity-icons-brand.svg
@@ -57,13 +57,13 @@ pkgbase = firefox-appmenu
 	source = unity-menubar.patch
 	source = fix_csd_window_buttons.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha256sums = 23523af27631e24dd7dbab8429bcd0d828133e9d32b7ab343495c6e15912f6b5
+	sha256sums = 299a472373021cc9194449c9f4bb962d5f74ef05e8af0448c589761ea34fbc84
 	sha256sums = SKIP
-	sha256sums = 138b972a40a74104791783167770c4a01e62cce00bb9cc75119e152f9ea9f14d
+	sha256sums = d7c7a65c4b7ec9ea40df129724ffb369d3f775b0514e3c267c52eec6d284b5e6
 	sha256sums = 34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c
 	sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
-	sha256sums = 85c7287cd38d218305bf80dfb462db98ba27d55b13ba30275194e28b8fa03f48
-	sha256sums = f5e5af8cfb8db2e0ed2e3cb8ae844ece713923ca103deb63c689c2011eb57cb7
+	sha256sums = 46724a625f51c358abaee488a7ce75673078e96ba009459339120b8dd11dec25
+	sha256sums = 8bbcaa48023c9eefb7f3ddfcfa4e4c6db6236664540bee7644ae9ecf790e8823
 	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 17e0e2cfccb9..6060c3463796 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 d3bb8096ad02e..95ccce28fa786 100644
+index 055be3e7a3554..f660bd26e331c 100644
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
-@@ -4262,11 +4262,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
+@@ -4304,11 +4304,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
    // consistently.
  
    // Set program name to the one defined in application.ini.
diff --git a/PKGBUILD b/PKGBUILD
index db610b0f4092..e18800f2f68f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=firefox-appmenu
 _pkgname=firefox
-pkgver=91.0.2
+pkgver=92.0
 pkgrel=1
 pkgdesc="Firefox from extra with appmenu patch"
 arch=(x86_64)
@@ -33,13 +33,13 @@ source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-
         fix-wayland-build.patch
         unity-menubar.patch
         fix_csd_window_buttons.patch)
-sha256sums=('23523af27631e24dd7dbab8429bcd0d828133e9d32b7ab343495c6e15912f6b5'
+sha256sums=('299a472373021cc9194449c9f4bb962d5f74ef05e8af0448c589761ea34fbc84'
             'SKIP'
-            '138b972a40a74104791783167770c4a01e62cce00bb9cc75119e152f9ea9f14d'
+            'd7c7a65c4b7ec9ea40df129724ffb369d3f775b0514e3c267c52eec6d284b5e6'
             '34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c'
             'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
-            '85c7287cd38d218305bf80dfb462db98ba27d55b13ba30275194e28b8fa03f48'
-            'f5e5af8cfb8db2e0ed2e3cb8ae844ece713923ca103deb63c689c2011eb57cb7'
+            '46724a625f51c358abaee488a7ce75673078e96ba009459339120b8dd11dec25'
+            '8bbcaa48023c9eefb7f3ddfcfa4e4c6db6236664540bee7644ae9ecf790e8823'
             'e08d0bc5b7e562f5de6998060e993eddada96d93105384960207f7bdf2e1ed6e')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
 
diff --git a/fix-wayland-build.patch b/fix-wayland-build.patch
index e3a58c6ef2dd..703b1a8c1faf 100644
--- a/fix-wayland-build.patch
+++ b/fix-wayland-build.patch
@@ -1,25 +1,19 @@
 Description: Fix FTBFS on bionic. Compiler errors:
- In file included from Unified_cpp_widget_gtk2.cpp:2:
- In file included from /<<BUILDDIR>>/firefox-91.0~b9+build1/widget/gtk/nsClipboardWayland.cpp:12:
- /<<BUILDDIR>>/firefox-91.0~b9+build1/widget/gtk/nsClipboardWayland.h:53:30: error: unknown type name 'nsWaylandDragContext'
-   void SetWaylandDragContext(nsWaylandDragContext* aDragContext);
-                              ^
- /<<BUILDDIR>>/firefox-91.0~b9+build1/widget/gtk/nsClipboardWayland.h:54:3: error: unknown type name 'nsWaylandDragContext'
-   nsWaylandDragContext* GetWaylandDragContext();
-   ^
- /<<BUILDDIR>>/firefox-91.0~b9+build1/widget/gtk/nsClipboardWayland.h:62:10: error: use of undeclared identifier 'nsWaylandDragContext'
-   RefPtr<nsWaylandDragContext> mDragContext;
-          ^
+ In file included from Unified_cpp_widget_gtk1.cpp:2:
+ /<<BUILDDIR>>/firefox-92.0~b2+build1/widget/gtk/WaylandBuffer.cpp:261:39: error: unknown type name 'GLContext'; did you mean 'EGLContext'?
+    const LayoutDeviceIntSize& aSize, GLContext* aGL) {
+                                      ^~~~~~~~~
+
 Author: Rico Tzschichholz <ricotz@ubuntu.com>
 
---- a/widget/gtk/nsClipboardWayland.h
-+++ b/widget/gtk/nsClipboardWayland.h
-@@ -37,6 +37,8 @@
-   nsTArray<GdkAtom> mTargetMIMETypes;
- };
+--- a/widget/gtk/WaylandBuffer.cpp
++++ b/widget/gtk/WaylandBuffer.cpp
+@@ -258,7 +258,7 @@
+ 
+ /* static */
+ RefPtr<WaylandBufferDMABUF> WaylandBufferDMABUF::Create(
+-    const LayoutDeviceIntSize& aSize, GLContext* aGL) {
++    const LayoutDeviceIntSize& aSize, gl::GLContext* aGL) {
+   RefPtr<WaylandBufferDMABUF> buffer = new WaylandBufferDMABUF(aSize);
  
-+class nsWaylandDragContext;
-+
- class WaylandDataOffer : public DataOffer {
-  public:
-   explicit WaylandDataOffer(wl_data_offer* aWaylandDataOffer);
+   const auto flags =
diff --git a/unity-menubar.patch b/unity-menubar.patch
index 0c4103b66447..e404f73da79a 100644
--- a/unity-menubar.patch
+++ b/unity-menubar.patch
@@ -3517,7 +3517,7 @@
 +{
 +    RefPtr<ComputedStyle> style =
 +        nsComputedDOMStyle::GetComputedStyleNoFlush(
-+            mContent->AsElement(), nullptr);
++            mContent->AsElement());
 +
 +    return style.forget();
 +}