89.0-1 + fix_csd_window_buttons.patch + libdbusmenu-gtk3 in depends

5 files changed, 52 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7f58410f70d1..f75181ee4bb2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-appmenu
 	pkgdesc = Firefox from extra with appmenu patch
-	pkgver = 88.0.1
+	pkgver = 89.0
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
 	arch = x86_64
@@ -37,27 +37,30 @@ pkgbase = firefox-appmenu
 	depends = nss
 	depends = ttf-font
 	depends = libpulse
+	depends = libdbusmenu-gtk3
 	optdepends = networkmanager: Location detection via available WiFi networks
 	optdepends = libnotify: Notification integration
 	optdepends = pulseaudio: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
 	optdepends = hunspell-en_US: Spell checking, American English
-	provides = firefox=88.0.1
+	optdepends = xdg-desktop-portal: Screensharing with Wayland
+	provides = firefox=89.0
 	conflicts = firefox
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
-	source = https://archive.mozilla.org/pub/firefox/releases/88.0.1/source/firefox-88.0.1.source.tar.xz
-	source = https://archive.mozilla.org/pub/firefox/releases/88.0.1/source/firefox-88.0.1.source.tar.xz.asc
+	source = https://archive.mozilla.org/pub/firefox/releases/89.0/source/firefox-89.0.source.tar.xz
+	source = https://archive.mozilla.org/pub/firefox/releases/89.0/source/firefox-89.0.source.tar.xz.asc
 	source = 0001-Use-remoting-name-for-GDK-application-names.patch
 	source = firefox.desktop
 	source = unity-menubar.patch
+	source = fix_csd_window_buttons.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha256sums = 83df1eae0e28fe99661fd5d39d705cdab2e108b4a24ce12c2db6183c632804cc
+	sha256sums = db43d7d5796455051a5b847f6daa3423393803c9288c8b6d7f1186f5e2e0a90a
 	sha256sums = SKIP
-	sha256sums = 1b6814e85f13dcf069482ad1acfc1a099661922c85e3344aa4ee059288506ccc
+	sha256sums = 98b6b30973bb1e12e17e8a78baf7d1db0d5085f35252f4611870bb23e8faeff1
 	sha256sums = 34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c
-	sha256sums = 860e49ab14ce2c9416a479d313a2da799e023db58e93b81ca4cb869c5afb39a7
+	sha256sums = 2337ac2af70d547b577420211c1f13de75f679fca8cdc51bfb3fff5300621091
+	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 c3f4fde4d794..605be7c75ca1 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 5eb43aa0ae632..ff331c3b2076e 100644
+index 3a9928cee4525..da60306cfaf01 100644
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
-@@ -4363,11 +4363,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
+@@ -4358,11 +4358,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 f69aa4e8d1b3..0702abd509a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,13 +7,13 @@
 
 pkgname=firefox-appmenu
 _pkgname=firefox
-pkgver=88.0.1
+pkgver=89.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 ffmpeg nss ttf-font libpulse)
+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 gtk2 nodejs cbindgen nasm
              python-setuptools python-psutil python-zstandard lld dump_syms)
@@ -21,19 +21,22 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'pulseaudio: Audio support'
             'speech-dispatcher: Text-to-Speech'
-            'hunspell-en_US: Spell checking, American English')
+            'hunspell-en_US: Spell checking, American English'
+            'xdg-desktop-portal: Screensharing with Wayland')
 provides=("firefox=$pkgver")
 conflicts=("firefox")            
 options=(!emptydirs !makeflags !strip)
 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
         $_pkgname.desktop
