summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO31
-rw-r--r--0021-Make-PGO-use-toolchain.patch6
-rw-r--r--0028-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch8
-rw-r--r--0029-Make-elfhack-use-toolchain.patch6
-rw-r--r--PKGBUILD25
-rw-r--r--fix-wayland-build.patch25
-rw-r--r--mozconfig1
-rw-r--r--unity-menubar.patch37
8 files changed, 85 insertions, 54 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 50b5e2a94502..db2839f17a1d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat Aug 21 01:05:06 UTC 2021
+# Sat Aug 21 03:49:56 UTC 2021
pkgbase = firefox-kde-opensuse
pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE
- pkgver = 89.0.2
+ pkgver = 91.0.1
pkgrel = 1
url = https://github.com/openSUSE/firefox-maintenance
arch = i686
@@ -26,7 +26,6 @@ pkgbase = firefox-kde-opensuse
makedepends = clang
makedepends = rust
makedepends = jack
- makedepends = gtk2
makedepends = nodejs
makedepends = cbindgen
makedepends = nasm
@@ -60,18 +59,18 @@ pkgbase = firefox-kde-opensuse
optdepends = networkmanager: Location detection via available WiFi networks
optdepends = speech-dispatcher: Text-to-Speech
optdepends = pulseaudio: Audio support
- provides = firefox=89.0.2
+ provides = firefox=91.0.1
conflicts = firefox
options = !emptydirs
- source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_89_0_2_RELEASE
+ source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_91_0_1_RELEASE
source = mozconfig
source = firefox.desktop
source = vendor.js
source = kde.js
- source = firefox-branded-icons-bf580bacd132687dc0135959fbc9eeb8d8ba3ea9.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/bf580bacd132687dc0135959fbc9eeb8d8ba3ea9/firefox/firefox-branded-icons.patch
- source = firefox-kde-bf580bacd132687dc0135959fbc9eeb8d8ba3ea9.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/bf580bacd132687dc0135959fbc9eeb8d8ba3ea9/firefox/firefox-kde.patch
- source = mozilla-kde-bf580bacd132687dc0135959fbc9eeb8d8ba3ea9.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/bf580bacd132687dc0135959fbc9eeb8d8ba3ea9/mozilla-kde.patch
- source = mozilla-nongnome-proxies-bf580bacd132687dc0135959fbc9eeb8d8ba3ea9.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/bf580bacd132687dc0135959fbc9eeb8d8ba3ea9/mozilla-nongnome-proxies.patch
+ source = firefox-branded-icons-8bdd012e04c6e6c3f01d937faf16f3474685b9cb.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/8bdd012e04c6e6c3f01d937faf16f3474685b9cb/firefox/firefox-branded-icons.patch
+ source = firefox-kde-8bdd012e04c6e6c3f01d937faf16f3474685b9cb.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/8bdd012e04c6e6c3f01d937faf16f3474685b9cb/firefox/firefox-kde.patch
+ source = mozilla-kde-8bdd012e04c6e6c3f01d937faf16f3474685b9cb.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/8bdd012e04c6e6c3f01d937faf16f3474685b9cb/mozilla-kde.patch
+ source = mozilla-nongnome-proxies-8bdd012e04c6e6c3f01d937faf16f3474685b9cb.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/8bdd012e04c6e6c3f01d937faf16f3474685b9cb/mozilla-nongnome-proxies.patch
source = unity-menubar.patch
source = add_missing_pgo_rule.patch
source = pgo_fix_missing_kdejs.patch
@@ -87,16 +86,17 @@ pkgbase = firefox-kde-opensuse
source = 0028-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
source = 0029-Make-elfhack-use-toolchain.patch
source = fix_csd_window_buttons.patch
+ source = fix-wayland-build.patch
md5sums = SKIP
- md5sums = 1fd86cc439737c90a5854aab7f85080f
+ md5sums = 72724b401217f1d0b380b4ee2872ad82
md5sums = a26a061efb4def6572d5b319d657f1d6
md5sums = 4c23d9c0a691d70919beb1dafbbecbd3
md5sums = 05bb69d25fb3572c618e3adf1ee7b670
md5sums = c0f68250d27f208efcdee710207cd3e4
md5sums = 43c65f6513fbc28aaa8238ad3bdb4e26
- md5sums = 7a97237384119556880ab5393c9091a3
+ md5sums = 14ada9ebd479223d5f95a615caa50bcd
md5sums = 0a5733b7a457a2786c2dd27626a1bf88
- md5sums = e81dfd1207442ccef8afd8bb5fecb3b5
+ md5sums = 0d7f0fe667c3e9e54f95fa51e9560eed
md5sums = fe24f5ea463013bb7f1c12d12dce41b2
md5sums = 3c383d371d7f6ede5983a40310518715
md5sums = 6a1ed12b8dbac57722436a2987e3ea33
@@ -105,12 +105,13 @@ pkgbase = firefox-kde-opensuse
md5sums = e7994b3b78b780ebe610ba3d87247e40
md5sums = 00abc3976f028f8fe07111b9e687b574
md5sums = c7b492df4fbf42ffe8aea4c0afb89921
- md5sums = 5f3d8a91f73b319310cddbf596bb1850
+ md5sums = 04d226e7e748141d447ea28535890631
md5sums = c2ccbfca8c29fb6d960206af335c1d8e
md5sums = b21033ca08953e7ce8304a208869eed1
- md5sums = 5634ebb84f82d0d14d59715172219b27
- md5sums = 11ea83f4953e77509505054d97a60af5
+ md5sums = d928ecb61da7628d4e7981ebf7e4c879
+ md5sums = 5cf84ebbd3c787b56198c32a91b4df16
md5sums = f49ac3b9f5146e33ce587e6b23eb1a86
+ md5sums = eb9fd90a3b18bfeebbed7e0e6056079c
pkgname = firefox-kde-opensuse
diff --git a/0021-Make-PGO-use-toolchain.patch b/0021-Make-PGO-use-toolchain.patch
index e020fb4e1298..ac3c5834cb57 100644
--- a/0021-Make-PGO-use-toolchain.patch
+++ b/0021-Make-PGO-use-toolchain.patch
@@ -1,7 +1,7 @@
-From 665e9833bc25fdcd8f7bfff50bd447de8abf50fd Mon Sep 17 00:00:00 2001
+From bf3c53a3dd028dffc6c1d61fd2969825f0d5928f Mon Sep 17 00:00:00 2001
From: Thomas Deutschmann <whissi@gentoo.org>
Date: Mon, 6 Apr 2020 20:13:34 +0200
-Subject: [PATCH 21/37] Make PGO use toolchain
+Subject: [PATCH 21/35] Make PGO use toolchain
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---
@@ -29,5 +29,5 @@ index 3927dd907b..cb4819b230 100644
# package.
mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH"
--
-2.31.1
+2.32.0
diff --git a/0028-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch b/0028-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
index ec6e6eda5e4b..4938d8cff7eb 100644
--- a/0028-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
+++ b/0028-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch
@@ -1,7 +1,7 @@
-From fc0da069a26acffede07ab50317f6520b5c4d6de Mon Sep 17 00:00:00 2001
+From 0ad7c12c402a0b3b999fea3e8db3d991b4aa522c Mon Sep 17 00:00:00 2001
From: Thomas Deutschmann <whissi@gentoo.org>
Date: Sat, 29 Aug 2020 22:30:59 +0200
-Subject: [PATCH 28/37] LTO: Only enable LTO for Rust when complete build uses
+Subject: [PATCH 28/35] LTO: Only enable LTO for Rust when complete build uses
LTO
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
@@ -10,7 +10,7 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
1 file changed, 2 insertions(+)
diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
-index 38e647c101..e683f5ec7e 100644
+index 49d25655b1..b3ac4763c7 100644
--- a/config/makefiles/rust.mk
+++ b/config/makefiles/rust.mk
@@ -64,6 +64,7 @@ endif
@@ -30,5 +30,5 @@ index 38e647c101..e683f5ec7e 100644
ifdef CARGO_INCREMENTAL
export CARGO_INCREMENTAL
--
-2.31.1
+2.32.0
diff --git a/0029-Make-elfhack-use-toolchain.patch b/0029-Make-elfhack-use-toolchain.patch
index 5b41b2c07bbf..cfa9d170f2f9 100644
--- a/0029-Make-elfhack-use-toolchain.patch
+++ b/0029-Make-elfhack-use-toolchain.patch
@@ -1,7 +1,7 @@
-From 22639bcf27d94b1dea4458a50415370fb71126e8 Mon Sep 17 00:00:00 2001
+From f06d30920fa9c6520879231968a0823d5bb377c1 Mon Sep 17 00:00:00 2001
From: Thomas Deutschmann <whissi@gentoo.org>
Date: Mon, 28 Sep 2020 20:52:24 +0200
-Subject: [PATCH 29/37] Make elfhack use toolchain
+Subject: [PATCH 29/35] Make elfhack use toolchain
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---
@@ -22,5 +22,5 @@ index 08cc3d6852..c2b575d87a 100644
test-array$(DLL_SUFFIX) test-ctors$(DLL_SUFFIX): DSO_SONAME=$@
test-array$(DLL_SUFFIX): DT_TYPE=INIT_ARRAY
--
-2.31.1
+2.32.0
diff --git a/PKGBUILD b/PKGBUILD
index 7529f656299e..0e64fcdaa3be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ _pgo=true
_pkgname=firefox
pkgname=$_pkgname-kde-opensuse
-pkgver=89.0.2
+pkgver=91.0.1
pkgrel=1
pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
arch=('i686' 'x86_64')
@@ -38,7 +38,7 @@ depends=('libxt' 'mime-types'
makedepends=('unzip' 'zip' 'diffutils' 'yasm' 'mesa' 'imake'
'xorg-server-xvfb' 'libpulse' 'inetutils' 'autoconf2.13'
'cargo' 'mercurial' 'llvm' 'clang' 'rust' 'jack'
- 'gtk2' 'nodejs' 'cbindgen' 'nasm' 'xz'
+ 'nodejs' 'cbindgen' 'nasm' 'xz'
'python' 'python-psutil' 'python-zstandard' 'dump_syms')
@@ -52,7 +52,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
'pulseaudio: Audio support')
provides=("firefox=${pkgver}")
conflicts=('firefox')
-_patchrev=bf580bacd132687dc0135959fbc9eeb8d8ba3ea9
+_patchrev=8bdd012e04c6e6c3f01d937faf16f3474685b9cb
options=('!emptydirs')
_patchurl=https://raw.githubusercontent.com/openSUSE/firefox-maintenance/$_patchrev
_repo=https://hg.mozilla.org/mozilla-unified
@@ -99,6 +99,8 @@ source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
# end
# Fix CSD when globalmenu is active #8
fix_csd_window_buttons.patch
+ # Workaround #14
+ fix-wayland-build.patch
)
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -156,6 +158,8 @@ prepare() {
# Fix CSD when globalmenu is active #8
patch -Np1 -i "$srcdir"/fix_csd_window_buttons.patch
+ # Workaround #14
+ patch -Np1 -i "$srcdir"/fix-wayland-build.patch
if [ $_pgo ] ; then
# Fix MOZILLA#1516803
@@ -266,15 +270,15 @@ END
ln -sf firefox "$pkgdir/usr/lib/firefox/firefox-bin"
}
md5sums=('SKIP'
- '1fd86cc439737c90a5854aab7f85080f'
+ '72724b401217f1d0b380b4ee2872ad82'
'a26a061efb4def6572d5b319d657f1d6'
'4c23d9c0a691d70919beb1dafbbecbd3'
'05bb69d25fb3572c618e3adf1ee7b670'
'c0f68250d27f208efcdee710207cd3e4'
'43c65f6513fbc28aaa8238ad3bdb4e26'
- '7a97237384119556880ab5393c9091a3'
+ '14ada9ebd479223d5f95a615caa50bcd'
'0a5733b7a457a2786c2dd27626a1bf88'
- 'e81dfd1207442ccef8afd8bb5fecb3b5'
+ '0d7f0fe667c3e9e54f95fa51e9560eed'
'fe24f5ea463013bb7f1c12d12dce41b2'
'3c383d371d7f6ede5983a40310518715'
'6a1ed12b8dbac57722436a2987e3ea33'
@@ -283,9 +287,10 @@ md5sums=('SKIP'
'e7994b3b78b780ebe610ba3d87247e40'
'00abc3976f028f8fe07111b9e687b574'
'c7b492df4fbf42ffe8aea4c0afb89921'
- '5f3d8a91f73b319310cddbf596bb1850'
+ '04d226e7e748141d447ea28535890631'
'c2ccbfca8c29fb6d960206af335c1d8e'
'b21033ca08953e7ce8304a208869eed1'
- '5634ebb84f82d0d14d59715172219b27'
- '11ea83f4953e77509505054d97a60af5'
- 'f49ac3b9f5146e33ce587e6b23eb1a86')
+ 'd928ecb61da7628d4e7981ebf7e4c879'
+ '5cf84ebbd3c787b56198c32a91b4df16'
+ 'f49ac3b9f5146e33ce587e6b23eb1a86'
+ 'eb9fd90a3b18bfeebbed7e0e6056079c')
diff --git a/fix-wayland-build.patch b/fix-wayland-build.patch
new file mode 100644
index 000000000000..e3a58c6ef2dd
--- /dev/null
+++ b/fix-wayland-build.patch
@@ -0,0 +1,25 @@
+Description: Fix FTBFS on bionic. Compiler errors:
+ In file included from Unified_cpp_widget_gtk2.cpp:2:
+ In file included from /<<BUILDDIR>>/firefox-91.0~b9+build1/widget/gtk/nsClipboardWayland.cpp:12:
+ /<<BUILDDIR>>/firefox-91.0~b9+build1/widget/gtk/nsClipboardWayland.h:53:30: error: unknown type name 'nsWaylandDragContext'
+ void SetWaylandDragContext(nsWaylandDragContext* aDragContext);
+ ^
+ /<<BUILDDIR>>/firefox-91.0~b9+build1/widget/gtk/nsClipboardWayland.h:54:3: error: unknown type name 'nsWaylandDragContext'
+ nsWaylandDragContext* GetWaylandDragContext();
+ ^
+ /<<BUILDDIR>>/firefox-91.0~b9+build1/widget/gtk/nsClipboardWayland.h:62:10: error: use of undeclared identifier 'nsWaylandDragContext'
+ RefPtr<nsWaylandDragContext> mDragContext;
+ ^
+Author: Rico Tzschichholz <ricotz@ubuntu.com>
+
+--- a/widget/gtk/nsClipboardWayland.h
++++ b/widget/gtk/nsClipboardWayland.h
+@@ -37,6 +37,8 @@
+ nsTArray<GdkAtom> mTargetMIMETypes;
+ };
+
++class nsWaylandDragContext;
++
+ class WaylandDataOffer : public DataOffer {
+ public:
+ explicit WaylandDataOffer(wl_data_offer* aWaylandDataOffer);
diff --git a/mozconfig b/mozconfig
index 6dfd0802f9ff..8e8916ce9be5 100644
--- a/mozconfig
+++ b/mozconfig
@@ -4,6 +4,7 @@ ac_add_options --prefix=/usr
ac_add_options --enable-hardening
ac_add_options --enable-optimize
ac_add_options --enable-rust-simd
+ac_add_options --disable-bootstrap
# Branding
ac_add_options --enable-release
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 @@