Korbs/LibreWolf
0
Fork 0
mirror of https://codeberg.org/librewolf/source.git synced 2024-12-22 13:43:04 -05:00
Code Issues Activity

update pref-pane, kde and unity patches for 102

Browse source
This commit is contained in:
ohfp 2022-06-29 11:01:21 +02:00
parent 6686daaa3a
commit 03c0cd635b
5 changed files with 94 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
patches/1550_1549.diff Normal file
View file

@ -0,0 +1,33 @@
=== modified file 'debian/patches/unity-menubar.patch'
--- debian/patches/unity-menubar.patch 2022-04-21 08:09:23 +0000
+++ debian/patches/unity-menubar.patch 2022-05-18 06:18:20 +0000
@@ -1068,7 +1068,7 @@
+
+ OnOpen();
+
-+ mOpenDelayTimer = do_CreateInstance(NS_TIMER_CONTRACTID);
++ mOpenDelayTimer = NS_NewTimer();
+ if (!mOpenDelayTimer) {
+ return;
+ }
@@ -5118,8 +5118,8 @@
--- a/widget/gtk/components.conf
+++ b/widget/gtk/components.conf
@@ -76,6 +76,14 @@ Classes = [
- 'headers': ['/widget/gtk/nsApplicationChooser.h'],
- 'processes': ProcessSelector.MAIN_PROCESS_ONLY,
+ 'headers': ['/widget/gtk/nsUserIdleServiceGTK.h'],
+ 'constructor': 'nsUserIdleServiceGTK::GetInstance',
},
+ {
+ 'cid': '{0b3fe5aa-bc72-4303-85ae-76365df1251d}',
@@ -5131,7 +5131,7 @@
+ },
]
- if defined('MOZ_X11'):
+ if defined('NS_PRINTING'):
--- a/xpfe/appshell/AppWindow.cpp
+++ b/xpfe/appshell/AppWindow.cpp
@@ -80,7 +80,7 @@

10
patches/librewolf-pref-pane.patch
View file

