99.0-1

3 files changed, 49 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a91401207c2a..20ca54bf45ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-appmenu
 	pkgdesc = Firefox from extra with appmenu patch
-	pkgver = 98.0.2
+	pkgver = 99.0
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
 	arch = x86_64
@@ -36,7 +36,7 @@ pkgbase = firefox-appmenu
 	depends = libxt
 	depends = mime-types
 	depends = dbus-glib
-	depends = ffmpeg4.4
+	depends = ffmpeg
 	depends = nss
 	depends = ttf-font
 	depends = libpulse
@@ -47,27 +47,27 @@ 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=98.0.2
+	provides = firefox=99.0
 	conflicts = firefox
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
 	options = !lto
 	options = !debug
-	source = https://archive.mozilla.org/pub/firefox/releases/98.0.2/source/firefox-98.0.2.source.tar.xz
-	source = https://archive.mozilla.org/pub/firefox/releases/98.0.2/source/firefox-98.0.2.source.tar.xz.asc
+	source = https://archive.mozilla.org/pub/firefox/releases/99.0/source/firefox-99.0.source.tar.xz
+	source = https://archive.mozilla.org/pub/firefox/releases/99.0/source/firefox-99.0.source.tar.xz.asc
 	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 = c144b6016aaa8ceab8154b9f0b2bbeee6cbc22ab7f811fcece28d36e49565890
+	sha256sums = 513f8d2cafa39a2d50f2c4a25cc48093e89f715a706b941170fa48e397976327
 	sha256sums = SKIP
 	sha256sums = 34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c
 	sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
 	sha256sums = 46724a625f51c358abaee488a7ce75673078e96ba009459339120b8dd11dec25
-	sha256sums = 771ba92312897a85de26525bf222468fe9074c2dee093cf35fdf219428ea4412
+	sha256sums = 1acabdc98057f465d49e38baeafcf55b6d5d01d7832058a75b0381df9aea6442
 	sha256sums = e08d0bc5b7e562f5de6998060e993eddada96d93105384960207f7bdf2e1ed6e
 
 pkgname = firefox-appmenu
diff --git a/PKGBUILD b/PKGBUILD
index 0109f9aab5c3..362a8fbab627 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,13 +7,13 @@
 
 pkgname=firefox-appmenu
 _pkgname=firefox
-pkgver=98.0.2
+pkgver=99.0
 pkgrel=1
 pkgdesc="Firefox from extra with appmenu patch"
 arch=(x86_64)
 license=(MPL GPL LGPL)
 url="https://www.mozilla.org/firefox/"
-depends=(gtk3 libxt mime-types dbus-glib ffmpeg4.4 nss ttf-font libpulse libdbusmenu-gtk3)
+depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse libdbusmenu-gtk3)
 makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb
              autoconf2.13 rust clang llvm jack nodejs cbindgen nasm
              python-setuptools python-psutil python-zstandard lld dump_syms
@@ -33,12 +33,12 @@ source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-
         fix-wayland-build.patch
         unity-menubar.patch
         fix_csd_window_buttons.patch)
