diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | 0001-Bug-1623885-Add-subsystem-to-Mesa-sandbox-policy-to-.patch | 35 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | unity-menubar.patch | 54 |
4 files changed, 39 insertions, 81 deletions
@@ -1,6 +1,6 @@ pkgbase = firefox-appmenu pkgdesc = Firefox from extra with appmenu patch - pkgver = 75.0 + pkgver = 76.0 pkgrel = 2 url = https://www.mozilla.org/firefox/ arch = x86_64 @@ -41,23 +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=75.0 + provides = firefox=76.0 options = !emptydirs options = !makeflags options = !strip - source = https://archive.mozilla.org/pub/firefox/releases/75.0/source/firefox-75.0.source.tar.xz - source = https://archive.mozilla.org/pub/firefox/releases/75.0/source/firefox-75.0.source.tar.xz.asc - source = 0001-Bug-1623885-Add-subsystem-to-Mesa-sandbox-policy-to-.patch + source = https://archive.mozilla.org/pub/firefox/releases/76.0/source/firefox-76.0.source.tar.xz + source = https://archive.mozilla.org/pub/firefox/releases/76.0/source/firefox-76.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 = bbb1054d8f2717c634480556d3753a8483986af7360e023bb6232df80b746b0f + sha256sums = 3b7b97b0b0625fc6ec23ee28d425988c679d3a56f362d62fd3b225a5d50afdc8 sha256sums = SKIP - sha256sums = ebb169804750ddc10a4801ed6ddb37356331bbf76615f58eb29de2e6e15ee930 sha256sums = 5f7ac724a5c5afd9322b1e59006f4170ea5354ca1e0e60dab08b7784c2d8463c sha256sums = 34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c - sha256sums = 364e5c59a5a55d0be43bcb090dec51476580d0c35b63c0974a25bfeba212a1fc + sha256sums = 3e5e34b8d45b9cc48e78e9c474f2450cc597451bbb331fb5a4e8f3a3ba5e3a70 pkgname = firefox-appmenu diff --git a/0001-Bug-1623885-Add-subsystem-to-Mesa-sandbox-policy-to-.patch b/0001-Bug-1623885-Add-subsystem-to-Mesa-sandbox-policy-to-.patch deleted file mode 100644 index eb9667476110..000000000000 --- a/0001-Bug-1623885-Add-subsystem-to-Mesa-sandbox-policy-to-.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0447215abf836bbb8eef53aeccf029dd40bd1a52 Mon Sep 17 00:00:00 2001 -From: Jeff Gilbert <jgilbert@mozilla.com> -Date: Sun, 12 Apr 2020 21:21:32 +0000 -Subject: [PATCH] Bug 1623885 - Add "subsystem" to Mesa sandbox policy to fix - libdrm-2.4.101+. r=gcp, a=RyanVM - -Differential Revision: https://phabricator.services.mozilla.com/D70579 ---- - .../linux/broker/SandboxBrokerPolicyFactory.cpp | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp b/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp -index 3aa7cf27e353..0b3948ebd92e 100644 ---- a/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp -+++ b/security/sandbox/linux/broker/SandboxBrokerPolicyFactory.cpp -@@ -86,10 +86,12 @@ static void AddMesaSysfsPaths(SandboxBroker::Policy* aPolicy) { - // broker. To match this, allow the canonical paths. - UniqueFreePtr<char[]> realSysPath(realpath(sysPath.get(), nullptr)); - if (realSysPath) { -- static const Array<const char*, 7> kMesaAttrSuffixes = { -- "revision", "vendor", "device", "subsystem_vendor", -- "subsystem_device", "uevent", "config"}; -- for (const auto attrSuffix : kMesaAttrSuffixes) { -+ constexpr const char* kMesaAttrSuffixes[] = { -+ "config", "device", "revision", -+ "subsystem", "subsystem_device", "subsystem_vendor", -+ "uevent", "vendor", -+ }; -+ for (const auto& attrSuffix : kMesaAttrSuffixes) { - nsPrintfCString attrPath("%s/%s", realSysPath.get(), - attrSuffix); - aPolicy->AddPath(rdonly, attrPath.get()); --- -2.26.2 - @@ -7,7 +7,7 @@ pkgname=firefox-appmenu _pkgname=firefox -pkgver=75.0 +pkgver=76.0 pkgrel=2 pkgdesc="Firefox from extra with appmenu patch" arch=(x86_64) @@ -27,16 +27,14 @@ provides=("firefox=$pkgver") conflict=("firefox") options=(!emptydirs !makeflags !strip) source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} - 0001-Bug-1623885-Add-subsystem-to-Mesa-sandbox-policy-to-.patch 0001-Use-remoting-name-for-GDK-application-names.patch $_pkgname.desktop unity-menubar.patch) -sha256sums=('bbb1054d8f2717c634480556d3753a8483986af7360e023bb6232df80b746b0f' +sha256sums=('3b7b97b0b0625fc6ec23ee28d425988c679d3a56f362d62fd3b225a5d50afdc8' 'SKIP' - 'ebb169804750ddc10a4801ed6ddb37356331bbf76615f58eb29de2e6e15ee930' '5f7ac724a5c5afd9322b1e59006f4170ea5354ca1e0e60dab08b7784c2d8463c' '34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c' - '364e5c59a5a55d0be43bcb090dec51476580d0c35b63c0974a25bfeba212a1fc') + '3e5e34b8d45b9cc48e78e9c474f2450cc597451bbb331fb5a4e8f3a3ba5e3a70') validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com> # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -54,15 +52,12 @@ _mozilla_api_key=e05d56db0a694edc8b5aaebda3f2db6a prepare() { mkdir mozbuild cd firefox-$pkgver - - # https://bugs.archlinux.org/task/66185 - patch -Np1 -i ../0001-Bug-1623885-Add-subsystem-to-Mesa-sandbox-policy-to-.patch # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052 patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch # actual appmenu patch from ubuntu repos - # http://archive.ubuntu.com/ubuntu/pool/main/f/firefox/firefox_75.0+build3-0ubuntu0.18.04.1.debian.tar.xz + # http://archive.ubuntu.com/ubuntu/pool/main/f/firefox/firefox_76.0+build2-0ubuntu0.18.04.1.debian.tar.xz patch -Np1 -i ../unity-menubar.patch echo -n "$_google_api_key" >google-api-key @@ -98,10 +93,6 @@ ac_add_options --with-google-location-service-api-keyfile=${PWD@Q}/google-api-ke ac_add_options --with-google-safebrowsing-api-keyfile=${PWD@Q}/google-api-key ac_add_options --with-mozilla-api-keyfile=${PWD@Q}/mozilla-api-key -# System libraries -ac_add_options --with-system-nspr -ac_add_options --with-system-nss - # Features ac_add_options --enable-alsa ac_add_options --enable-jack diff --git a/unity-menubar.patch b/unity-menubar.patch index ef691df9d94c..ee88291d15cc 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 -@@ -6506,11 +6506,17 @@ function onViewToolbarsPopupShowing(aEve +@@ -6373,11 +6373,17 @@ function onViewToolbarsPopupShowing(aEve let toolbarNodes = gNavToolbox.querySelectorAll("toolbar"); @@ -45,7 +45,7 @@ id="organizeButton" label="&organize.label;" --- a/dom/xul/XULPopupElement.cpp +++ b/dom/xul/XULPopupElement.cpp -@@ -156,6 +156,10 @@ void XULPopupElement::GetState(nsString& +@@ -158,6 +158,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()) { -@@ -179,6 +183,11 @@ void XULPopupElement::GetState(nsString& +@@ -181,6 +185,11 @@ void XULPopupElement::GetState(nsString& break; } } @@ -70,7 +70,7 @@ nsINode* XULPopupElement::GetTriggerNode() const { --- a/dom/xul/moz.build +++ b/dom/xul/moz.build -@@ -82,6 +82,11 @@ LOCAL_INCLUDES += [ +@@ -83,6 +83,11 @@ LOCAL_INCLUDES += [ include('/ipc/chromium/chromium-config.mozbuild') @@ -97,7 +97,7 @@ 'components.conf', --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -313,6 +313,9 @@ pref("dom.mouseevent.click.hack.use_lega +@@ -317,6 +317,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 -@@ -206,6 +206,13 @@ toolbar[type="menubar"] { +@@ -204,6 +204,13 @@ toolbar[type="menubar"] { } %endif @@ -125,7 +125,7 @@ } --- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build -@@ -54,6 +54,15 @@ UNIFIED_SOURCES += [ +@@ -55,6 +55,15 @@ UNIFIED_SOURCES += [ SOURCES += [ 'MediaKeysEventSourceFactory.cpp', @@ -141,7 +141,7 @@ 'nsWindow.cpp', # conflicts with X11 headers 'WaylandVsyncSource.cpp', # conflicts with X11 headers ] -@@ -131,6 +140,7 @@ FINAL_LIBRARY = 'xul' +@@ -132,6 +141,7 @@ FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '/layout/base', '/layout/generic', @@ -2157,7 +2157,7 @@ +#endif /* __nsMenuContainer_h__ */ --- /dev/null +++ b/widget/gtk/nsMenuItem.cpp -@@ -0,0 +1,763 @@ +@@ -0,0 +1,767 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: + */ @@ -2740,6 +2740,10 @@ + for (uint32_t i = 0; i < count; ++i) { + nsIContent *sibling = parent->GetChildAt_Deprecated(i); + ++ if (sibling->IsComment()) { ++ continue; ++ } ++ + nsAutoString otherName; + sibling->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::name, + otherName); @@ -3095,16 +3099,16 @@ + +NS_IMPL_ISUPPORTS(nsMenuObjectIconLoader, imgINotificationObserver) + -+NS_IMETHODIMP ++void +nsMenuObjectIconLoader::Notify(imgIRequest *aProxy, + int32_t aType, const nsIntRect *aRect) +{ + if (!mOwner) { -+ return NS_OK; ++ return; + } + + if (aProxy != mImageRequest) { -+ return NS_ERROR_FAILURE; ++ return; + } + + if (aType == imgINotificationObserver::LOAD_COMPLETE) { @@ -3113,7 +3117,7 @@ + (status & imgIRequest::STATUS_ERROR)) { + mImageRequest->Cancel(NS_BINDING_ABORTED); + mImageRequest = nullptr; -+ return NS_ERROR_FAILURE; ++ return; + } + + nsCOMPtr<imgIContainer> image; @@ -3125,23 +3129,23 @@ + image->GetWidth(&width); + image->GetHeight(&height); + image->RequestDecodeForSize(nsIntSize(width, height), imgIContainer::FLAG_NONE); -+ return NS_OK; ++ return; + } + + if (aType == imgINotificationObserver::DECODE_COMPLETE) { + mImageRequest->Cancel(NS_BINDING_ABORTED); + mImageRequest = nullptr; -+ return NS_OK; ++ return; + } + + if (aType != imgINotificationObserver::FRAME_COMPLETE) { -+ return NS_OK; ++ return; + } + + nsCOMPtr<imgIContainer> img; + mImageRequest->GetImage(getter_AddRefs(img)); + if (!img) { -+ return NS_ERROR_FAILURE; ++ return; + } + + if (!mImageRect.IsEmpty()) { @@ -3154,7 +3158,7 @@ + + if (width <= 0 || height <= 0) { + mOwner->ClearIcon(); -+ return NS_OK; ++ return; + } + + if (width > 100 || height > 100) { @@ -3163,7 +3167,7 @@ + // GDbus helpfully aborts the application. Thank you :) + NS_WARNING("Icon data too large"); + mOwner->ClearIcon(); -+ return NS_OK; ++ return; + } + + GdkPixbuf *pixbuf = nsImageToPixbuf::ImageToPixbuf(img); @@ -3174,7 +3178,7 @@ + g_object_unref(pixbuf); + } + -+ return NS_OK; ++ return; +} + +void @@ -5078,7 +5082,7 @@ +#endif /* __nsNativeMenuService_h__ */ --- a/widget/gtk/nsWindow.cpp +++ b/widget/gtk/nsWindow.cpp -@@ -5669,6 +5669,10 @@ void nsWindow::HideWindowChrome(bool aSh +@@ -5793,6 +5793,10 @@ void nsWindow::HideWindowChrome(bool aSh SetWindowDecoration(aShouldHide ? eBorderStyle_none : mBorderStyle); } @@ -5100,7 +5104,7 @@ #undef LOG #ifdef MOZ_LOGGING -@@ -184,6 +186,8 @@ class nsWindow final : public nsBaseWidg +@@ -186,6 +188,8 @@ class nsWindow final : public nsBaseWidg nsIScreen* aTargetScreen = nullptr) override; virtual void HideWindowChrome(bool aShouldHide) override; @@ -5109,7 +5113,7 @@ /** * GetLastUserInputTime returns a timestamp for the most recent user input * event. This is intended for pointer grab requests (including drags). -@@ -708,6 +712,8 @@ class nsWindow final : public nsBaseWidg +@@ -712,6 +716,8 @@ class nsWindow final : public nsBaseWidg mozilla::UniquePtr<mozilla::CurrentX11TimeGetter> mCurrentTimeGetter; static CSDSupportLevel sCSDSupportLevel; @@ -5155,7 +5159,7 @@ import sys # Static atom definitions, used to generate nsGkAtomList.h. -@@ -2532,7 +2533,7 @@ STATIC_ATOMS = [ +@@ -2537,7 +2538,7 @@ STATIC_ATOMS = [ InheritingAnonBoxAtom("AnonBox_mozSVGForeignContent", ":-moz-svg-foreign-content"), InheritingAnonBoxAtom("AnonBox_mozSVGText", ":-moz-svg-text"), # END ATOMS @@ -5183,7 +5187,7 @@ if defined('MOZ_X11'): --- a/xpfe/appshell/AppWindow.cpp +++ b/xpfe/appshell/AppWindow.cpp -@@ -65,7 +65,7 @@ +@@ -66,7 +66,7 @@ # include "mozilla/XULStore.h" #endif |