--- a/firefox-kde.patch Sat Nov 04 20:25:02 2017 +0100
+++ b/firefox-kde.patch Sat Nov 04 23:30:29 2017 +0100
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent 05209af7fdfec897f5f574c691184ba27049b0ff
+# Parent c68a0b83e6eaebd87e9790659aef919e50b830c0
diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
new file mode 100644
@@ -1330,8 +1330,8 @@
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -58,16 +58,18 @@ browser.jar:
- content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml)
- content/browser/aboutProviderDirectory.xhtml (content/aboutProviderDirectory.xhtml)
+ content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
+ content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css)
content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js)
content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml)
@@ -1346,8 +1346,8 @@
content/browser/browser-customization.js (content/browser-customization.js)
content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js)
content/browser/browser-compacttheme.js (content/browser-compacttheme.js)
- content/browser/browser-feeds.js (content/browser-feeds.js)
- content/browser/browser-fullScreenAndPointerLock.js (content/browser-fullScreenAndPointerLock.js)
+ #ifndef MOZILLA_OFFICIAL
+ content/browser/browser-development-helpers.js (content/browser-development-helpers.js)
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
--- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp
@@ -1370,7 +1370,7 @@
#include "rdf.h"
#include "nsFeedSniffer.h"
-@@ -31,18 +31,16 @@ using namespace mozilla::browser;
+@@ -32,18 +32,16 @@ using namespace mozilla::browser;
/////////////////////////////////////////////////////////////////////////////
@@ -1389,9 +1389,9 @@
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
-@@ -60,17 +58,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME
- NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID);
- #endif
+@@ -64,17 +62,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID)
+ NS_GENERIC_FACTORY_CONSTRUCTOR(nsSessionStoreUtils)
+ NS_DEFINE_NAMED_CID(NS_SESSIONSTOREUTILS_CID);
static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
{ &kNS_BROWSERDIRECTORYPROVIDER_CID, false, nullptr, DirectoryProviderConstructor },
@@ -1411,13 +1411,13 @@
diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
--- a/browser/components/preferences/in-content/main.js
+++ b/browser/components/preferences/in-content/main.js
-@@ -41,16 +41,23 @@ var gMainPane = {
- // way to get all file type association prefs. So we don't know
- // when the user will select the default. We refresh here periodically
- // in case the default changes. On other Windows OS's defaults can also
- // be set while the prefs are open.
- window.setInterval(this.updateSetDefaultBrowser.bind(this), 1000);
- }
+@@ -203,16 +203,23 @@ var gMainPane = {
+ this._backoffIndex++ : backoffTimes.length - 1]);
+ };
+
+ window.setTimeout(() => {
+ window.requestIdleCallback(pollForDefaultBrowser);
+ }, backoffTimes[this._backoffIndex]);
}
+ var env = Components.classes["@mozilla.org/process/environment;1"]
@@ -1427,17 +1427,17 @@
+ kde_session = 1;
+ }
+
+ this.initBrowserContainers();
this.buildContentProcessCountMenuList();
- this.updateDefaultPerformanceSettingsPref();
- let defaultPerformancePref =
- document.getElementById("browser.preferences.defaultPerformanceSettings.enabled");
- defaultPerformancePref.addEventListener("change", () => {
- this.updatePerformanceSettingsBox({duringChangeEvent: true});
- });
-@@ -875,16 +882,27 @@ var gMainPane = {
- let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser");
- alwaysCheckPref.value = true;
+ let performanceSettingsLink = document.getElementById("performanceSettingsLearnMore");
+ let performanceSettingsUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + "performance";
+ performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
+
+ this.updateDefaultPerformanceSettingsPref();
+@@ -952,16 +959,27 @@ var gMainPane = {
+ // Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser.
+ this._backoffIndex = 0;
let shellSvc = getShellService();
if (!shellSvc)
@@ -1466,7 +1466,7 @@
diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
--- a/browser/components/shell/moz.build
+++ b/browser/components/shell/moz.build
-@@ -38,16 +38,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
+@@ -39,16 +39,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
SOURCES += [
@@ -1778,7 +1778,7 @@
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
-@@ -664,16 +664,18 @@
+@@ -666,16 +666,18 @@
@RESPATH@/browser/defaults/blocklists
@RESPATH@/browser/defaults/pinning