74.0-2

3 files changed, 26 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d4b23bab62df..d1f41debafaf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = firefox-appmenu
 	pkgdesc = Firefox from extra with appmenu patch
-	pkgver = 73.0.1
-	pkgrel = 1
+	pkgver = 74.0
+	pkgrel = 2
 	url = https://www.mozilla.org/firefox/
 	arch = x86_64
 	license = MPL
@@ -41,21 +41,21 @@ pkgbase = firefox-appmenu
 	optdepends = pulseaudio: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
 	optdepends = hunspell-en_US: Spell checking, American English
-	provides = firefox=73.0.1
+	provides = firefox=74.0
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
-	source = https://archive.mozilla.org/pub/firefox/releases/73.0.1/source/firefox-73.0.1.source.tar.xz
-	source = https://archive.mozilla.org/pub/firefox/releases/73.0.1/source/firefox-73.0.1.source.tar.xz.asc
+	source = https://archive.mozilla.org/pub/firefox/releases/74.0/source/firefox-74.0.source.tar.xz
+	source = https://archive.mozilla.org/pub/firefox/releases/74.0/source/firefox-74.0.source.tar.xz.asc
 	source = 0001-Use-remoting-name-for-GDK-application-names.patch
 	source = firefox.desktop
 	source = unity-menubar.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha256sums = 53415180e74da60fc91700ce1ff33bf5b6f51e65353017a98270899a08e0c3d2
+	sha256sums = 74589c2836d7c30134636823c3caefbcaed0ea7c3abb2def9e3ddd9f86d9440a
 	sha256sums = SKIP
 	sha256sums = 5f7ac724a5c5afd9322b1e59006f4170ea5354ca1e0e60dab08b7784c2d8463c
 	sha256sums = e466789015e15be9409b7a7044353674ca6aa0f392e882217f90c79821fe2630
-	sha256sums = d158e8559a8f683cf4e3eb8cd2c0b1ccfd307ca48d6f3fa9b00dcfc6f951a310
+	sha256sums = 364e5c59a5a55d0be43bcb090dec51476580d0c35b63c0974a25bfeba212a1fc
 
 pkgname = firefox-appmenu
 
diff --git a/PKGBUILD b/PKGBUILD
index 5527ca12f694..9ff0f2725e2e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 
 pkgname=firefox-appmenu
 _pkgname=firefox
-pkgver=73.0.1
-pkgrel=1
+pkgver=74.0
+pkgrel=2
 pkgdesc="Firefox from extra with appmenu patch"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -14,8 +14,8 @@ url="https://www.mozilla.org/firefox/"
 depends=(gtk3 libxt startup-notification mime-types dbus-glib ffmpeg nss
          ttf-font libpulse)
 makedepends=(unzip zip diffutils python2-setuptools yasm mesa imake inetutils
-             xorg-server-xvfb autoconf2.13 rust clang llvm jack gtk2
-             python nodejs python2-psutil cbindgen nasm)
+             xorg-server-xvfb autoconf2.13 rust clang llvm jack gtk2 python
+             nodejs python2-psutil cbindgen nasm)
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'pulseaudio: Audio support'
@@ -28,11 +28,11 @@ source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-
         0001-Use-remoting-name-for-GDK-application-names.patch
         $_pkgname.desktop
         unity-menubar.patch)
-sha256sums=('53415180e74da60fc91700ce1ff33bf5b6f51e65353017a98270899a08e0c3d2'
+sha256sums=('74589c2836d7c30134636823c3caefbcaed0ea7c3abb2def9e3ddd9f86d9440a'
             'SKIP'
             '5f7ac724a5c5afd9322b1e59006f4170ea5354ca1e0e60dab08b7784c2d8463c'
             'e466789015e15be9409b7a7044353674ca6aa0f392e882217f90c79821fe2630'
-            'd158e8559a8f683cf4e3eb8cd2c0b1ccfd307ca48d6f3fa9b00dcfc6f951a310')
+            '364e5c59a5a55d0be43bcb090dec51476580d0c35b63c0974a25bfeba212a1fc')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -79,6 +79,7 @@ ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=release
 ac_add_options --with-distribution-id=org.archlinux
 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