-sha256sums=('c144b6016aaa8ceab8154b9f0b2bbeee6cbc22ab7f811fcece28d36e49565890'
+sha256sums=('513f8d2cafa39a2d50f2c4a25cc48093e89f715a706b941170fa48e397976327'
             'SKIP'
             '34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c'
             'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
             '46724a625f51c358abaee488a7ce75673078e96ba009459339120b8dd11dec25'
-            '771ba92312897a85de26525bf222468fe9074c2dee093cf35fdf219428ea4412'
+            '1acabdc98057f465d49e38baeafcf55b6d5d01d7832058a75b0381df9aea6442'
             'e08d0bc5b7e562f5de6998060e993eddada96d93105384960207f7bdf2e1ed6e')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
 
diff --git a/unity-menubar.patch b/unity-menubar.patch
index d3b2d8771e89..9a7a276c7b32 100644
--- a/unity-menubar.patch
+++ b/unity-menubar.patch
@@ -16,7 +16,7 @@
  #endif
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
-@@ -6451,11 +6451,18 @@ function onViewToolbarsPopupShowing(aEve
+@@ -6466,11 +6466,18 @@ function onViewToolbarsPopupShowing(aEve
    MozXULElement.insertFTLIfNeeded("browser/toolbarContextMenu.ftl");
    let firstMenuItem = aInsertPoint || popup.firstElementChild;
    let toolbarNodes = gNavToolbox.querySelectorAll("toolbar");
@@ -47,7 +47,7 @@
            <menupopup id="organizeButtonPopup">
 --- a/dom/xul/XULPopupElement.cpp
 +++ b/dom/xul/XULPopupElement.cpp
-@@ -207,6 +207,10 @@ void XULPopupElement::GetState(nsString&
+@@ -208,6 +208,10 @@ void XULPopupElement::GetState(nsString&
    // set this here in case there's no frame for the popup
    aState.AssignLiteral("closed");
  
@@ -58,7 +58,7 @@
    if (nsXULPopupManager* pm = nsXULPopupManager::GetInstance()) {
      switch (pm->GetPopupState(this)) {
        case ePopupShown:
-@@ -229,6 +233,11 @@ void XULPopupElement::GetState(nsString&
+@@ -230,6 +234,11 @@ void XULPopupElement::GetState(nsString&
          break;
      }
    }
@@ -97,7 +97,7 @@
      "components.conf",
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -310,6 +310,9 @@ pref("dom.mouseevent.click.hack.use_lega
+@@ -311,6 +311,9 @@ pref("dom.mouseevent.click.hack.use_lega
  // Fastback caching - if this pref is negative, then we calculate the number
  // of content viewers to cache based on the amount of available memory.
  pref("browser.sessionhistory.max_total_viewers", -1);
@@ -109,35 +109,26 @@
  // 0 = no external leading,
 --- a/toolkit/content/xul.css
 +++ b/toolkit/content/xul.css
-@@ -230,6 +230,13 @@ toolbar[type="menubar"] {
+@@ -229,6 +229,13 @@ toolbox {
+   }
  }
- %endif
  
-+%ifdef MOZ_WIDGET_GTK
++@media (-moz-platform: linux) {
 +*|*:root[shellshowingmenubar="true"]
 +toolbar[type="menubar"]:not([customizing="true"]) {
 +  display: none !important;
 +}
-+%endif
++}
 +
  toolbarspring {
    -moz-box-flex: 1000;
  }
 --- a/widget/gtk/moz.build
 +++ b/widget/gtk/moz.build
-@@ -34,6 +34,7 @@ EXPORTS += [
- EXPORTS.mozilla += ["WidgetUtilsGtk.h"]
- 
- EXPORTS.mozilla.widget += [
-+    "NativeMenuSupport.h",
-     "WindowSurface.h",
-     "WindowSurfaceProvider.h",
- ]
-@@ -71,6 +72,16 @@ UNIFIED_SOURCES += [
+@@ -77,6 +77,15 @@ UNIFIED_SOURCES += [
  
  SOURCES += [
      "MediaKeysEventSourceFactory.cpp",
-+    "NativeMenuSupport.cpp",
 +    "nsDbusmenu.cpp",
 +    "nsMenu.cpp", # conflicts with X11 headers
 +    "nsMenuBar.cpp",
@@ -150,7 +141,7 @@
      "nsNativeThemeGTK.cpp",  # conflicts with X11 headers
      "nsWindow.cpp",  # conflicts with X11 headers
      "WaylandVsyncSource.cpp",  # conflicts with X11 headers
-@@ -138,6 +149,7 @@ LOCAL_INCLUDES += [
+@@ -152,6 +161,7 @@ LOCAL_INCLUDES += [
      "/layout/base",
      "/layout/forms",
      "/layout/generic",
@@ -5053,7 +5044,7 @@
 +#endif /* __nsNativeMenuService_h__ */
 --- a/widget/gtk/nsWindow.cpp
 +++ b/widget/gtk/nsWindow.cpp
-@@ -7122,6 +7122,10 @@ void nsWindow::HideWindowChrome(bool aSh
+@@ -7060,6 +7060,10 @@ void nsWindow::HideWindowChrome(bool aSh
    SetWindowDecoration(aShouldHide ? eBorderStyle_none : mBorderStyle);
  }
  
@@ -5075,7 +5066,7 @@
  #ifdef ACCESSIBILITY
  #  include "mozilla/a11y/LocalAccessible.h"
  #endif
-@@ -171,6 +173,8 @@ class nsWindow final : public nsBaseWidg
+@@ -172,6 +174,8 @@ class nsWindow final : public nsBaseWidg
    nsresult MakeFullScreen(bool aFullScreen) override;
    void HideWindowChrome(bool aShouldHide) override;
  
@@ -5084,7 +5075,7 @@
    /**
     * GetLastUserInputTime returns a timestamp for the most recent user input
     * event.  This is intended for pointer grab requests (including drags).
-@@ -828,6 +832,8 @@ class nsWindow final : public nsBaseWidg
+@@ -824,6 +828,8 @@ class nsWindow final : public nsBaseWidg
  
    static bool sTransparentMainWindow;
  
@@ -5115,7 +5106,7 @@
  import sys
  
  # Static atom definitions, used to generate nsGkAtomList.h.
-@@ -2527,7 +2528,7 @@ STATIC_ATOMS = [
+@@ -2529,7 +2530,7 @@ STATIC_ATOMS = [
      InheritingAnonBoxAtom("AnonBox_mozSVGForeignContent", ":-moz-svg-foreign-content"),
      InheritingAnonBoxAtom("AnonBox_mozSVGText", ":-moz-svg-text"),
      # END ATOMS
@@ -5152,35 +5143,33 @@
  #  include "mozilla/widget/NativeMenuSupport.h"
  #  define USE_NATIVE_MENUS
  #endif
---- /dev/null
+--- a/widget/gtk/NativeMenuSupport.cpp
 +++ b/widget/gtk/NativeMenuSupport.cpp
-@@ -0,0 +1,26 @@
-+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-+/* This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#include "mozilla/widget/NativeMenuSupport.h"
-+
-+#include "MainThreadUtils.h"
+@@ -7,6 +7,8 @@
+ 
+ #include "MainThreadUtils.h"
+ #include "NativeMenuGtk.h"
 +#include "nsINativeMenuService.h"
 +#include "nsServiceManagerUtils.h"
+ 
+ namespace mozilla::widget {
+ 
+@@ -14,7 +16,14 @@ void NativeMenuSupport::CreateNativeMenu
+                                             dom::Element* aMenuBarElement) {
+   MOZ_RELEASE_ASSERT(NS_IsMainThread(),
+                      "Attempting to create native menu bar on wrong thread!");
+-  // TODO
++
++  nsCOMPtr<nsINativeMenuService> nms =
++      do_GetService("@mozilla.org/widget/nativemenuservice;1");
++  if (!nms) {
++    return;
++  }
 +
-+namespace mozilla::widget {
-+
-+void NativeMenuSupport::CreateNativeMenuBar(nsIWidget* aParent, dom::Element* aMenuBarElement) {
-+    MOZ_RELEASE_ASSERT(NS_IsMainThread(), "Attempting to create native menu bar on wrong thread!");
-+
-+    nsCOMPtr<nsINativeMenuService> nms =
-+        do_GetService("@mozilla.org/widget/nativemenuservice;1");
-+    if (!nms) {
-+        return;
-+    }
-+
-+    nms->CreateNativeMenuBar(aParent, aMenuBarElement);
-+}
-+
-+}  // namespace mozilla::widget
++  nms->CreateNativeMenuBar(aParent, aMenuBarElement);
+ }
+ 
+ already_AddRefed<NativeMenu> NativeMenuSupport::CreateNativeContextMenu(
 --- /dev/null
 +++ b/widget/gtk/NativeMenuSupport.h
 @@ -0,0 +1,31 @@
@@ -5217,7 +5206,7 @@
 +#endif  // mozilla_widget_NativeMenuSupport_h
 --- a/widget/moz.build
 +++ b/widget/moz.build
-@@ -139,6 +139,11 @@ EXPORTS += [
+@@ -157,6 +157,11 @@ EXPORTS += [
      "PuppetWidget.h",
  ]