diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | PKGBUILD | 18 | ||||
| -rw-r--r-- | unity-menubar.patch | 69 |
3 files changed, 45 insertions, 58 deletions
@@ -1,7 +1,7 @@ pkgbase = firefox-appmenu pkgdesc = Firefox from extra with appmenu patch - pkgver = 67.0.4 - pkgrel = 2 + pkgver = 68.0 + pkgrel = 1 url = https://aur.archlinux.org/packages/firefox-appmenu/ arch = x86_64 license = MPL @@ -42,23 +42,21 @@ pkgbase = firefox-appmenu optdepends = pulseaudio: Audio support optdepends = speech-dispatcher: Text-to-Speech optdepends = hunspell-en_US: Spell checking, American English - provides = firefox=67.0.4 + provides = firefox=68.0 conflicts = firefox options = !emptydirs options = !makeflags - source = https://archive.mozilla.org/pub/firefox/releases/67.0.4/source/firefox-67.0.4.source.tar.xz - source = https://archive.mozilla.org/pub/firefox/releases/67.0.4/source/firefox-67.0.4.source.tar.xz.asc - source = https://gitlab.com/nikatar/for-aur/raw/master/firefox-appmenu/0001-bz-1521249.patch + source = https://archive.mozilla.org/pub/firefox/releases/68.0/source/firefox-68.0.source.tar.xz + source = https://archive.mozilla.org/pub/firefox/releases/68.0/source/firefox-68.0.source.tar.xz.asc source = firefox.desktop source = firefox-symbolic.svg source = unity-menubar.patch validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353 - sha256sums = b2fb2d3e64a6947ef4f8212b72649acf2aa2cd4c8f70548abb636dd581fd6dc5 + sha256sums = f7d61a08820088f1280d27f0808e355152c1dd0c94625fd077ced7319e522565 sha256sums = SKIP - sha256sums = d0673786a6a1f1b9f6f66a3a1356afa33f1f18f59dabd92bd193c88c52a1d04c sha256sums = e8d2908727309a58bee9a3dc994e85140c5977b2d486381d67d5e22ad3830d28 sha256sums = 9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797 - sha256sums = cf4bed830bc271d00029f23b9c66f5bfa286532be0848ce8a045fce78ff66341 + sha256sums = 03684be59adac8ab83c4c5cad3156879983b6d1311555fcaa8476684730d94f8 pkgname = firefox-appmenu @@ -5,8 +5,8 @@ pkgname=firefox-appmenu _pkgname=firefox -pkgver=67.0.4 -pkgrel=2 +pkgver=68.0 +pkgrel=1 pkgdesc="Firefox from extra with appmenu patch" arch=(x86_64) license=(MPL GPL LGPL) @@ -25,15 +25,13 @@ provides=("firefox=$pkgver") conflicts=("firefox") options=(!emptydirs !makeflags) source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} - "https://gitlab.com/nikatar/for-aur/raw/master/firefox-appmenu/0001-bz-1521249.patch" $_pkgname.desktop firefox-symbolic.svg unity-menubar.patch) -sha256sums=('b2fb2d3e64a6947ef4f8212b72649acf2aa2cd4c8f70548abb636dd581fd6dc5' +sha256sums=('f7d61a08820088f1280d27f0808e355152c1dd0c94625fd077ced7319e522565' 'SKIP' - 'd0673786a6a1f1b9f6f66a3a1356afa33f1f18f59dabd92bd193c88c52a1d04c' 'e8d2908727309a58bee9a3dc994e85140c5977b2d486381d67d5e22ad3830d28' '9a1a572dc88014882d54ba2d3079a1cf5b28fa03c5976ed2cb763c93dabbd797' - 'cf4bed830bc271d00029f23b9c66f5bfa286532be0848ce8a045fce78ff66341') + '03684be59adac8ab83c4c5cad3156879983b6d1311555fcaa8476684730d94f8') validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com> # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -55,8 +53,9 @@ _mozilla_api_key=16674381-f021-49de-8622-3021c5942aff _repo=https://hg.mozilla.org/releases/mozilla-release _tag=FIREFOX_${pkgver//./_}_RELEASE -_changeset=ea5154beddff08b919697e3bed6f38cfe3a3d82f -_changeset_tag=FIREFOX_67_0_4_RELEASE +_changeset=353628fec415324ca6aa333ab6c47d447ecc128e +_changeset_tag=FIREFOX_68_0_RELEASE + if [[ $1 == update_hgrev ]]; then _changeset=$(hg id -r $_tag --id $_repo --template '{node}') @@ -72,9 +71,6 @@ prepare() { mkdir mozbuild cd firefox-$pkgver - # https://bugzilla.mozilla.org/show_bug.cgi?id=1521249 - patch -Np1 -i ../0001-bz-1521249.patch - # actual appmenu patch from ubuntu repos patch -Np1 -i ../unity-menubar.patch diff --git a/unity-menubar.patch b/unity-menubar.patch index a8cbd9530c46..0f1d9bbe6702 100644 --- a/unity-menubar.patch +++ b/unity-menubar.patch @@ -14,7 +14,7 @@ <menu id="file-menu" label="&fileMenu.label;" --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js -@@ -5776,11 +5776,17 @@ function onViewToolbarsPopupShowing(aEve +@@ -5977,11 +5977,17 @@ function onViewToolbarsPopupShowing(aEve let toolbarNodes = gNavToolbox.querySelectorAll("toolbar"); @@ -34,7 +34,7 @@ "autohide" : "collapsed"; --- a/browser/components/places/content/places.xul +++ b/browser/components/places/content/places.xul -@@ -173,7 +173,7 @@ +@@ -166,7 +166,7 @@ <toolbarbutton type="menu" class="tabbable" onpopupshowing="document.getElementById('placeContent').focus()" #else @@ -45,7 +45,7 @@ id="organizeButton" label="&organize.label;" --- a/dom/xul/XULPopupElement.cpp +++ b/dom/xul/XULPopupElement.cpp -@@ -157,6 +157,10 @@ void XULPopupElement::GetState(nsString& +@@ -156,6 +156,10 @@ void XULPopupElement::GetState(nsString& // set this here in case there's no frame for the popup aState.AssignLiteral("closed"); @@ -56,7 +56,7 @@ nsMenuPopupFrame* menuPopupFrame = do_QueryFrame(GetPrimaryFrame()); if (menuPopupFrame) { switch (menuPopupFrame->PopupState()) { -@@ -180,6 +184,11 @@ void XULPopupElement::GetState(nsString& +@@ -179,6 +183,11 @@ void XULPopupElement::GetState(nsString& break; } } @@ -70,9 +70,9 @@ nsINode* XULPopupElement::GetTriggerNode() const { --- a/dom/xul/moz.build +++ b/dom/xul/moz.build -@@ -76,6 +76,11 @@ LOCAL_INCLUDES += [ - '/layout/xul/tree', - ] +@@ -78,6 +78,11 @@ LOCAL_INCLUDES += [ + + include('/ipc/chromium/chromium-config.mozbuild') +if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: + LOCAL_INCLUDES += [ @@ -97,7 +97,7 @@ 'components.conf', --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -277,6 +277,9 @@ pref("dom.window.event.enabled", true); +@@ -246,6 +246,9 @@ pref("dom.window.event.enabled", true); pref("browser.sessionhistory.max_total_viewers", -1); pref("ui.use_native_colors", true); @@ -105,11 +105,11 @@ +pref("ui.use_unity_menubar", true); +#endif pref("ui.click_hold_context_menus", false); - - // Pop up context menu on mouseup instead of mousedown, if that's the OS default. + // 0 = false, 1 = true, 2 = autodetect. + pref("ui.android.mouse_as_touch", 1); --- a/toolkit/content/xul.css +++ b/toolkit/content/xul.css -@@ -244,6 +244,18 @@ toolbar[type="menubar"] { +@@ -215,6 +215,18 @@ toolbar[type="menubar"] { } %endif @@ -146,7 +146,7 @@ 'nsWindow.cpp', # conflicts with X11 headers ] -@@ -124,6 +133,7 @@ FINAL_LIBRARY = 'xul' +@@ -127,6 +136,7 @@ FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '/layout/base', '/layout/generic', @@ -324,7 +324,7 @@ +#endif /* __nsDbusmenu_h__ */ --- /dev/null +++ b/widget/gtk/nsMenu.cpp -@@ -0,0 +1,845 @@ +@@ -0,0 +1,843 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ @@ -337,12 +337,13 @@ +#include "mozilla/dom/Document.h" +#include "mozilla/dom/Element.h" +#include "mozilla/Assertions.h" -+#include "mozilla/ComputedStyle.h" +#include "mozilla/ComputedStyleInlines.h" +#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" +#include "nsBindingManager.h" +#include "nsComponentManagerUtils.h" @@ -352,7 +353,6 @@ +#include "nsGtkUtils.h" +#include "nsAtom.h" +#include "nsIContent.h" -+#include "nsIPresShell.h" +#include "nsIRunnable.h" +#include "nsITimer.h" +#include "nsString.h" @@ -446,14 +446,13 @@ +AttachXBLBindings(nsIContent *aContent) +{ + dom::Document *doc = aContent->OwnerDoc(); -+ nsIPresShell *shell = doc->GetShell(); ++ PresShell *shell = doc->GetPresShell(); + if (!shell) { + return; + } + + RefPtr<ComputedStyle> style = -+ shell->StyleSet()->ResolveStyleFor(aContent->AsElement(), -+ LazyComputeBehavior::Allow); ++ shell->StyleSet()->ResolveStyleLazily(*aContent->AsElement()); + + if (!style) { + return; @@ -470,11 +469,10 @@ + } + + RefPtr<nsXBLBinding> binding; -+ bool dummy; + nsresult rv = xbl->LoadBindings(aContent->AsElement(), + display->mBinding->GetURI(), + display->mBinding->ExtraData()->Principal(), -+ getter_AddRefs(binding), &dummy); ++ getter_AddRefs(binding)); + if ((NS_FAILED(rv) && rv != NS_ERROR_XBL_BLOCKED) || !binding) { + return; + } @@ -2212,7 +2210,7 @@ +#endif /* __nsMenuContainer_h__ */ --- /dev/null +++ b/widget/gtk/nsMenuItem.cpp -@@ -0,0 +1,765 @@ +@@ -0,0 +1,764 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ @@ -2222,7 +2220,6 @@ + +#include "mozilla/ArrayUtils.h" +#include "mozilla/Assertions.h" -+#include "mozilla/ComputedStyle.h" +#include "mozilla/dom/Document.h" +#include "mozilla/dom/Element.h" +#include "mozilla/dom/KeyboardEventBinding.h" @@ -3078,10 +3075,11 @@ +#include "imgRequestProxy.h" +#include "mozilla/ArrayUtils.h" +#include "mozilla/Assertions.h" -+#include "mozilla/ComputedStyle.h" +#include "mozilla/dom/Document.h" +#include "mozilla/dom/Element.h" +#include "mozilla/Preferences.h" ++#include "mozilla/PresShell.h" ++#include "mozilla/PresShellInlines.h" +#include "nsAttrValue.h" +#include "nsComputedDOMStyle.h" +#include "nsContentUtils.h" @@ -3090,7 +3088,6 @@ +#include "nsIContentPolicy.h" +#include "nsILoadGroup.h" +#include "nsImageToPixbuf.h" -+#include "nsIPresShell.h" +#include "nsIURI.h" +#include "nsNetUtil.h" +#include "nsPresContext.h" @@ -3249,7 +3246,7 @@ + uriString)) { + NS_NewURI(getter_AddRefs(uri), uriString); + } else { -+ nsIPresShell *shell = doc->GetShell(); ++ PresShell *shell = doc->GetPresShell(); + if (!shell) { + return; + } @@ -3729,7 +3726,7 @@ +} --- /dev/null +++ b/widget/gtk/nsMenuObject.h -@@ -0,0 +1,172 @@ +@@ -0,0 +1,169 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ @@ -3741,15 +3738,12 @@ +#define __nsMenuObject_h__ + +#include "mozilla/Attributes.h" ++#include "mozilla/ComputedStyleInlines.h" +#include "nsCOMPtr.h" + +#include "nsDbusmenu.h" +#include "nsNativeMenuDocListener.h" + -+namespace mozilla { -+class ComputedStyle; -+} -+ +class nsIContent; +class nsMenuContainer; +class nsMenuObjectIconLoader; @@ -3904,7 +3898,7 @@ +#endif /* __nsMenuObject_h__ */ --- /dev/null +++ b/widget/gtk/nsMenuSeparator.cpp -@@ -0,0 +1,85 @@ +@@ -0,0 +1,84 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ @@ -3913,7 +3907,6 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "mozilla/Assertions.h" -+#include "mozilla/ComputedStyle.h" +#include "mozilla/Move.h" +#include "nsAutoPtr.h" +#include "nsCRT.h" @@ -5140,15 +5133,15 @@ +#endif /* __nsNativeMenuService_h__ */ --- a/widget/gtk/nsWindow.cpp +++ b/widget/gtk/nsWindow.cpp -@@ -70,6 +70,7 @@ +@@ -71,6 +71,7 @@ #include "mozilla/Assertions.h" #include "mozilla/Likely.h" +#include "mozilla/Move.h" #include "mozilla/Preferences.h" #include "nsIPrefService.h" - #include "nsIGConfService.h" -@@ -4843,6 +4844,10 @@ void nsWindow::HideWindowChrome(bool aSh + #include "nsIServiceManager.h" +@@ -5028,6 +5029,10 @@ void nsWindow::HideWindowChrome(bool aSh SetWindowDecoration(aShouldHide ? eBorderStyle_none : mBorderStyle); } @@ -5158,7 +5151,7 @@ + bool nsWindow::CheckForRollup(gdouble aMouseX, gdouble aMouseY, bool aIsWheel, bool aAlwaysRollup) { - nsIRollupListener *rollupListener = GetActiveRollupListener(); + nsIRollupListener* rollupListener = GetActiveRollupListener(); --- a/widget/gtk/nsWindow.h +++ b/widget/gtk/nsWindow.h @@ -38,6 +38,8 @@ @@ -5179,7 +5172,7 @@ /** * GetLastUserInputTime returns a timestamp for the most recent user input * event. This is intended for pointer grab requests (including drags). -@@ -622,6 +626,8 @@ class nsWindow final : public nsBaseWidg +@@ -632,6 +636,8 @@ class nsWindow final : public nsBaseWidg mozilla::UniquePtr<mozilla::CurrentX11TimeGetter> mCurrentTimeGetter; static CSDSupportLevel sCSDSupportLevel; @@ -5236,7 +5229,7 @@ import sys # Static atom definitions, used to generate nsGkAtomList.h. -@@ -2464,7 +2465,7 @@ STATIC_ATOMS = [ +@@ -2476,7 +2477,7 @@ STATIC_ATOMS = [ InheritingAnonBoxAtom("AnonBox_mozSVGForeignContent", ":-moz-svg-foreign-content"), InheritingAnonBoxAtom("AnonBox_mozSVGText", ":-moz-svg-text"), # END ATOMS |