diff --git a/unity-menubar.patch b/unity-menubar.patch
index a8a2eacebf1c..ef691df9d94c 100644
--- a/unity-menubar.patch
+++ b/unity-menubar.patch
@@ -14,7 +14,7 @@
              <menu id="file-menu" data-l10n-id="menu-file">
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
-@@ -6524,11 +6524,17 @@ function onViewToolbarsPopupShowing(aEve
+@@ -6506,11 +6506,17 @@ function onViewToolbarsPopupShowing(aEve
  
    let toolbarNodes = gNavToolbox.querySelectorAll("toolbar");
  
@@ -34,7 +34,7 @@
        toolbar.getAttribute("type") == "menubar" ? "autohide" : "collapsed";
 --- a/browser/components/places/content/places.xhtml
 +++ b/browser/components/places/content/places.xhtml
-@@ -170,7 +170,7 @@
+@@ -171,7 +171,7 @@
          <toolbarbutton type="menu" class="tabbable"
                onpopupshowing="document.getElementById('placeContent').focus()"
  #else
@@ -97,7 +97,7 @@
      'components.conf',
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -317,6 +317,9 @@ pref("dom.mouseevent.click.hack.use_lega
+@@ -313,6 +313,9 @@ pref("dom.mouseevent.click.hack.use_lega
  // of content viewers to cache based on the amount of available memory.
  pref("browser.sessionhistory.max_total_viewers", -1);
  
@@ -109,7 +109,7 @@
  pref("ui.android.mouse_as_touch", 1);
 --- a/toolkit/content/xul.css
 +++ b/toolkit/content/xul.css
-@@ -210,6 +210,13 @@ toolbar[type="menubar"] {
+@@ -206,6 +206,13 @@ toolbar[type="menubar"] {
  }
  %endif
  
@@ -319,7 +319,7 @@
 +#endif /* __nsDbusmenu_h__ */
 --- /dev/null
 +++ b/widget/gtk/nsMenu.cpp
-@@ -0,0 +1,798 @@
+@@ -0,0 +1,797 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
 + */
@@ -336,7 +336,6 @@
 +#include "mozilla/EventDispatcher.h"
 +#include "mozilla/GuardObjects.h"
 +#include "mozilla/MouseEvents.h"
-+#include "mozilla/Move.h"
 +#include "mozilla/PresShell.h"
 +#include "mozilla/PresShellInlines.h"
 +#include "nsAutoPtr.h"
@@ -1246,7 +1245,7 @@
 +#endif /* __nsMenu_h__ */
 --- /dev/null
 +++ b/widget/gtk/nsMenuBar.cpp
-@@ -0,0 +1,550 @@
+@@ -0,0 +1,549 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
 + */
@@ -1261,7 +1260,6 @@
 +#include "mozilla/dom/Event.h"
 +#include "mozilla/dom/KeyboardEvent.h"
 +#include "mozilla/dom/KeyboardEventBinding.h"
-+#include "mozilla/Move.h"
 +#include "mozilla/Preferences.h"
 +#include "nsAutoPtr.h"
 +#include "nsContentUtils.h"
@@ -1913,7 +1911,7 @@
 +#endif /* __nsMenuBar_h__ */
 --- /dev/null
 +++ b/widget/gtk/nsMenuContainer.cpp
-@@ -0,0 +1,171 @@
+@@ -0,0 +1,170 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
 + */
@@ -1922,7 +1920,6 @@
 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 +
 +#include "mozilla/DebugOnly.h"
-+#include "mozilla/Move.h"
 +#include "nsGkAtoms.h"
 +#include "nsIContent.h"
 +
@@ -2160,7 +2157,7 @@
 +#endif /* __nsMenuContainer_h__ */
 --- /dev/null
 +++ b/widget/gtk/nsMenuItem.cpp
-@@ -0,0 +1,764 @@
+@@ -0,0 +1,763 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
 + */
@@ -2174,7 +2171,6 @@
 +#include "mozilla/dom/Element.h"
 +#include "mozilla/dom/KeyboardEventBinding.h"
 +#include "mozilla/dom/XULCommandEvent.h"
-+#include "mozilla/Move.h"
 +#include "mozilla/Preferences.h"
 +#include "mozilla/TextEvents.h"
 +#include "nsAutoPtr.h"
@@ -3849,7 +3845,7 @@
 +#endif /* __nsMenuObject_h__ */
 --- /dev/null
 +++ b/widget/gtk/nsMenuSeparator.cpp
-@@ -0,0 +1,84 @@
+@@ -0,0 +1,83 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
 + */
@@ -3858,7 +3854,6 @@
 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 +
 +#include "mozilla/Assertions.h"
-+#include "mozilla/Move.h"
 +#include "nsAutoPtr.h"
 +#include "nsCRT.h"
 +#include "nsGkAtoms.h"
@@ -4489,7 +4484,7 @@
 +#endif /* __nsNativeMenuDocListener_h__ */
 --- /dev/null
 +++ b/widget/gtk/nsNativeMenuService.cpp
-@@ -0,0 +1,505 @@
+@@ -0,0 +1,504 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
 + */
@@ -4498,7 +4493,6 @@
 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 +
 +#include "mozilla/Assertions.h"
-+#include "mozilla/Move.h"
 +#include "mozilla/Preferences.h"
 +#include "mozilla/UniquePtr.h"
 +#include "nsAutoPtr.h"
@@ -5084,15 +5078,7 @@
 +#endif /* __nsNativeMenuService_h__ */
 --- a/widget/gtk/nsWindow.cpp
 +++ b/widget/gtk/nsWindow.cpp
-@@ -75,6 +75,7 @@
- 
- #include "mozilla/Assertions.h"
- #include "mozilla/Likely.h"
-+#include "mozilla/Move.h"
- #include "mozilla/Preferences.h"
- #include "nsGfxCIID.h"
- #include "nsGtkUtils.h"
-@@ -5631,6 +5632,10 @@ void nsWindow::HideWindowChrome(bool aSh
+@@ -5669,6 +5669,10 @@ void nsWindow::HideWindowChrome(bool aSh
    SetWindowDecoration(aShouldHide ? eBorderStyle_none : mBorderStyle);
  }
  
@@ -5123,7 +5109,7 @@
    /**
     * GetLastUserInputTime returns a timestamp for the most recent user input
     * event.  This is intended for pointer grab requests (including drags).
-@@ -701,6 +705,8 @@ class nsWindow final : public nsBaseWidg
+@@ -708,6 +712,8 @@ class nsWindow final : public nsBaseWidg
  
    mozilla::UniquePtr<mozilla::CurrentX11TimeGetter> mCurrentTimeGetter;
    static CSDSupportLevel sCSDSupportLevel;