--- a/mozilla-kde.patch Fri Jun 08 22:31:03 2018 +0200
+++ b/mozilla-kde.patch Fri Jun 08 22:48:29 2018 +0200
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent d7a4d772ba2afb3ac43e2f2f234ffa55bcf50e70
+# Parent 8671b358718cb8898a55fada20fc9999408daefe
Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Author: Lubos Lunak <lunak@suse.com>
@@ -9,7 +9,7 @@
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
-@@ -76,16 +76,17 @@
+@@ -77,16 +77,17 @@
#include "nsXPCOMCID.h"
#include "nsXPCOM.h"
#include "nsXULAppAPI.h"
@@ -27,7 +27,7 @@
using namespace mozilla;
#ifdef DEBUG
-@@ -3868,25 +3869,37 @@ Preferences::InitInitialObjects()
+@@ -4201,25 +4202,37 @@ Preferences::InitInitialObjects(bool aIs
// application pref files for backwards compatibility.
static const char* specialFiles[] = {
#if defined(XP_MACOSX)
@@ -65,7 +65,7 @@
// Load jar:$app/omni.jar!/defaults/preferences/*.js
// or jar:$gre/omni.jar!/defaults/preferences/*.js.
-@@ -3935,17 +3948,17 @@ Preferences::InitInitialObjects()
+@@ -4268,17 +4281,17 @@ Preferences::InitInitialObjects(bool aIs
}
nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
@@ -79,17 +79,17 @@
}
}
- #ifdef MOZ_WIDGET_ANDROID
- // Set up the correct default for toolkit.telemetry.enabled. If this build
- // has MOZ_TELEMETRY_ON_BY_DEFAULT *or* we're on the beta channel, telemetry
- // is on by default, otherwise not. This is necessary so that beta users who
- // are testing final release builds don't flipflop defaults.
+ if (XRE_IsParentProcess()) {
+ SetupTelemetryPref();
+ }
+
+ NS_CreateServicesFromCategory(NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID,
diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
--- a/modules/libpref/moz.build
+++ b/modules/libpref/moz.build
-@@ -27,16 +27,20 @@ XPIDL_MODULE = 'pref'
- EXPORTS.mozilla += [
+@@ -29,16 +29,20 @@ EXPORTS.mozilla += [
'Preferences.h',
+ 'StaticPrefs.h',
]
UNIFIED_SOURCES += [
@@ -171,7 +171,7 @@
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
-@@ -69,16 +69,18 @@ toolkit.jar:
+@@ -68,16 +68,18 @@ toolkit.jar:
content/global/bindings/checkbox.xml (widgets/checkbox.xml)
content/global/bindings/colorpicker.xml (widgets/colorpicker.xml)
content/global/bindings/datekeeper.js (widgets/datekeeper.js)
@@ -183,13 +183,13 @@
+* content/global/bindings/dialog-kde.xml (widgets/dialog-kde.xml)
+% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde
content/global/bindings/editor.xml (widgets/editor.xml)
- content/global/bindings/filefield.xml (widgets/filefield.xml)
* content/global/bindings/findbar.xml (widgets/findbar.xml)
content/global/bindings/general.xml (widgets/general.xml)
content/global/bindings/groupbox.xml (widgets/groupbox.xml)
content/global/bindings/listbox.xml (widgets/listbox.xml)
content/global/bindings/menu.xml (widgets/menu.xml)
content/global/bindings/menulist.xml (widgets/menulist.xml)
+ content/global/bindings/notification.xml (widgets/notification.xml)
diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml
new file mode 100644
--- /dev/null
@@ -676,45 +676,7 @@
diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downloads/nsHelperAppDlg.js
--- a/toolkit/mozapps/downloads/nsHelperAppDlg.js
+++ b/toolkit/mozapps/downloads/nsHelperAppDlg.js
-@@ -627,17 +627,17 @@ nsUnknownContentTypeDialog.prototype = {
- else
- typeString = mimeInfo.MIMEType;
- }
- // When the length is unknown, contentLength would be -1
- if (this.mLauncher.contentLength >= 0) {
- let [size, unit] = DownloadUtils.
- convertByteUnits(this.mLauncher.contentLength);
- type.value = this.dialogElement("strings")
-- .getFormattedString("orderedFileSizeWithType",
-+ .getFormattedString("orderedFileSizeWithType",
- [typeString, size, unit]);
- }
- else {
- type.value = typeString;
- }
- },
-
- // Returns true if opening the default application makes sense.
-@@ -801,17 +801,17 @@ nsUnknownContentTypeDialog.prototype = {
- switch (this.dialogElement("openHandler").selectedIndex) {
- case 0:
- // No app need be specified in this case.
- ok = true;
- break;
- case 1:
- // only enable the OK button if we have a default app to use or if
- // the user chose an app....
-- ok = this.chosenApp || /\S/.test(this.dialogElement("otherHandler").getAttribute("path"));
-+ ok = this.chosenApp || /\S/.test(this.dialogElement("otherHandler").getAttribute("path"));
- break;
- }
- }
-
- // Enable Ok button if ok to press.
- this.mDialog.document.documentElement.getButton("accept").disabled = !ok;
- },
-
-@@ -1066,30 +1066,60 @@ nsUnknownContentTypeDialog.prototype = {
+@@ -1035,30 +1035,60 @@ nsUnknownContentTypeDialog.prototype = {
if (params.handlerApp &&
params.handlerApp.executable &&
@@ -1371,7 +1333,7 @@
'android/nsExternalSharingAppService.cpp',
'android/nsExternalURLHandlerService.cpp',
'android/nsMIMEInfoAndroid.cpp',
-@@ -124,16 +126,17 @@ include('/ipc/chromium/chromium-config.m
+@@ -122,16 +124,17 @@ include('/ipc/chromium/chromium-config.m
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
@@ -1808,7 +1770,7 @@
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
--- a/widget/gtk/moz.build
+++ b/widget/gtk/moz.build
-@@ -121,16 +121,17 @@ else:
+@@ -122,16 +122,17 @@ else:
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
@@ -2204,7 +2166,7 @@
const char* directive;
int argc;
-@@ -444,16 +445,17 @@ ParseManifest(NSLocationType aType, File
+@@ -441,16 +442,17 @@ ParseManifest(NSLocationType aType, File
NS_NAMED_LITERAL_STRING(kRemoteEnabled, "remoteenabled");
NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired");
NS_NAMED_LITERAL_STRING(kApplication, "application");
@@ -2222,7 +2184,7 @@
NS_NAMED_LITERAL_STRING(kMain, "main");
NS_NAMED_LITERAL_STRING(kContent, "content");
-@@ -499,44 +501,49 @@ ParseManifest(NSLocationType aType, File
+@@ -496,44 +498,49 @@ ParseManifest(NSLocationType aType, File
CopyUTF8toUTF16(s, abi);
abi.Insert(char16_t('_'), 0);
abi.Insert(osTarget, 0);
@@ -2272,7 +2234,7 @@
process = kMain;
}
-@@ -638,25 +645,27 @@ ParseManifest(NSLocationType aType, File
+@@ -635,25 +642,27 @@ ParseManifest(NSLocationType aType, File
TriState stOsVersion = eUnspecified;
TriState stOs = eUnspecified;
TriState stABI = eUnspecified;
@@ -2300,7 +2262,7 @@
}
#if defined(MOZ_WIDGET_ANDROID)
-@@ -701,16 +710,17 @@ ParseManifest(NSLocationType aType, File
+@@ -698,16 +707,17 @@ ParseManifest(NSLocationType aType, File
}
if (!ok ||
@@ -2321,16 +2283,16 @@
diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
--- a/xpcom/components/moz.build
+++ b/xpcom/components/moz.build
-@@ -44,12 +44,13 @@ FINAL_LIBRARY = 'xul'
+@@ -43,12 +43,13 @@ FINAL_LIBRARY = 'xul'
+
LOCAL_INCLUDES += [
'!..',
'../base',
'../build',
'../ds',
- '../reflect/xptinfo',
'/chrome',
'/modules/libjar',
-+ '/toolkit/xre'
++ '/toolkit/xre',
]
if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: