diff options
author | nikatar | 2021-04-29 02:09:22 +0300 |
---|---|---|
committer | nikatar | 2021-04-29 02:09:22 +0300 |
commit | c625a8cb340f9f1009f33c63fa81d8258a6442f1 (patch) | |
tree | 354757f0bd01a219330b8ae03e6efe7ecb52a906 | |
parent | 8b8cb287ad5780fcf4cfa033237e54579beb7b18 (diff) | |
download | aur-c625a8cb340f9f1009f33c63fa81d8258a6442f1.tar.gz |
88.0-1
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | 0001-Use-remoting-name-for-GDK-application-names.patch | 4 | ||||
-rw-r--r-- | PKGBUILD | 8 | ||||
-rw-r--r-- | unity-menubar.patch | 57 |
4 files changed, 51 insertions, 32 deletions
@@ -1,6 +1,6 @@ pkgbase = firefox-appmenu pkgdesc = Firefox from extra with appmenu patch - pkgver = 87.0 + pkgver = 88.0 pkgrel = 1 url = https://www.mozilla.org/firefox/ arch = x86_64 @@ -42,22 +42,22 @@ pkgbase = firefox-appmenu optdepends = pulseaudio: Audio support optdepends = speech-dispatcher: Text-to-Speech optdepends = hunspell-en_US: Spell checking, American English - provides = firefox=87.0 + provides = firefox=88.0 conflicts = firefox options = !emptydirs options = !makeflags options = !strip - source = https://archive.mozilla.org/pub/firefox/releases/87.0/source/firefox-87.0.source.tar.xz - source = https://archive.mozilla.org/pub/firefox/releases/87.0/source/firefox-87.0.source.tar.xz.asc + source = https://archive.mozilla.org/pub/firefox/releases/88.0/source/firefox-88.0.source.tar.xz + source = https://archive.mozilla.org/pub/firefox/releases/88.0/source/firefox-88.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 = ce98be0522f971b6950f22c738c4b2caf19cf7f48ab2ae2e6d46694af7fd58ab + sha256sums = 6b50dbfb393f843e4401e23965a1d8f7fd44b5a7628d95138294094094eee297 sha256sums = SKIP - sha256sums = 9b4b36d525be7920413017a4e4300cf881836353d06f874637d368e3d293316d + sha256sums = 1b6814e85f13dcf069482ad1acfc1a099661922c85e3344aa4ee059288506ccc sha256sums = 34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c - sha256sums = 85f037f794afee0c70840123960375a00f9cef08dd903ea038b6bb62e683b96f + sha256sums = 860e49ab14ce2c9416a479d313a2da799e023db58e93b81ca4cb869c5afb39a7 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 9ff16dc48f50..c3f4fde4d794 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 df53d2f8358ba..684105058af38 100644 +index 5eb43aa0ae632..ff331c3b2076e 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -4184,11 +4184,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { +@@ -4363,11 +4363,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { // consistently. // Set program name to the one defined in application.ini. @@ -7,7 +7,7 @@ pkgname=firefox-appmenu _pkgname=firefox -pkgver=87.0 +pkgver=88.0 pkgrel=1 pkgdesc="Firefox from extra with appmenu patch" arch=(x86_64) @@ -29,11 +29,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=('ce98be0522f971b6950f22c738c4b2caf19cf7f48ab2ae2e6d46694af7fd58ab' +sha256sums=('6b50dbfb393f843e4401e23965a1d8f7fd44b5a7628d95138294094094eee297' 'SKIP' - '9b4b36d525be7920413017a4e4300cf881836353d06f874637d368e3d293316d' + '1b6814e85f13dcf069482ad1acfc1a099661922c85e3344aa4ee059288506ccc' '34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c' - '85f037f794afee0c70840123960375a00f9cef08dd903ea038b6bb62e683b96f') + '860e49ab14ce2c9416a479d313a2da799e023db58e93b81ca4cb869c5afb39a7') validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com> # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) diff --git a/unity-menubar.patch b/unity-menubar.patch index 583385724458..d65c2507d58b 100644 --- a/unity-menubar.patch +++ b/unity-menubar.patch @@ -1,20 +1,22 @@ --- a/browser/base/content/browser-menubar.inc +++ b/browser/base/content/browser-menubar.inc -@@ -5,7 +5,11 @@ - - <menubar id="main-menubar" - onpopupshowing="if (event.target.parentNode.parentNode == this && +@@ -7,7 +7,12 @@ + # On macOS, we don't track whether activation of the native menubar happened + # with the keyboard. + #ifndef XP_MACOSX +- onpopupshowing="if (event.target.parentNode.parentNode == this) ++ onpopupshowing="if (event.target.parentNode.parentNode == this && +#ifdef MOZ_WIDGET_GTK + document.documentElement.getAttribute('shellshowingmenubar') != 'true') +#else - !('@mozilla.org/widget/nativemenuservice;1' in Cc)) ++ true) +#endif this.setAttribute('openedwithkey', - event.target.parentNode.openedWithKey);"> - <menu id="file-menu" data-l10n-id="menu-file"> + event.target.parentNode.openedWithKey);" + #endif --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js -@@ -6231,11 +6231,18 @@ function onViewToolbarsPopupShowing(aEve +@@ -6291,11 +6291,18 @@ function onViewToolbarsPopupShowing(aEve MozXULElement.insertFTLIfNeeded("browser/toolbarContextMenu.ftl"); let firstMenuItem = aInsertPoint || popup.firstElementChild; let toolbarNodes = gNavToolbox.querySelectorAll("toolbar"); @@ -98,7 +100,7 @@ "components.conf", --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -305,6 +305,9 @@ pref("dom.mouseevent.click.hack.use_lega +@@ -301,6 +301,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); @@ -110,7 +112,7 @@ --- a/toolkit/content/xul.css +++ b/toolkit/content/xul.css -@@ -221,6 +221,13 @@ toolbar[type="menubar"] { +@@ -230,6 +230,13 @@ toolbar[type="menubar"] { } %endif @@ -4292,7 +4294,7 @@ + MOZ_ASSERT(!mContentToObserverTable.Get(aContent, &old) || old == aObserver, + "Multiple observers for the same content node are not supported"); + -+ mContentToObserverTable.Put(aContent, aObserver); ++ mContentToObserverTable.InsertOrUpdate(aContent, aObserver); +} + +void @@ -4352,7 +4354,7 @@ +#include "mozilla/Attributes.h" +#include "mozilla/RefPtr.h" +#include "mozilla/UniquePtr.h" -+#include "nsDataHashtable.h" ++#include "nsTHashMap.h" +#include "nsStubMutationObserver.h" +#include "nsTArray.h" + @@ -4459,7 +4461,7 @@ + nsIContent *mLastSource; + nsNativeMenuChangeObserver *mLastTarget; + nsTArray<mozilla::UniquePtr<MutationRecord> > mPendingMutations; -+ nsDataHashtable<nsPtrHashKey<nsIContent>, nsNativeMenuChangeObserver *> mContentToObserverTable; ++ nsTHashMap<nsPtrHashKey<nsIContent>, nsNativeMenuChangeObserver *> mContentToObserverTable; + + static uint32_t sUpdateBlockersCount; +}; @@ -4737,7 +4739,7 @@ + } + + GCancellable *cancellable = g_cancellable_new(); -+ mMenuBarRegistrationCancellables.Put(aMenuBar, cancellable); ++ mMenuBarRegistrationCancellables.InsertOrUpdate(aMenuBar, cancellable); + + // We keep a weak ref because we can't assume that GDBus cancellation + // is reliable (see https://launchpad.net/bugs/953562) @@ -4987,7 +4989,7 @@ + +#include "mozilla/Attributes.h" +#include "nsCOMPtr.h" -+#include "nsDataHashtable.h" ++#include "nsTHashMap.h" +#include "nsINativeMenuService.h" +#include "nsTArray.h" + @@ -5053,7 +5055,7 @@ + GDBusProxy *mDbusProxy; + bool mOnline; + nsTArray<nsMenuBar *> mMenuBars; -+ nsDataHashtable<nsPtrHashKey<nsMenuBar>, GCancellable*> mMenuBarRegistrationCancellables; ++ nsTHashMap<nsPtrHashKey<nsMenuBar>, GCancellable*> mMenuBarRegistrationCancellables; + + static bool sShutdown; + static nsNativeMenuService *sService; @@ -5062,7 +5064,7 @@ +#endif /* __nsNativeMenuService_h__ */ --- a/widget/gtk/nsWindow.cpp +++ b/widget/gtk/nsWindow.cpp -@@ -6386,6 +6386,10 @@ void nsWindow::HideWindowChrome(bool aSh +@@ -6409,6 +6409,10 @@ void nsWindow::HideWindowChrome(bool aSh SetWindowDecoration(aShouldHide ? eBorderStyle_none : mBorderStyle); } @@ -5093,7 +5095,7 @@ /** * GetLastUserInputTime returns a timestamp for the most recent user input * event. This is intended for pointer grab requests (including drags). -@@ -719,6 +723,8 @@ class nsWindow final : public nsBaseWidg +@@ -722,6 +726,8 @@ class nsWindow final : public nsBaseWidg static GtkWindowDecoration sGtkWindowDecoration; static bool sTransparentMainWindow; @@ -5124,7 +5126,7 @@ import sys # Static atom definitions, used to generate nsGkAtomList.h. -@@ -2508,7 +2509,7 @@ STATIC_ATOMS = [ +@@ -2507,7 +2508,7 @@ STATIC_ATOMS = [ InheritingAnonBoxAtom("AnonBox_mozSVGForeignContent", ":-moz-svg-foreign-content"), InheritingAnonBoxAtom("AnonBox_mozSVGText", ":-moz-svg-text"), # END ATOMS @@ -5279,3 +5281,20 @@ +NS_DEFINE_STATIC_IID_ACCESSOR(nsINativeMenuService, NS_INATIVEMENUSERVICE_IID) + +#endif // nsINativeMenuService_h_ +--- a/widget/nsWidgetsCID.h ++++ b/widget/nsWidgetsCID.h +@@ -66,6 +66,14 @@ + // Menus + //----------------------------------------------------------- + ++// {0B3FE5AA-BC72-4303-85AE-76365DF1251D} ++#define NS_NATIVEMENUSERVICE_CID \ ++ { \ ++ 0x0B3FE5AA, 0xBC72, 0x4303, { \ ++ 0x85, 0xAE, 0x76, 0x36, 0x5D, 0xF1, 0x25, 0x1D \ ++ } \ ++ } ++ + // {F6CD4F21-53AF-11d2-8DC4-00609703C14E} + #define NS_POPUPMENU_CID \ + { \ |