@ -1,4 +1,4 @@
From babb9dc13626b8d7096b3e9debd36a2404c34a80 Mon Sep 17 00:00:00 2001 From cd0ec42d56fe5d4689ed19c84ad5ca5a27a005fd Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com> From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Tue, 12 Apr 2022 11:57:53 +0200 Date: Tue, 12 Apr 2022 11:57:53 +0200
Subject: [PATCH] port pref-pane patch changes to gecko-dev Subject: [PATCH] port pref-pane patch changes to gecko-dev
@ -589,7 +589,7 @@ index 000000000000..c8cbb075d59b
+ }); + });
+}); +});
diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
index 0a2a7895ae44..430f70cf06a2 100644 index 0b97e8c3cb59..637090adaa5e 100644
--- a/browser/components/preferences/preferences.js --- a/browser/components/preferences/preferences.js
+++ b/browser/components/preferences/preferences.js +++ b/browser/components/preferences/preferences.js
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
@ -609,7 +609,7 @@ index 0a2a7895ae44..430f70cf06a2 100644
if (Services.prefs.getBoolPref("browser.preferences.experimental")) { if (Services.prefs.getBoolPref("browser.preferences.experimental")) {
// Set hidden based on previous load's hidden value. // Set hidden based on previous load's hidden value.
diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
index 81059f3d2e01..d815682d68bc 100644 index 6ee14eec9b2e..a0d768dce307 100644
--- a/browser/components/preferences/preferences.xhtml --- a/browser/components/preferences/preferences.xhtml
+++ b/browser/components/preferences/preferences.xhtml +++ b/browser/components/preferences/preferences.xhtml
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
@ -638,7 +638,7 @@ index 81059f3d2e01..d815682d68bc 100644
<richlistitem id="category-sync" <richlistitem id="category-sync"
class="category" class="category"
hidden="true" hidden="true"
@@ -211,6 +223,7 @@ @@ -207,6 +219,7 @@
#include home.inc.xhtml #include home.inc.xhtml
#include search.inc.xhtml #include search.inc.xhtml
#include privacy.inc.xhtml #include privacy.inc.xhtml
@ -750,7 +750,7 @@ index b10403800c7a..7f9bc2760342 100644
+librewolf-config-link = All advanced settings (about:config) +librewolf-config-link = All advanced settings (about:config)
+librewolf-open-profile = Open user profile directory +librewolf-open-profile = Open user profile directory
diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
index 615644e2f1de..df8e3a849a4c 100644 index 4a88a1cc318d..2d7ac15e9b48 100644
--- a/browser/themes/shared/jar.inc.mn --- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn +++ b/browser/themes/shared/jar.inc.mn
@@ -106,6 +106,7 @@ @@ -106,6 +106,7 @@

43
patches/mozilla-kde.patch
View file

@ -3,7 +3,7 @@
# Date 1559294891 -7200 # Date 1559294891 -7200
# Fri May 31 11:28:11 2019 +0200 # Fri May 31 11:28:11 2019 +0200
# Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
# Parent eeedc49c16aba3b50d1547315a88091a1c765904 # Parent edd7284c391b503b76bb5bb6321f24ab2f5f8bdf
Description: Add KDE integration to Firefox (toolkit parts) Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Author: Lubos Lunak <lunak@suse.com> Author: Lubos Lunak <lunak@suse.com>
@ -165,7 +165,7 @@ diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloa
diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm
--- a/toolkit/mozapps/downloads/HelperAppDlg.jsm --- a/toolkit/mozapps/downloads/HelperAppDlg.jsm
+++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm +++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm
@@ -1252,36 +1252,66 @@ nsUnknownContentTypeDialog.prototype = { @@ -1254,36 +1254,66 @@ nsUnknownContentTypeDialog.prototype = {
params.handlerApp && params.handlerApp &&
params.handlerApp.executable && params.handlerApp.executable &&
params.handlerApp.executable.isFile() params.handlerApp.executable.isFile()
@ -255,15 +255,15 @@ diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downlo
diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
@@ -13,16 +13,17 @@ @@ -10,16 +10,17 @@
#include "nsPrintfCString.h" #include "prnetdb.h"
#include "nsNetCID.h" #include "prenv.h"
#include "nsInterfaceHashtable.h"
#include "nsHashtablesFwd.h"
#include "nsHashKeys.h"
#include "nsNetUtil.h" #include "nsNetUtil.h"
#include "nsISupportsPrimitives.h" #include "nsISupportsPrimitives.h"
#include "nsIGSettingsService.h" #include "nsIGSettingsService.h"
#include "nsInterfaceHashtable.h"
#include "mozilla/Attributes.h"
#include "nsIURI.h"
+#include "nsKDEUtils.h" +#include "nsKDEUtils.h"
using namespace mozilla; using namespace mozilla;
@ -273,7 +273,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
NS_DECL_NSISYSTEMPROXYSETTINGS NS_DECL_NSISYSTEMPROXYSETTINGS
@@ -36,16 +37,18 @@ class nsUnixSystemProxySettings final : @@ -33,16 +34,18 @@ class nsUnixSystemProxySettings final :
nsCOMPtr<nsIGSettingsCollection> mProxySettings; nsCOMPtr<nsIGSettingsCollection> mProxySettings;
nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection>
mSchemeProxySettings; mSchemeProxySettings;
@ -292,7 +292,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) { nsUnixSystemProxySettings::GetMainThreadOnly(bool* aMainThreadOnly) {
// dbus prevents us from being threadsafe, but this routine should not block // dbus prevents us from being threadsafe, but this routine should not block
// anyhow // anyhow
@@ -381,21 +384,50 @@ nsresult nsUnixSystemProxySettings::GetP @@ -378,21 +381,50 @@ nsresult nsUnixSystemProxySettings::GetP
return NS_OK; return NS_OK;
} }
@ -786,25 +786,6 @@ diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandle
/* /*
* Check if a handler exists for the provided protocol. Check the datastore * Check if a handler exists for the provided protocol. Check the datastore
@@ -328,17 +328,17 @@ mozilla::ipc::IPCResult HandlerServicePa
nsCOMPtr<nsIExternalProtocolService> protoSvc =
do_GetService(NS_EXTERNALPROTOCOLSERVICE_CONTRACTID, &rv);
if (NS_WARN_IF(NS_FAILED(rv))) {
*aHandlerExists = false;
return IPC_OK();
}
rv = protoSvc->ExternalProtocolHandlerExists(aProtocolScheme.get(),
aHandlerExists);
-
+##
if (NS_WARN_IF(NS_FAILED(rv))) {
*aHandlerExists = false;
}
#else
MOZ_RELEASE_ASSERT(false, "No implementation on this platform.");
*aHandlerExists = false;
#endif
return IPC_OK();
diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
--- a/uriloader/exthandler/moz.build --- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build
@ -1825,7 +1806,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
# include "prmem.h" # include "prmem.h"
# include "plbase64.h" # include "plbase64.h"
@@ -2071,20 +2072,29 @@ nsLocalFile::SetPersistentDescriptor(con @@ -2097,20 +2098,29 @@ nsLocalFile::SetPersistentDescriptor(con
NS_IMETHODIMP NS_IMETHODIMP
nsLocalFile::Reveal() { nsLocalFile::Reveal() {
@ -1857,7 +1838,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
::CFRelease(url); ::CFRelease(url);
return rv; return rv;
} }
@@ -2096,16 +2106,23 @@ nsLocalFile::Reveal() { @@ -2122,16 +2132,23 @@ nsLocalFile::Reveal() {
NS_IMETHODIMP NS_IMETHODIMP
nsLocalFile::Launch() { nsLocalFile::Launch() {

51
patches/mozilla-kde_after_unity.patch
View file

@ -1,6 +1,6 @@
From 522af8951f5faf17862bf962f573f516aa78799b Mon Sep 17 00:00:00 2001 From 38eb5068331323a0b6bae12ed280fdcd75c8f495 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com> From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Fri, 10 Jun 2022 11:44:14 +0200 Date: Wed, 29 Jun 2022 10:58:45 +0200
Subject: [PATCH] kde Subject: [PATCH] kde
--- ---
@ -14,7 +14,7 @@ Subject: [PATCH] kde
toolkit/xre/moz.build | 2 + toolkit/xre/moz.build | 2 +
toolkit/xre/nsKDEUtils.cpp | 321 ++++++++++++++++++ toolkit/xre/nsKDEUtils.cpp | 321 ++++++++++++++++++
toolkit/xre/nsKDEUtils.h | 48 +++ toolkit/xre/nsKDEUtils.h | 48 +++
uriloader/exthandler/HandlerServiceParent.cpp | 6 +- uriloader/exthandler/HandlerServiceParent.cpp | 4 +-
uriloader/exthandler/moz.build | 3 + uriloader/exthandler/moz.build | 3 +
.../exthandler/unix/nsCommonRegistry.cpp | 53 +++ .../exthandler/unix/nsCommonRegistry.cpp | 53 +++
uriloader/exthandler/unix/nsCommonRegistry.h | 28 ++ uriloader/exthandler/unix/nsCommonRegistry.h | 28 ++
@ -28,7 +28,7 @@ Subject: [PATCH] kde
xpcom/components/ManifestParser.cpp | 11 +- xpcom/components/ManifestParser.cpp | 11 +-
xpcom/components/moz.build | 1 + xpcom/components/moz.build | 1 +
xpcom/io/nsLocalFileUnix.cpp | 21 +- xpcom/io/nsLocalFileUnix.cpp | 21 +-
24 files changed, 1010 insertions(+), 38 deletions(-) 24 files changed, 1009 insertions(+), 37 deletions(-)
create mode 100644 toolkit/xre/nsKDEUtils.cpp create mode 100644 toolkit/xre/nsKDEUtils.cpp
create mode 100644 toolkit/xre/nsKDEUtils.h create mode 100644 toolkit/xre/nsKDEUtils.h
create mode 100644 uriloader/exthandler/unix/nsCommonRegistry.cpp create mode 100644 uriloader/exthandler/unix/nsCommonRegistry.cpp
@ -37,7 +37,7 @@ Subject: [PATCH] kde
create mode 100644 uriloader/exthandler/unix/nsKDERegistry.h create mode 100644 uriloader/exthandler/unix/nsKDERegistry.h
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
index 65d2b6b1252a..ad651009dbf3 100644 index 6d0bebd2ee68..c138e63b23dc 100644
--- a/modules/libpref/Preferences.cpp --- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp +++ b/modules/libpref/Preferences.cpp
@@ -93,6 +93,7 @@ @@ -93,6 +93,7 @@
@ -91,7 +91,7 @@ index 1f021d409c51..171d034cc03a 100644
GeneratedFile( GeneratedFile(
diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py
index 7d6d7e0c7fde..724c527b4ca8 100644 index 0fe6ee99bd51..f7acdafe9790 100644
--- a/python/mozbuild/mozpack/chrome/flags.py --- a/python/mozbuild/mozpack/chrome/flags.py
+++ b/python/mozbuild/mozpack/chrome/flags.py +++ b/python/mozbuild/mozpack/chrome/flags.py
@@ -234,6 +234,7 @@ class Flags(OrderedDict): @@ -234,6 +234,7 @@ class Flags(OrderedDict):
@ -129,10 +129,10 @@ index d4172e2d73ad..8bd0577bc535 100644
with Files("**"): with Files("**"):
BUG_COMPONENT = ("Toolkit", "Downloads API") BUG_COMPONENT = ("Toolkit", "Downloads API")
diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm
index e3572722f774..812133d09d92 100644 index 325de51c0c5f..8e5219f0e22f 100644
--- a/toolkit/mozapps/downloads/HelperAppDlg.jsm --- a/toolkit/mozapps/downloads/HelperAppDlg.jsm
+++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm +++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm
@@ -1257,26 +1257,56 @@ nsUnknownContentTypeDialog.prototype = { @@ -1259,26 +1259,56 @@ nsUnknownContentTypeDialog.prototype = {
this.chosenApp = params.handlerApp; this.chosenApp = params.handlerApp;
} }
} else if ("@mozilla.org/applicationchooser;1" in Cc) { } else if ("@mozilla.org/applicationchooser;1" in Cc) {
@ -210,18 +210,18 @@ index e3572722f774..812133d09d92 100644
var nsIFilePicker = Ci.nsIFilePicker; var nsIFilePicker = Ci.nsIFilePicker;
var fp = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker); var fp = Cc["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
index f8d088054506..091ccf3d9e76 100644 index ef110b1287bf..4983f0bd76b0 100644
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
@@ -18,6 +18,7 @@ @@ -15,6 +15,7 @@
#include "nsInterfaceHashtable.h" #include "nsNetUtil.h"
#include "mozilla/Attributes.h" #include "nsISupportsPrimitives.h"
#include "nsIURI.h" #include "nsIGSettingsService.h"
+#include "nsKDEUtils.h" +#include "nsKDEUtils.h"
using namespace mozilla; using namespace mozilla;
@@ -41,6 +42,8 @@ class nsUnixSystemProxySettings final : public nsISystemProxySettings { @@ -38,6 +39,8 @@ class nsUnixSystemProxySettings final : public nsISystemProxySettings {
nsACString& aResult); nsACString& aResult);
nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType,
nsACString& aResult); nsACString& aResult);
@ -230,7 +230,7 @@ index f8d088054506..091ccf3d9e76 100644
}; };
NS_IMPL_ISUPPORTS(nsUnixSystemProxySettings, nsISystemProxySettings) NS_IMPL_ISUPPORTS(nsUnixSystemProxySettings, nsISystemProxySettings)
@@ -382,6 +385,9 @@ nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec, @@ -379,6 +382,9 @@ nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec,
const nsACString& aHost, const nsACString& aHost,
const int32_t aPort, const int32_t aPort,
nsACString& aResult) { nsACString& aResult) {
@ -240,7 +240,7 @@ index f8d088054506..091ccf3d9e76 100644
if (mProxySettings) { if (mProxySettings) {
nsresult rv = GetProxyFromGSettings(aScheme, aHost, aPort, aResult); nsresult rv = GetProxyFromGSettings(aScheme, aHost, aPort, aResult);
if (NS_SUCCEEDED(rv)) return rv; if (NS_SUCCEEDED(rv)) return rv;
@@ -390,6 +396,32 @@ nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec, @@ -387,6 +393,32 @@ nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec,
return GetProxyFromEnvironment(aScheme, aHost, aPort, aResult); return GetProxyFromEnvironment(aScheme, aHost, aPort, aResult);
} }
@ -274,7 +274,7 @@ index f8d088054506..091ccf3d9e76 100644
auto result = MakeRefPtr<nsUnixSystemProxySettings>(); auto result = MakeRefPtr<nsUnixSystemProxySettings>();
result->Init(); result->Init();
diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
index 84af551f180c..751627fd97ce 100644 index 6475c0296aac..83e0184d4938 100644
--- a/toolkit/xre/moz.build --- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build
@@ -97,7 +97,9 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "uikit": @@ -97,7 +97,9 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "uikit":
@ -669,7 +669,7 @@ index 000000000000..c9c1284e294a
+ +
+#endif // nsKDEUtils +#endif // nsKDEUtils
diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandler/HandlerServiceParent.cpp diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandler/HandlerServiceParent.cpp
index 0796c7428b18..4f21c058f8e8 100644 index dbcc95d95646..5f2542a95065 100644
--- a/uriloader/exthandler/HandlerServiceParent.cpp --- a/uriloader/exthandler/HandlerServiceParent.cpp
+++ b/uriloader/exthandler/HandlerServiceParent.cpp +++ b/uriloader/exthandler/HandlerServiceParent.cpp
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
@ -690,15 +690,6 @@ index 0796c7428b18..4f21c058f8e8 100644
#else #else
*aHandlerExists = false; *aHandlerExists = false;
#endif #endif
@@ -333,7 +333,7 @@ mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocol(
}
rv = protoSvc->ExternalProtocolHandlerExists(aProtocolScheme.get(),
aHandlerExists);
-
+##
if (NS_WARN_IF(NS_FAILED(rv))) {
*aHandlerExists = false;
}
diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
index 92647a9b3478..fc5068cd2069 100644 index 92647a9b3478..fc5068cd2069 100644
--- a/uriloader/exthandler/moz.build --- a/uriloader/exthandler/moz.build
@ -1485,7 +1476,7 @@ index 6cf78aa9bec5..dfcf9c7697af 100644
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
index f3f98008ed74..e2edd26b7640 100644 index 410fcc19e435..d7c976e0e4b2 100644
--- a/xpcom/io/nsLocalFileUnix.cpp --- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp +++ b/xpcom/io/nsLocalFileUnix.cpp
@@ -59,6 +59,7 @@ @@ -59,6 +59,7 @@
@ -1496,7 +1487,7 @@ index f3f98008ed74..e2edd26b7640 100644
#endif #endif
#ifdef MOZ_WIDGET_COCOA #ifdef MOZ_WIDGET_COCOA
@@ -2076,10 +2077,19 @@ nsLocalFile::Reveal() { @@ -2102,10 +2103,19 @@ nsLocalFile::Reveal() {
} }
#ifdef MOZ_WIDGET_GTK #ifdef MOZ_WIDGET_GTK
@ -1518,7 +1509,7 @@ index f3f98008ed74..e2edd26b7640 100644
return giovfs->RevealFile(this); return giovfs->RevealFile(this);
#elif defined(MOZ_WIDGET_COCOA) #elif defined(MOZ_WIDGET_COCOA)
CFURLRef url; CFURLRef url;
@@ -2101,6 +2111,13 @@ nsLocalFile::Launch() { @@ -2127,6 +2137,13 @@ nsLocalFile::Launch() {
} }
#ifdef MOZ_WIDGET_GTK #ifdef MOZ_WIDGET_GTK

46
patches/unity-menubar.patch
View file

@ -767,7 +767,7 @@
+} +}
+ +
+void +void
+nsMenu::Update(ComputedStyle *aComputedStyle) +nsMenu::Update(const ComputedStyle *aComputedStyle)
+{ +{
+ if (mNeedsUpdate) { + if (mNeedsUpdate) {
+ mNeedsUpdate = false; + mNeedsUpdate = false;
@ -819,10 +819,10 @@
+ UpdateLabel(); + UpdateLabel();
+ } else if (aAttribute == nsGkAtoms::hidden || + } else if (aAttribute == nsGkAtoms::hidden ||
+ aAttribute == nsGkAtoms::collapsed) { + aAttribute == nsGkAtoms::collapsed) {
+ RefPtr<ComputedStyle> style = GetComputedStyle(); + RefPtr<const ComputedStyle> style = GetComputedStyle();
+ UpdateVisibility(style); + UpdateVisibility(style);
+ } else if (aAttribute == nsGkAtoms::image) { + } else if (aAttribute == nsGkAtoms::image) {
+ RefPtr<ComputedStyle> style = GetComputedStyle(); + RefPtr<const ComputedStyle> style = GetComputedStyle();
+ UpdateIcon(style); + UpdateIcon(style);
+ } + }
+} +}
@ -1210,7 +1210,7 @@
+ nsIContent *aChild); + nsIContent *aChild);
+ +
+ void InitializeNativeData() override; + void InitializeNativeData() override;
+ void Update(mozilla::ComputedStyle *aComputedStyle) override; + void Update(const mozilla::ComputedStyle *aComputedStyle) override;
+ nsMenuObject::PropertyFlags SupportedProperties() const override; + nsMenuObject::PropertyFlags SupportedProperties() const override;
+ +
+ void OnAttributeChanged(nsIContent *aContent, nsAtom *aAttribute) override; + void OnAttributeChanged(nsIContent *aContent, nsAtom *aAttribute) override;
@ -2803,7 +2803,7 @@
+} +}
+ +
+void +void
+nsMenuItem::Update(ComputedStyle *aComputedStyle) +nsMenuItem::Update(const ComputedStyle *aComputedStyle)
+{ +{
+ if (mNeedsUpdate) { + if (mNeedsUpdate) {
+ mNeedsUpdate = false; + mNeedsUpdate = false;
@ -2878,10 +2878,10 @@
+ UpdateState(); + UpdateState();
+ } else if (aAttribute == nsGkAtoms::hidden || + } else if (aAttribute == nsGkAtoms::hidden ||
+ aAttribute == nsGkAtoms::collapsed) { + aAttribute == nsGkAtoms::collapsed) {
+ RefPtr<ComputedStyle> style = GetComputedStyle(); + RefPtr<const ComputedStyle> style = GetComputedStyle();
+ UpdateVisibility(style); + UpdateVisibility(style);
+ } else if (aAttribute == nsGkAtoms::image) { + } else if (aAttribute == nsGkAtoms::image) {
+ RefPtr<ComputedStyle> style = GetComputedStyle(); + RefPtr<const ComputedStyle> style = GetComputedStyle();
+ UpdateIcon(style); + UpdateIcon(style);
+ } + }
+ } else if (aContent == mKeyContent && + } else if (aContent == mKeyContent &&
@ -2988,7 +2988,7 @@
+ +
+ void InitializeNativeData() override; + void InitializeNativeData() override;
+ void UpdateContentAttributes() override; + void UpdateContentAttributes() override;
+ void Update(mozilla::ComputedStyle *aComputedStyle) override; + void Update(const mozilla::ComputedStyle *aComputedStyle) override;
+ bool IsCompatibleWithNativeData(DbusmenuMenuitem *aNativeData) const override; + bool IsCompatibleWithNativeData(DbusmenuMenuitem *aNativeData) const override;
+ nsMenuObject::PropertyFlags SupportedProperties() const override; + nsMenuObject::PropertyFlags SupportedProperties() const override;
+ +
@ -3082,7 +3082,7 @@
+ +
+ nsMenuObjectIconLoader(nsMenuObject *aOwner) : mOwner(aOwner) { }; + nsMenuObjectIconLoader(nsMenuObject *aOwner) : mOwner(aOwner) { };
+ +
+ void LoadIcon(ComputedStyle *aComputedStyle); + void LoadIcon(const ComputedStyle *aComputedStyle);
+ void Destroy(); + void Destroy();
+ +
+private: +private:
@ -3178,7 +3178,7 @@
+} +}
+ +
+void +void
+nsMenuObjectIconLoader::LoadIcon(ComputedStyle *aComputedStyle) +nsMenuObjectIconLoader::LoadIcon(const ComputedStyle *aComputedStyle)
+{ +{
+ dom::Document *doc = mOwner->ContentNode()->OwnerDoc(); + dom::Document *doc = mOwner->ContentNode()->OwnerDoc();
+ +
@ -3444,7 +3444,7 @@
+} +}
+ +
+void +void
+nsMenuObject::UpdateVisibility(ComputedStyle *aComputedStyle) +nsMenuObject::UpdateVisibility(const ComputedStyle *aComputedStyle)
+{ +{
+ bool vis = true; + bool vis = true;
+ +
@ -3475,7 +3475,7 @@
+} +}
+ +
+void +void
+nsMenuObject::UpdateIcon(ComputedStyle *aComputedStyle) +nsMenuObject::UpdateIcon(const ComputedStyle *aComputedStyle)
+{ +{
+ if (ShouldShowIcon()) { + if (ShouldShowIcon()) {
+ if (!mIconLoader) { + if (!mIconLoader) {
@ -3493,10 +3493,10 @@
+ } + }
+} +}
+ +
+already_AddRefed<ComputedStyle> +already_AddRefed<const ComputedStyle>
+nsMenuObject::GetComputedStyle() +nsMenuObject::GetComputedStyle()
+{ +{
+ RefPtr<ComputedStyle> style = + RefPtr<const ComputedStyle> style =
+ nsComputedDOMStyle::GetComputedStyleNoFlush( + nsComputedDOMStyle::GetComputedStyleNoFlush(
+ mContent->AsElement()); + mContent->AsElement());
+ +
@ -3526,7 +3526,7 @@
+} +}
+ +
+void +void
+nsMenuObject::Update(ComputedStyle *aComputedStyle) +nsMenuObject::Update(const ComputedStyle *aComputedStyle)
+{ +{
+} +}
+ +
@ -3630,7 +3630,7 @@
+ +
+ UpdateContentAttributes(); + UpdateContentAttributes();
+ +
+ RefPtr<ComputedStyle> style = GetComputedStyle(); + RefPtr<const ComputedStyle> style = GetComputedStyle();
+ Update(style); + Update(style);
+} +}
+ +
@ -3762,11 +3762,11 @@
+ }; + };
+ +
+ void UpdateLabel(); + void UpdateLabel();
+ void UpdateVisibility(mozilla::ComputedStyle *aComputedStyle); + void UpdateVisibility(const mozilla::ComputedStyle *aComputedStyle);
+ void UpdateSensitivity(); + void UpdateSensitivity();
+ void UpdateIcon(mozilla::ComputedStyle *aComputedStyle); + void UpdateIcon(const mozilla::ComputedStyle *aComputedStyle);
+ +
+ already_AddRefed<mozilla::ComputedStyle> GetComputedStyle(); + already_AddRefed<const mozilla::ComputedStyle> GetComputedStyle();
+ +
+private: +private:
+ friend class nsMenuObjectIconLoader; + friend class nsMenuObjectIconLoader;
@ -3793,7 +3793,7 @@
+ // Update properties that should be refreshed when the container opens. + // Update properties that should be refreshed when the container opens.
+ // This should be implemented by subclasses that have properties which + // This should be implemented by subclasses that have properties which
+ // need refreshing + // need refreshing
+ virtual void Update(mozilla::ComputedStyle *aComputedStyle); + virtual void Update(const mozilla::ComputedStyle *aComputedStyle);
+ +
+ bool ShouldShowIcon() const; + bool ShouldShowIcon() const;
+ void ClearIcon(); + void ClearIcon();
@ -3873,7 +3873,7 @@
+} +}
+ +
+void +void
+nsMenuSeparator::Update(ComputedStyle *aComputedStyle) +nsMenuSeparator::Update(const ComputedStyle *aComputedStyle)
+{ +{
+ UpdateVisibility(aComputedStyle); + UpdateVisibility(aComputedStyle);
+} +}
@ -3906,7 +3906,7 @@
+ +
+ if (aAttribute == nsGkAtoms::hidden || + if (aAttribute == nsGkAtoms::hidden ||
+ aAttribute == nsGkAtoms::collapsed) { + aAttribute == nsGkAtoms::collapsed) {
+ RefPtr<ComputedStyle> style = GetComputedStyle(); + RefPtr<const ComputedStyle> style = GetComputedStyle();
+ UpdateVisibility(style); + UpdateVisibility(style);
+ } + }
+} +}
@ -3960,7 +3960,7 @@
+ +
+private: +private:
+ void InitializeNativeData() override; + void InitializeNativeData() override;
+ void Update(mozilla::ComputedStyle *aComputedStyle) override; + void Update(const mozilla::ComputedStyle *aComputedStyle) override;
+ bool IsCompatibleWithNativeData(DbusmenuMenuitem *aNativeData) const override; + bool IsCompatibleWithNativeData(DbusmenuMenuitem *aNativeData) const override;
+ nsMenuObject::PropertyFlags SupportedProperties() const override; + nsMenuObject::PropertyFlags SupportedProperties() const override;
+ +