diff -r 3f18b0f2a868 -r 735b140fb042 firefox-kde.patch --- a/firefox-kde.patch Thu Aug 23 16:59:04 2018 +0200 +++ b/firefox-kde.patch Fri Aug 24 14:17:12 2018 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 242712e5a1879111d1a93a5d55dfae3fd5d47abc +# Parent 9db8523a81b9b43b952541cd47fc95d472f1eecf diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul new file mode 100644 @@ -1302,7 +1302,7 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn --- a/browser/base/jar.mn +++ b/browser/base/jar.mn -@@ -44,16 +44,18 @@ browser.jar: +@@ -24,16 +24,18 @@ browser.jar: 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) @@ -1314,13 +1314,13 @@ +* content/browser/browser-kde.xul (content/browser-kde.xul) +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde content/browser/browser-addons.js (content/browser-addons.js) + content/browser/browser-allTabsMenu.js (content/browser-allTabsMenu.js) content/browser/browser-captivePortal.js (content/browser-captivePortal.js) content/browser/browser-ctrlTab.js (content/browser-ctrlTab.js) 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) #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 @@ -1341,9 +1341,9 @@ #include "nsIEHistoryEnumerator.h" #endif - #include "rdf.h" #include "nsFeedSniffer.h" -@@ -31,18 +31,16 @@ using namespace mozilla::browser; + #include "AboutRedirector.h" +@@ -30,18 +30,16 @@ using namespace mozilla::browser; ///////////////////////////////////////////////////////////////////////////// @@ -1362,7 +1362,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer) -@@ -60,17 +58,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME +@@ -59,17 +57,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID); #endif @@ -1384,7 +1384,7 @@ 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 -@@ -327,16 +327,23 @@ var gMainPane = { +@@ -321,16 +321,23 @@ var gMainPane = { this._backoffIndex++ : backoffTimes.length - 1]); }; @@ -1408,7 +1408,7 @@ performanceSettingsLink.setAttribute("href", performanceSettingsUrl); this.updateDefaultPerformanceSettingsPref(); -@@ -868,16 +875,27 @@ var gMainPane = { +@@ -861,16 +868,27 @@ var gMainPane = { // Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser. this._backoffIndex = 0; @@ -1752,9 +1752,9 @@ 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 -@@ -452,16 +452,18 @@ - @RESPATH@/browser/defaults/blocklists - @RESPATH@/browser/defaults/pinning +@@ -455,16 +455,18 @@ + @RESPATH@/browser/defaults/settings/pinning + @RESPATH@/browser/defaults/settings/main ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) ; Technically this is an app pref file, but we are keeping it in the original