diff options
| -rw-r--r-- | .SRCINFO | 40 | ||||
| -rw-r--r-- | 0021-Make-PGO-use-toolchain.patch (renamed from 0020-Make-PGO-use-toolchain.patch) | 10 | ||||
| -rw-r--r-- | 0023-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch (renamed from 0022-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch) | 10 | ||||
| -rw-r--r-- | 0025-Fix-building-with-PGO-when-using-GCC.patch (renamed from 0024-Fix-building-with-PGO-when-using-GCC.patch) | 11 | ||||
| -rw-r--r-- | 0028-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch (renamed from 0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch) | 8 | ||||
| -rw-r--r-- | 0029-Make-elfhack-use-toolchain.patch (renamed from 0028-Make-elfhack-use-toolchain.patch) | 6 | ||||
| -rw-r--r-- | PKGBUILD | 48 | ||||
| -rw-r--r-- | unity-menubar.patch | 28 |
8 files changed, 81 insertions, 80 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Wed Jun 2 06:02:59 UTC 2021 +# Sat Aug 21 01:05:06 UTC 2021 pkgbase = firefox-kde-opensuse pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE - pkgver = 88.0.1 + pkgver = 89.0.2 pkgrel = 1 url = https://github.com/openSUSE/firefox-maintenance arch = i686 @@ -35,7 +35,7 @@ pkgbase = firefox-kde-opensuse makedepends = python-psutil makedepends = python-zstandard makedepends = dump_syms - makedepends = gcc>=10.2.1 + makedepends = gcc>=11.2.0 depends = libxt depends = mime-types depends = dbus-glib @@ -60,18 +60,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=88.0.1 + provides = firefox=89.0.2 conflicts = firefox options = !emptydirs - source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_88_0_1_RELEASE + source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_89_0_2_RELEASE source = mozconfig source = firefox.desktop source = vendor.js source = kde.js - source = firefox-branded-icons-aedbca44a8a2958947bed31f28e3083ac0496f4a.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/aedbca44a8a2958947bed31f28e3083ac0496f4a/firefox/firefox-branded-icons.patch - source = firefox-kde-aedbca44a8a2958947bed31f28e3083ac0496f4a.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/aedbca44a8a2958947bed31f28e3083ac0496f4a/firefox/firefox-kde.patch - source = mozilla-kde-aedbca44a8a2958947bed31f28e3083ac0496f4a.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/aedbca44a8a2958947bed31f28e3083ac0496f4a/mozilla-kde.patch - source = mozilla-nongnome-proxies-aedbca44a8a2958947bed31f28e3083ac0496f4a.patch::https://raw.githubusercontent.com/openSUSE/firefox-maintenance/aedbca44a8a2958947bed31f28e3083ac0496f4a/mozilla-nongnome-proxies.patch + 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 = unity-menubar.patch source = add_missing_pgo_rule.patch source = pgo_fix_missing_kdejs.patch @@ -81,11 +81,11 @@ pkgbase = firefox-kde-opensuse source = 0001-Use-remoting-name-for-GDK-application-names.patch source = 5022efe33088.patch source = build-disable-elfhack.patch - source = 0020-Make-PGO-use-toolchain.patch - source = 0022-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch - source = 0024-Fix-building-with-PGO-when-using-GCC.patch - source = 0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch - source = 0028-Make-elfhack-use-toolchain.patch + source = 0021-Make-PGO-use-toolchain.patch + source = 0023-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch + source = 0025-Fix-building-with-PGO-when-using-GCC.patch + 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 md5sums = SKIP md5sums = 1fd86cc439737c90a5854aab7f85080f @@ -96,7 +96,7 @@ pkgbase = firefox-kde-opensuse md5sums = 43c65f6513fbc28aaa8238ad3bdb4e26 md5sums = 7a97237384119556880ab5393c9091a3 md5sums = 0a5733b7a457a2786c2dd27626a1bf88 - md5sums = f7dd45358cf99a22b551ffd4514cee74 + md5sums = e81dfd1207442ccef8afd8bb5fecb3b5 md5sums = fe24f5ea463013bb7f1c12d12dce41b2 md5sums = 3c383d371d7f6ede5983a40310518715 md5sums = 6a1ed12b8dbac57722436a2987e3ea33 @@ -105,11 +105,11 @@ pkgbase = firefox-kde-opensuse md5sums = e7994b3b78b780ebe610ba3d87247e40 md5sums = 00abc3976f028f8fe07111b9e687b574 md5sums = c7b492df4fbf42ffe8aea4c0afb89921 - md5sums = d6dd4e8e23b2e6e37ea6ea4a981d4316 - md5sums = 67c0bca3e38404d53e6057e744c7ecee - md5sums = c8e251f1fc9050cd12173b540baa96f8 - md5sums = 72176c9ee7b2ac4f1bb07ff5ee5fe10b - md5sums = 07770d558b8999b5793794e1551a1309 + md5sums = 5f3d8a91f73b319310cddbf596bb1850 + md5sums = c2ccbfca8c29fb6d960206af335c1d8e + md5sums = b21033ca08953e7ce8304a208869eed1 + md5sums = 5634ebb84f82d0d14d59715172219b27 + md5sums = 11ea83f4953e77509505054d97a60af5 md5sums = f49ac3b9f5146e33ce587e6b23eb1a86 pkgname = firefox-kde-opensuse diff --git a/0020-Make-PGO-use-toolchain.patch b/0021-Make-PGO-use-toolchain.patch index 2607d484630a..e020fb4e1298 100644 --- a/0020-Make-PGO-use-toolchain.patch +++ b/0021-Make-PGO-use-toolchain.patch @@ -1,7 +1,7 @@ -From 4504cdc63e6a770ea8604a6860cec071273668b4 Mon Sep 17 00:00:00 2001 +From 665e9833bc25fdcd8f7bfff50bd447de8abf50fd Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann <whissi@gentoo.org> Date: Mon, 6 Apr 2020 20:13:34 +0200 -Subject: [PATCH 20/39] Make PGO use toolchain +Subject: [PATCH 21/37] Make PGO use toolchain Signed-off-by: Thomas Deutschmann <whissi@gentoo.org> --- @@ -9,10 +9,10 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org> 1 file changed, 9 insertions(+) diff --git a/build/unix/mozconfig.unix b/build/unix/mozconfig.unix -index 539dd4d44b..d10ae3df4a 100644 +index 3927dd907b..cb4819b230 100644 --- a/build/unix/mozconfig.unix +++ b/build/unix/mozconfig.unix -@@ -6,6 +6,15 @@ if [ -n "$FORCE_GCC" ]; then +@@ -4,6 +4,15 @@ if [ -n "$FORCE_GCC" ]; then CC="$MOZ_FETCHES_DIR/gcc/bin/gcc" CXX="$MOZ_FETCHES_DIR/gcc/bin/g++" @@ -29,5 +29,5 @@ index 539dd4d44b..d10ae3df4a 100644 # package. mk_add_options "export PATH=$MOZ_FETCHES_DIR/gcc/bin:$PATH" -- -2.30.1 +2.31.1 diff --git a/0022-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch b/0023-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch index 3099742755e1..65a2da26265f 100644 --- a/0022-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch +++ b/0023-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch @@ -1,7 +1,7 @@ -From 3fd25f68a313b1018b1885aab1dba815253bdd4b Mon Sep 17 00:00:00 2001 +From 76549ac67ab84e5a2ddeca467ae315de3128cf4e Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann <whissi@gentoo.org> Date: Wed, 15 Apr 2020 00:27:25 +0200 -Subject: [PATCH 22/39] bmo#1516803: force one LTO partition for sandbox when +Subject: [PATCH 23/37] bmo#1516803: force one LTO partition for sandbox when using GCC Signed-off-by: Thomas Deutschmann <whissi@gentoo.org> @@ -11,6 +11,8 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org> diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build index 31d2e24118..88d9a2dc6f 100644 +--- a/security/sandbox/linux/moz.build ++++ b/security/sandbox/linux/moz.build @@ -114,9 +114,10 @@ # gcc lto likes to put the top level asm in syscall.cc in a different partition # from the function using it which breaks the build. Work around that by @@ -26,6 +28,6 @@ index 31d2e24118..88d9a2dc6f 100644 DEFINES["NS_NO_XPCOM"] = True DisableStlWrapping() --- -2.30.1 +-- +2.31.1 diff --git a/0024-Fix-building-with-PGO-when-using-GCC.patch b/0025-Fix-building-with-PGO-when-using-GCC.patch index 8723704f4231..3740d954b875 100644 --- a/0024-Fix-building-with-PGO-when-using-GCC.patch +++ b/0025-Fix-building-with-PGO-when-using-GCC.patch @@ -1,7 +1,7 @@ -From 56bbe41b90385dbe33555a43ab85b4acc01d8a91 Mon Sep 17 00:00:00 2001 +From 9b403dc8840d1f16ace76a9410fe003434a96e1b Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann <whissi@gentoo.org> Date: Thu, 2 Jul 2020 18:05:03 +0200 -Subject: [PATCH 24/39] Fix building with PGO when using GCC +Subject: [PATCH 25/37] Fix building with PGO when using GCC Signed-off-by: Thomas Deutschmann <whissi@gentoo.org> --- @@ -10,10 +10,10 @@ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org> 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo.configure -index e28bd14956..9cb78fc522 100644 +index 30b8b27fc4..95852d7c21 100644 --- a/build/moz.configure/lto-pgo.configure +++ b/build/moz.configure/lto-pgo.configure -@@ -84,11 +84,12 @@ +@@ -84,12 +84,13 @@ @imports(_from="__builtin__", _import="min") def pgo_flags(compiler, profdata, target_is_windows): if compiler.type == "gcc": @@ -28,6 +28,7 @@ index e28bd14956..9cb78fc522 100644 ) if compiler.type in ("clang-cl", "clang"): + diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py index 7f3de106ab..89289a7756 100755 --- a/build/pgo/profileserver.py @@ -80,5 +81,5 @@ index 7f3de106ab..89289a7756 100755 if llvm_profdata: profraw_files = glob.glob("*.profraw") -- -2.30.1 +2.31.1 diff --git a/0027-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 5013a6371126..ec6e6eda5e4b 100644 --- a/0027-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 c34b95e7a79cefedcce90739e506f4f500bc2e2b Mon Sep 17 00:00:00 2001 +From fc0da069a26acffede07ab50317f6520b5c4d6de Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann <whissi@gentoo.org> Date: Sat, 29 Aug 2020 22:30:59 +0200 -Subject: [PATCH 27/39] LTO: Only enable LTO for Rust when complete build uses +Subject: [PATCH 28/37] 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 615d54076b..36a2e0896e 100644 +index 38e647c101..e683f5ec7e 100644 --- a/config/makefiles/rust.mk +++ b/config/makefiles/rust.mk @@ -64,6 +64,7 @@ endif @@ -30,5 +30,5 @@ index 615d54076b..36a2e0896e 100644 ifdef CARGO_INCREMENTAL export CARGO_INCREMENTAL -- -2.30.1 +2.31.1 diff --git a/0028-Make-elfhack-use-toolchain.patch b/0029-Make-elfhack-use-toolchain.patch index 3777a389da82..5b41b2c07bbf 100644 --- a/0028-Make-elfhack-use-toolchain.patch +++ b/0029-Make-elfhack-use-toolchain.patch @@ -1,7 +1,7 @@ -From 4e3738ce60222356aed610206d683077e39cf67b Mon Sep 17 00:00:00 2001 +From 22639bcf27d94b1dea4458a50415370fb71126e8 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann <whissi@gentoo.org> Date: Mon, 28 Sep 2020 20:52:24 +0200 -Subject: [PATCH 28/39] Make elfhack use toolchain +Subject: [PATCH 29/37] 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.30.1 +2.31.1 @@ -13,7 +13,7 @@ _pgo=true _pkgname=firefox pkgname=$_pkgname-kde-opensuse -pkgver=88.0.1 +pkgver=89.0.2 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE" arch=('i686' 'x86_64') @@ -42,19 +42,17 @@ makedepends=('unzip' 'zip' 'diffutils' 'yasm' 'mesa' 'imake' 'python' 'python-psutil' 'python-zstandard' 'dump_syms') -if [ $_pgo ] ; then - # rhbz#1849165 - # https://bugzilla.redhat.com/show_bug.cgi?id=1849165 - # LTO/PGO needs fixes from GCC 10.2.1 - makedepends+=('gcc>=10.2.1') -fi +# https://bugs.gentoo.org/792705 +# needs fixes from GCC 11.2 +makedepends+=('gcc>=11.2.0') + optdepends=('networkmanager: Location detection via available WiFi networks' 'speech-dispatcher: Text-to-Speech' 'pulseaudio: Audio support') provides=("firefox=${pkgver}") conflicts=('firefox') -_patchrev=aedbca44a8a2958947bed31f28e3083ac0496f4a +_patchrev=bf580bacd132687dc0135959fbc9eeb8d8ba3ea9 options=('!emptydirs') _patchurl=https://raw.githubusercontent.com/openSUSE/firefox-maintenance/$_patchrev _repo=https://hg.mozilla.org/mozilla-unified @@ -89,15 +87,15 @@ source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE" # Force disable elfhack to fix build errors build-disable-elfhack.patch # patches from gentoo: - # https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-85-patches-04.tar.xz - 0020-Make-PGO-use-toolchain.patch + # https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-89-patches-01.tar.xz + 0021-Make-PGO-use-toolchain.patch # Fix MOZILLA#1516803 # https://bugzilla.mozilla.org/show_bug.cgi?id=1516803 - 0022-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch + 0023-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch # PGO/LTO GCC patches - 0024-Fix-building-with-PGO-when-using-GCC.patch - 0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch - 0028-Make-elfhack-use-toolchain.patch + 0025-Fix-building-with-PGO-when-using-GCC.patch + 0028-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch + 0029-Make-elfhack-use-toolchain.patch # end # Fix CSD when globalmenu is active #8 fix_csd_window_buttons.patch @@ -163,13 +161,13 @@ prepare() { # Fix MOZILLA#1516803 # sandbox needs to be built with --param lto-partitions=1 when # GCC LTO is enabled - patch -Np1 -i "$srcdir"/0022-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch + patch -Np1 -i "$srcdir"/0023-bmo-1516803-force-one-LTO-partition-for-sandbox-when.patch # PGO/LTO GCC patches - patch -Np1 -i "$srcdir"/0020-Make-PGO-use-toolchain.patch - patch -Np1 -i "$srcdir"/0024-Fix-building-with-PGO-when-using-GCC.patch - patch -Np1 -i "$srcdir"/0027-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch - patch -Np1 -i "$srcdir"/0028-Make-elfhack-use-toolchain.patch + patch -Np1 -i "$srcdir"/0021-Make-PGO-use-toolchain.patch + patch -Np1 -i "$srcdir"/0025-Fix-building-with-PGO-when-using-GCC.patch + patch -Np1 -i "$srcdir"/0028-LTO-Only-enable-LTO-for-Rust-when-complete-build-use.patch + patch -Np1 -i "$srcdir"/0029-Make-elfhack-use-toolchain.patch # add missing rule for pgo builds patch -Np1 -i "$srcdir"/add_missing_pgo_rule.patch @@ -276,7 +274,7 @@ md5sums=('SKIP' '43c65f6513fbc28aaa8238ad3bdb4e26' '7a97237384119556880ab5393c9091a3' '0a5733b7a457a2786c2dd27626a1bf88' - 'f7dd45358cf99a22b551ffd4514cee74' + 'e81dfd1207442ccef8afd8bb5fecb3b5' 'fe24f5ea463013bb7f1c12d12dce41b2' '3c383d371d7f6ede5983a40310518715' '6a1ed12b8dbac57722436a2987e3ea33' @@ -285,9 +283,9 @@ md5sums=('SKIP' 'e7994b3b78b780ebe610ba3d87247e40' '00abc3976f028f8fe07111b9e687b574' 'c7b492df4fbf42ffe8aea4c0afb89921' - 'd6dd4e8e23b2e6e37ea6ea4a981d4316' - '67c0bca3e38404d53e6057e744c7ecee' - 'c8e251f1fc9050cd12173b540baa96f8' - '72176c9ee7b2ac4f1bb07ff5ee5fe10b' - '07770d558b8999b5793794e1551a1309' + '5f3d8a91f73b319310cddbf596bb1850' + 'c2ccbfca8c29fb6d960206af335c1d8e' + 'b21033ca08953e7ce8304a208869eed1' + '5634ebb84f82d0d14d59715172219b27' + '11ea83f4953e77509505054d97a60af5' 'f49ac3b9f5146e33ce587e6b23eb1a86') diff --git a/unity-menubar.patch b/unity-menubar.patch index d65c2507d58b..7e0141588cf3 100644 --- a/unity-menubar.patch +++ b/unity-menubar.patch @@ -16,7 +16,7 @@ #endif --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js -@@ -6291,11 +6291,18 @@ function onViewToolbarsPopupShowing(aEve +@@ -6251,11 +6251,18 @@ function onViewToolbarsPopupShowing(aEve MozXULElement.insertFTLIfNeeded("browser/toolbarContextMenu.ftl"); let firstMenuItem = aInsertPoint || popup.firstElementChild; let toolbarNodes = gNavToolbox.querySelectorAll("toolbar"); @@ -48,7 +48,7 @@ id="organizeButton" label="&organize.label;" --- a/dom/xul/XULPopupElement.cpp +++ b/dom/xul/XULPopupElement.cpp -@@ -158,6 +158,10 @@ void XULPopupElement::GetState(nsString& +@@ -211,6 +211,10 @@ void XULPopupElement::GetState(nsString& // set this here in case there's no frame for the popup aState.AssignLiteral("closed"); @@ -56,10 +56,10 @@ + nsAutoString nativeState; +#endif + - nsMenuPopupFrame* menuPopupFrame = do_QueryFrame(GetPrimaryFrame()); - if (menuPopupFrame) { - switch (menuPopupFrame->PopupState()) { -@@ -181,6 +185,11 @@ void XULPopupElement::GetState(nsString& + if (nsXULPopupManager* pm = nsXULPopupManager::GetInstance()) { + switch (pm->GetPopupState(this)) { + case ePopupShown: +@@ -233,6 +237,11 @@ void XULPopupElement::GetState(nsString& break; } } @@ -87,7 +87,7 @@ if CONFIG["CC_TYPE"] in ("clang", "gcc"): --- a/layout/build/moz.build +++ b/layout/build/moz.build -@@ -67,6 +67,10 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "an +@@ -68,6 +68,10 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "an "/dom/system", "/dom/system/android", ] @@ -2536,7 +2536,7 @@ + if (command) { + command->InitCommandEvent(u"command"_ns, true, true, + nsGlobalWindowInner::Cast(doc->GetInnerWindow()), -+ 0, false, false, false, false, nullptr, 0, rv); ++ 0, false, false, false, false, 0, nullptr, 0, rv); + if (!rv.Failed()) { + event->SetTrusted(true); + ContentNode()->DispatchEvent(*event, rv); @@ -5064,7 +5064,7 @@ +#endif /* __nsNativeMenuService_h__ */ --- a/widget/gtk/nsWindow.cpp +++ b/widget/gtk/nsWindow.cpp -@@ -6409,6 +6409,10 @@ void nsWindow::HideWindowChrome(bool aSh +@@ -6436,6 +6436,10 @@ void nsWindow::HideWindowChrome(bool aSh SetWindowDecoration(aShouldHide ? eBorderStyle_none : mBorderStyle); } @@ -5086,7 +5086,7 @@ #undef LOG #ifdef MOZ_LOGGING -@@ -182,6 +184,8 @@ class nsWindow final : public nsBaseWidg +@@ -168,6 +170,8 @@ class nsWindow final : public nsBaseWidg nsIScreen* aTargetScreen = nullptr) override; virtual void HideWindowChrome(bool aShouldHide) override; @@ -5095,7 +5095,7 @@ /** * GetLastUserInputTime returns a timestamp for the most recent user input * event. This is intended for pointer grab requests (including drags). -@@ -722,6 +726,8 @@ class nsWindow final : public nsBaseWidg +@@ -708,6 +712,8 @@ class nsWindow final : public nsBaseWidg static GtkWindowDecoration sGtkWindowDecoration; static bool sTransparentMainWindow; @@ -5126,7 +5126,7 @@ import sys # Static atom definitions, used to generate nsGkAtomList.h. -@@ -2507,7 +2508,7 @@ STATIC_ATOMS = [ +@@ -2506,7 +2507,7 @@ STATIC_ATOMS = [ InheritingAnonBoxAtom("AnonBox_mozSVGForeignContent", ":-moz-svg-foreign-content"), InheritingAnonBoxAtom("AnonBox_mozSVGText", ":-moz-svg-text"), # END ATOMS @@ -5154,7 +5154,7 @@ if defined('MOZ_X11'): --- a/xpfe/appshell/AppWindow.cpp +++ b/xpfe/appshell/AppWindow.cpp -@@ -79,7 +79,7 @@ +@@ -80,7 +80,7 @@ #include "mozilla/dom/DocumentL10n.h" @@ -5227,7 +5227,7 @@ +#endif // mozilla_widget_NativeMenuSupport_h --- a/widget/moz.build +++ b/widget/moz.build -@@ -145,6 +145,11 @@ EXPORTS += [ +@@ -144,6 +144,11 @@ EXPORTS += [ "PuppetWidget.h", ] |