-        unity-menubar.patch)
-sha256sums=('83df1eae0e28fe99661fd5d39d705cdab2e108b4a24ce12c2db6183c632804cc'
+        unity-menubar.patch
+        fix_csd_window_buttons.patch)
+sha256sums=('db43d7d5796455051a5b847f6daa3423393803c9288c8b6d7f1186f5e2e0a90a'
             'SKIP'
-            '1b6814e85f13dcf069482ad1acfc1a099661922c85e3344aa4ee059288506ccc'
+            '98b6b30973bb1e12e17e8a78baf7d1db0d5085f35252f4611870bb23e8faeff1'
             '34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c'
-            '860e49ab14ce2c9416a479d313a2da799e023db58e93b81ca4cb869c5afb39a7')
+            '2337ac2af70d547b577420211c1f13de75f679fca8cdc51bfb3fff5300621091'
+            'e08d0bc5b7e562f5de6998060e993eddada96d93105384960207f7bdf2e1ed6e')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -59,6 +62,9 @@ prepare() {
   # http://archive.ubuntu.com/ubuntu/pool/main/f/firefox/firefox_80.0+build2-0ubuntu0.16.04.1.debian.tar.xz
   patch -Np1 -i ../unity-menubar.patch
 
+  #fix csd window buttons patch
+  patch -Np1 -i ../fix_csd_window_buttons.patch
+
   echo -n "$_google_api_key" >google-api-key
   echo -n "$_mozilla_api_key" >mozilla-api-key
 
@@ -87,7 +93,6 @@ ac_add_options --with-unsigned-addon-scopes=app,system
 ac_add_options --allow-addon-sideload
 export MOZILLA_OFFICIAL=1
 export MOZ_APP_REMOTINGNAME=${_pkgname//-/}
-export MOZ_TELEMETRY_REPORTING=1
 export MOZ_REQUIRE_SIGNING=1
 
 # Keys
diff --git a/fix_csd_window_buttons.patch b/fix_csd_window_buttons.patch
new file mode 100644
index 000000000000..1fe384e083a4
--- /dev/null
+++ b/fix_csd_window_buttons.patch
@@ -0,0 +1,12 @@
+Fix window buttons in case CSD when globalmenu is active
+
+
+--- a/browser/base/content/browser.css
++++ b/browser/base/content/browser.css
+@@ -334,5 +334,5 @@ toolbar[customizing] #whats-new-menu-button {
+ %ifdef MENUBAR_CAN_AUTOHIDE
+ #toolbar-menubar[autohide=true]:not([inactive]) + #TabsToolbar > .titlebar-buttonbox-container {
+-  visibility: hidden;
++  visibility: visible;
+ }
+ %endif
diff --git a/unity-menubar.patch b/unity-menubar.patch
index d65c2507d58b..7e0141588cf3 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
-@@ -6291,11 +6291,18 @@ function onViewToolbarsPopupShowing(aEve
+@@ -6251,11 +6251,18 @@ function onViewToolbarsPopupShowing(aEve
    MozXULElement.insertFTLIfNeeded("browser/toolbarContextMenu.ftl");
    let firstMenuItem = aInsertPoint || popup.firstElementChild;
    let toolbarNodes = gNavToolbox.querySelectorAll("toolbar");
@@ -48,7 +48,7 @@
                id="organizeButton" label="&organize.label;"
 --- a/dom/xul/XULPopupElement.cpp
 +++ b/dom/xul/XULPopupElement.cpp
-@@ -158,6 +158,10 @@ void XULPopupElement::GetState(nsString&
+@@ -211,6 +211,10 @@ void XULPopupElement::GetState(nsString&
    // set this here in case there's no frame for the popup
    aState.AssignLiteral("closed");
  
@@ -56,10 +56,10 @@
 +  nsAutoString nativeState;
 +#endif
 +
-   nsMenuPopupFrame* menuPopupFrame = do_QueryFrame(GetPrimaryFrame());
-   if (menuPopupFrame) {
-     switch (menuPopupFrame->PopupState()) {
-@@ -181,6 +185,11 @@ void XULPopupElement::GetState(nsString&
+   if (nsXULPopupManager* pm = nsXULPopupManager::GetInstance()) {
+     switch (pm->GetPopupState(this)) {
+       case ePopupShown:
+@@ -233,6 +237,11 @@ void XULPopupElement::GetState(nsString&
          break;
      }
    }
@@ -87,7 +87,7 @@
  if CONFIG["CC_TYPE"] in ("clang", "gcc"):
 --- a/layout/build/moz.build
 +++ b/layout/build/moz.build
-@@ -67,6 +67,10 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "an
+@@ -68,6 +68,10 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "an
          "/dom/system",
          "/dom/system/android",
      ]
@@ -2536,7 +2536,7 @@
 +        if (command) {
 +            command->InitCommandEvent(u"command"_ns, true, true,
 +                                      nsGlobalWindowInner::Cast(doc->GetInnerWindow()),
-+                                      0, false, false, false, false, nullptr, 0, rv);
++                                      0, false, false, false, false, 0, nullptr, 0, rv);
 +            if (!rv.Failed()) {
 +                event->SetTrusted(true);
 +                ContentNode()->DispatchEvent(*event, rv);
@@ -5064,7 +5064,7 @@
 +#endif /* __nsNativeMenuService_h__ */
 --- a/widget/gtk/nsWindow.cpp
 +++ b/widget/gtk/nsWindow.cpp
-@@ -6409,6 +6409,10 @@ void nsWindow::HideWindowChrome(bool aSh
+@@ -6436,6 +6436,10 @@ void nsWindow::HideWindowChrome(bool aSh
    SetWindowDecoration(aShouldHide ? eBorderStyle_none : mBorderStyle);
  }
  
@@ -5086,7 +5086,7 @@
  #undef LOG
  #ifdef MOZ_LOGGING
  
-@@ -182,6 +184,8 @@ class nsWindow final : public nsBaseWidg
+@@ -168,6 +170,8 @@ class nsWindow final : public nsBaseWidg
                                    nsIScreen* aTargetScreen = nullptr) override;
    virtual void HideWindowChrome(bool aShouldHide) override;
  
@@ -5095,7 +5095,7 @@
    /**
     * GetLastUserInputTime returns a timestamp for the most recent user input
     * event.  This is intended for pointer grab requests (including drags).
-@@ -722,6 +726,8 @@ class nsWindow final : public nsBaseWidg
+@@ -708,6 +712,8 @@ class nsWindow final : public nsBaseWidg
    static GtkWindowDecoration sGtkWindowDecoration;
  
    static bool sTransparentMainWindow;
@@ -5126,7 +5126,7 @@
  import sys
  
  # Static atom definitions, used to generate nsGkAtomList.h.
-@@ -2507,7 +2508,7 @@ STATIC_ATOMS = [
+@@ -2506,7 +2507,7 @@ STATIC_ATOMS = [
      InheritingAnonBoxAtom("AnonBox_mozSVGForeignContent", ":-moz-svg-foreign-content"),
      InheritingAnonBoxAtom("AnonBox_mozSVGText", ":-moz-svg-text"),
      # END ATOMS
@@ -5154,7 +5154,7 @@
  if defined('MOZ_X11'):
 --- a/xpfe/appshell/AppWindow.cpp
 +++ b/xpfe/appshell/AppWindow.cpp
-@@ -79,7 +79,7 @@
+@@ -80,7 +80,7 @@
  
  #include "mozilla/dom/DocumentL10n.h"
  
@@ -5227,7 +5227,7 @@
 +#endif  // mozilla_widget_NativeMenuSupport_h
 --- a/widget/moz.build
 +++ b/widget/moz.build
-@@ -145,6 +145,11 @@ EXPORTS += [
+@@ -144,6 +144,11 @@ EXPORTS += [
      "PuppetWidget.h",
  ]