diff options
author | nikatar | 2021-07-16 11:18:47 +0300 |
---|---|---|
committer | nikatar | 2021-07-16 11:18:47 +0300 |
commit | 21cff64aed13855d1d86c426b586258f8c18d4d8 (patch) | |
tree | c0a48f336d201ed6bedd99fe22ac762cd9600cc1 | |
parent | 660eee94705d2c9157f5a1b6f10d7415928a5220 (diff) | |
download | aur-21cff64aed13855d1d86c426b586258f8c18d4d8.tar.gz |
90.0-1
-rw-r--r-- | .SRCINFO | 15 | ||||
-rw-r--r-- | 0001-Use-remoting-name-for-GDK-application-names.patch | 8 | ||||
-rw-r--r-- | PKGBUILD | 12 | ||||
-rw-r--r-- | unity-menubar.patch | 37 |
4 files changed, 35 insertions, 37 deletions
@@ -1,6 +1,6 @@ pkgbase = firefox-appmenu pkgdesc = Firefox from extra with appmenu patch - pkgver = 89.0.2 + pkgver = 90.0 pkgrel = 1 url = https://www.mozilla.org/firefox/ arch = x86_64 @@ -20,7 +20,6 @@ pkgbase = firefox-appmenu makedepends = clang makedepends = llvm makedepends = jack - makedepends = gtk2 makedepends = nodejs makedepends = cbindgen makedepends = nasm @@ -44,23 +43,23 @@ pkgbase = firefox-appmenu optdepends = speech-dispatcher: Text-to-Speech optdepends = hunspell-en_US: Spell checking, American English optdepends = xdg-desktop-portal: Screensharing with Wayland - provides = firefox=89.0.2 + provides = firefox=90.0 conflicts = firefox options = !emptydirs options = !makeflags options = !strip - source = https://archive.mozilla.org/pub/firefox/releases/89.0.2/source/firefox-89.0.2.source.tar.xz - source = https://archive.mozilla.org/pub/firefox/releases/89.0.2/source/firefox-89.0.2.source.tar.xz.asc + source = https://archive.mozilla.org/pub/firefox/releases/90.0/source/firefox-90.0.source.tar.xz + source = https://archive.mozilla.org/pub/firefox/releases/90.0/source/firefox-90.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 = 3225f583c5e36bdf52ad16f71a2c359deb0c765c38205acdeb6b7b6520ac5494 + sha256sums = 43a943e7d7660c6d7f5b41c95b344b7fd6a4a88ad0bb45dbd844b372ea60d58b sha256sums = SKIP - sha256sums = 98b6b30973bb1e12e17e8a78baf7d1db0d5085f35252f4611870bb23e8faeff1 + sha256sums = 7e7435e8171426e87a84cecf9eb017cb969c9c85d973feb78c1e05771972b6e9 sha256sums = 34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c - sha256sums = 2337ac2af70d547b577420211c1f13de75f679fca8cdc51bfb3fff5300621091 + sha256sums = f5e5af8cfb8db2e0ed2e3cb8ae844ece713923ca103deb63c689c2011eb57cb7 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 605be7c75ca1..f85be967f374 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 3a9928cee4525..da60306cfaf01 100644 +index 3ec33c9b45417..56081f76a0074 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -4358,11 +4358,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { +@@ -4252,11 +4252,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { // consistently. // Set program name to the one defined in application.ini. @@ -26,7 +26,7 @@ index 3a9928cee4525..da60306cfaf01 100644 // Initialize GTK here for splash. diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp -index 24bdd5083375b..74dd54a5ae0e6 100644 +index 60de473de07ab..004c066575c17 100644 --- a/widget/gtk/nsAppShell.cpp +++ b/widget/gtk/nsAppShell.cpp @@ -24,6 +24,8 @@ @@ -38,7 +38,7 @@ index 24bdd5083375b..74dd54a5ae0e6 100644 #include "ScreenHelperGTK.h" #include "HeadlessScreenHelper.h" #include "mozilla/widget/ScreenManager.h" -@@ -153,13 +155,9 @@ nsresult nsAppShell::Init() { +@@ -152,13 +154,9 @@ nsresult nsAppShell::Init() { // See https://bugzilla.gnome.org/show_bug.cgi?id=747634 // // Only bother doing this for the parent process, since it's the one @@ -7,7 +7,7 @@ pkgname=firefox-appmenu _pkgname=firefox -pkgver=89.0.2 +pkgver=90.0 pkgrel=1 pkgdesc="Firefox from extra with appmenu patch" arch=(x86_64) @@ -15,7 +15,7 @@ license=(MPL GPL LGPL) url="https://www.mozilla.org/firefox/" 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 + autoconf2.13 rust clang llvm jack nodejs cbindgen nasm python-setuptools python-psutil python-zstandard lld dump_syms) optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' @@ -31,11 +31,11 @@ source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox- $_pkgname.desktop unity-menubar.patch fix_csd_window_buttons.patch) -sha256sums=('3225f583c5e36bdf52ad16f71a2c359deb0c765c38205acdeb6b7b6520ac5494' +sha256sums=('43a943e7d7660c6d7f5b41c95b344b7fd6a4a88ad0bb45dbd844b372ea60d58b' 'SKIP' - '98b6b30973bb1e12e17e8a78baf7d1db0d5085f35252f4611870bb23e8faeff1' + '7e7435e8171426e87a84cecf9eb017cb969c9c85d973feb78c1e05771972b6e9' '34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c' - '2337ac2af70d547b577420211c1f13de75f679fca8cdc51bfb3fff5300621091' + 'f5e5af8cfb8db2e0ed2e3cb8ae844ece713923ca103deb63c689c2011eb57cb7' 'e08d0bc5b7e562f5de6998060e993eddada96d93105384960207f7bdf2e1ed6e') validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com> @@ -79,6 +79,7 @@ ac_add_options --enable-optimize ac_add_options --enable-rust-simd ac_add_options --enable-linker=lld ac_add_options --disable-elf-hack +ac_add_options --disable-bootstrap export CC='clang --target=x86_64-unknown-linux-gnu' export CXX='clang++ --target=x86_64-unknown-linux-gnu' export AR=llvm-ar @@ -93,7 +94,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_REQUIRE_SIGNING=1 # Keys ac_add_options --with-google-location-service-api-keyfile=${PWD@Q}/google-api-key diff --git a/unity-menubar.patch b/unity-menubar.patch index 7e0141588cf3..0c4103b66447 100644 --- a/unity-menubar.patch +++ b/unity-menubar.patch @@ -107,9 +107,9 @@ +#ifdef MOZ_WIDGET_GTK +pref("ui.use_unity_menubar", true); +#endif - // 0 = false, 1 = true, 2 = autodetect. - pref("ui.android.mouse_as_touch", 1); + pref("browser.display.force_inline_alttext", false); // true = force ALT text for missing images to be layed out inline + // 0 = no external leading, --- a/toolkit/content/xul.css +++ b/toolkit/content/xul.css @@ -230,6 +230,13 @@ toolbar[type="menubar"] { @@ -128,24 +128,23 @@ } --- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build -@@ -33,11 +33,16 @@ EXPORTS += [ - +@@ -33,6 +33,7 @@ EXPORTS.mozilla += ["WidgetUtilsGtk.h"] -+EXPORTS.mozilla.widget += [ + EXPORTS.mozilla.widget += [ + "NativeMenuSupport.h", -+] -+ - UNIFIED_SOURCES += [ - "IMContextWrapper.cpp", + "WindowSurface.h", + "WindowSurfaceProvider.h", + ] +@@ -45,6 +46,7 @@ "MozContainer.cpp", "MPRISServiceHandler.cpp", "NativeKeyBindings.cpp", + "NativeMenuSupport.cpp", + "nsApplicationChooser.cpp", "nsAppShell.cpp", "nsBidiKeyboard.cpp", - "nsColorPicker.cpp", -@@ -59,6 +64,15 @@ UNIFIED_SOURCES += [ +@@ -70,6 +72,15 @@ SOURCES += [ "MediaKeysEventSourceFactory.cpp", @@ -158,10 +157,10 @@ + "nsMenuSeparator.cpp", + "nsNativeMenuDocListener.cpp", + "nsNativeMenuService.cpp", + "nsNativeThemeGTK.cpp", # conflicts with X11 headers "nsWindow.cpp", # conflicts with X11 headers "WaylandVsyncSource.cpp", # conflicts with X11 headers - ] -@@ -139,6 +153,7 @@ LOCAL_INCLUDES += [ +@@ -138,6 +149,7 @@ "/layout/base", "/layout/forms", "/layout/generic", @@ -5078,14 +5077,14 @@ --- a/widget/gtk/nsWindow.h +++ b/widget/gtk/nsWindow.h @@ -39,6 +39,8 @@ - + #include "nsRefPtrHashtable.h" #include "IMContextWrapper.h" +#include "nsMenuBar.h" + - #undef LOG - #ifdef MOZ_LOGGING - + #ifdef ACCESSIBILITY + # include "mozilla/a11y/LocalAccessible.h" + #endif @@ -168,6 +170,8 @@ class nsWindow final : public nsBaseWidg nsIScreen* aTargetScreen = nullptr) override; virtual void HideWindowChrome(bool aShouldHide) override; @@ -5101,9 +5100,9 @@ static bool sTransparentMainWindow; + + mozilla::UniquePtr<nsMenuBar> mMenuBar; - }; - #endif /* __nsWindow_h__ */ + #ifdef ACCESSIBILITY + RefPtr<mozilla::a11y::LocalAccessible> mRootAccessible; --- /dev/null +++ b/xpcom/ds/NativeMenuAtoms.py @@ -0,0 +1,9 @@ |