mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:8df86bf11fc1
+:4cfe46c9a944
 # HG changeset patch
 # User msirringhaus@suse.de
 # Date 1559294891 -7200
 #      Fri May 31 11:28:11 2019 +0200
 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
-# Parent  e89d21ead66fbb34b6349edda42748a3ad9e6136
+# Parent  4b9aa59b15c3247d263cc32804786b3a6bff7912
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
 https://bugzilla.novell.com/show_bug.cgi?id=170055
 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
 --- a/modules/libpref/Preferences.cpp
 +++ b/modules/libpref/Preferences.cpp
-@@ -83,16 +83,17 @@
+@@ -82,16 +82,17 @@
 #include "nsXPCOM.h"
 #include "nsXULAppAPI.h"
 #include "nsZipArchive.h"
 #include "plbase64.h"
 #include "PLDHashTable.h"
 #endif
 #ifdef MOZ_MEMORY
 #  include "mozmemory.h"
 #endif
-@@ -4536,25 +4537,37 @@ nsresult Preferences::InitInitialObjects
+@@ -4459,25 +4460,37 @@ nsresult Preferences::InitInitialObjects
 // application pref files for backwards compatibility.
 static const char* specialFiles[] = {
 #if defined(XP_MACOSX)
 "macprefs.js"
 #elif defined(XP_WIN)
 NS_WARNING("Error parsing application default preferences.");
 }
 // Load jar:$app/omni.jar!/defaults/preferences/*.js
 // or jar:$gre/omni.jar!/defaults/preferences/*.js.
-@@ -4600,17 +4613,17 @@ nsresult Preferences::InitInitialObjects
+@@ -4523,17 +4536,17 @@ nsresult Preferences::InitInitialObjects
 }
 nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
 if (!path) {
 continue;
 if (aIsStartup) {
 diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
 --- a/modules/libpref/moz.build
 +++ b/modules/libpref/moz.build
-@@ -118,16 +118,20 @@ EXPORTS.mozilla += [
+@@ -116,16 +116,20 @@ EXPORTS.mozilla += [
 ]
-EXPORTS.mozilla += sorted(['!' + g for g in gen_h])
+EXPORTS.mozilla += sorted(["!" + g for g in gen_h])
 UNIFIED_SOURCES += [
-'Preferences.cpp',
+"Preferences.cpp",
-'SharedPrefMap.cpp',
+"SharedPrefMap.cpp",
 ]
 +LOCAL_INCLUDES += [
 +    '/toolkit/xre'
 +]
 +
 gen_all_tuple = tuple(gen_h + gen_cpp + gen_rs)
-GeneratedFile(*gen_all_tuple, script='init/generate_static_pref_list.py',
+GeneratedFile(
-entry_point='emit_code', inputs=['init/StaticPrefList.yaml'])
+*gen_all_tuple,
+script="init/generate_static_pref_list.py",
-PYTHON_UNITTEST_MANIFESTS += [
+entry_point="emit_code",
-'test/python.ini',
+inputs=["init/StaticPrefList.yaml"]
-]
+)
 diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py
 --- a/python/mozbuild/mozpack/chrome/flags.py
 +++ b/python/mozbuild/mozpack/chrome/flags.py
-@@ -227,16 +227,17 @@ class Flags(OrderedDict):
+@@ -228,16 +228,17 @@ class Flags(OrderedDict):
-'contentaccessible': Flag,
+"contentaccessible": Flag,
-'os': StringFlag,
+"os": StringFlag,
-'osversion': VersionFlag,
+"osversion": VersionFlag,
-'abi': StringFlag,
+"abi": StringFlag,
-'platform': Flag,
+"platform": Flag,
-'xpcnativewrappers': Flag,
+"xpcnativewrappers": Flag,
-'tablet': Flag,
+"tablet": Flag,
-'process': StringFlag,
+"process": StringFlag,
-+        'desktop': StringFlag,
++	"desktop": StringFlag,
 }
-RE = re.compile(r'([!<>=]+)')
+RE = re.compile(r"([!<>=]+)")
 def __init__(self, *flags):
-'''
+"""
 Initialize a set of flags given in string form.
 flags = Flags('contentaccessible=yes', 'appversion>=3.5')
-'''
+"""
 diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py
 --- a/python/mozbuild/mozpack/chrome/manifest.py
 +++ b/python/mozbuild/mozpack/chrome/manifest.py
-@@ -37,16 +37,17 @@ class ManifestEntry(object):
+@@ -38,16 +38,17 @@ class ManifestEntry(object):
-'platformversion',
+"platformversion",
-'os',
+"os",
-'osversion',
+"osversion",
-'abi',
+"abi",
-'xpcnativewrappers',
+"xpcnativewrappers",
-'tablet',
+"tablet",
-'process',
+"process",
-'contentaccessible',
+"contentaccessible",
-+	'desktop',
++        "desktop",
 ]
 def __init__(self, base, *flags):
-'''
+"""
 Initialize a manifest entry with the given base path and flags.
-'''
+"""
 self.base = base
 self.flags = Flags(*flags)
 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
 --- a/toolkit/components/downloads/moz.build
 +++ b/toolkit/components/downloads/moz.build
 @@ -45,10 +45,14 @@ XPCOM_MANIFESTS += [
-if CONFIG['MOZ_PLACES']:
+if CONFIG["MOZ_PLACES"]:
 EXTRA_JS_MODULES += [
-'DownloadHistory.jsm',
+"DownloadHistory.jsm",
 ]
-FINAL_LIBRARY = 'xul'
+FINAL_LIBRARY = "xul"
 +LOCAL_INCLUDES += [
 +    '/toolkit/xre'
 +]
 +
-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
 --- a/toolkit/mozapps/downloads/HelperAppDlg.jsm
 +++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm
-@@ -1239,36 +1239,66 @@ nsUnknownContentTypeDialog.prototype = {
+@@ -1243,36 +1243,66 @@ nsUnknownContentTypeDialog.prototype = {
 params.handlerApp &&
 params.handlerApp.executable &&
 params.handlerApp.executable.isFile()
 ) {
 // Remember the file they chose to run.
 return result.forget().downcast<nsISupports>();
 }
 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
 --- a/toolkit/xre/moz.build
 +++ b/toolkit/xre/moz.build
-@@ -90,17 +90,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
+@@ -91,17 +91,19 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "co
-'../components/printingui',
+"../components/printingui",
 ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
+elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "uikit":
 UNIFIED_SOURCES += [
-'nsNativeAppSupportDefault.cpp',
+"nsNativeAppSupportDefault.cpp",
-'UIKitDirProvider.mm',
+"UIKitDirProvider.mm",
 ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
+elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
 +    EXPORTS += ['nsKDEUtils.h']
 UNIFIED_SOURCES += [
-+        'nsKDEUtils.cpp',
++        "nsKDEUtils.cpp",
-'nsNativeAppSupportUnix.cpp',
+"nsNativeAppSupportUnix.cpp",
 ]
 else:
 UNIFIED_SOURCES += [
-'nsNativeAppSupportDefault.cpp',
+"nsNativeAppSupportDefault.cpp",
 ]
-if CONFIG['MOZ_HAS_REMOTE']:
+if CONFIG["MOZ_HAS_REMOTE"]:
 diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/xre/nsKDEUtils.cpp
 @@ -0,0 +1,344 @@
 #endif
 return IPC_OK();
 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
 --- a/uriloader/exthandler/moz.build
 +++ b/uriloader/exthandler/moz.build
-@@ -85,17 +85,19 @@ else:
+@@ -86,17 +86,19 @@ else:
 SOURCES += [
-osdir + '/nsOSHelperAppService.cpp',
+osdir + "/nsOSHelperAppService.cpp",
 ]
-if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
+if CONFIG["CC_TYPE"] in ("clang", "gcc"):
-CXXFLAGS += ['-Wno-error=shadow']
+CXXFLAGS += ["-Wno-error=shadow"]
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
+if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
 UNIFIED_SOURCES += [
-+        'unix/nsCommonRegistry.cpp',
++        "unix/nsCommonRegistry.cpp",
-'unix/nsGNOMERegistry.cpp',
+"unix/nsGNOMERegistry.cpp",
-+        'unix/nsKDERegistry.cpp',
++        "unix/nsKDERegistry.cpp",
-'unix/nsMIMEInfoUnix.cpp',
+"unix/nsMIMEInfoUnix.cpp",
 ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "android":
 UNIFIED_SOURCES += [
-'android/nsAndroidHandlerApp.cpp',
+"android/nsAndroidHandlerApp.cpp",
-'android/nsExternalURLHandlerService.cpp',
+"android/nsExternalURLHandlerService.cpp",
-'android/nsMIMEInfoAndroid.cpp',
+"android/nsMIMEInfoAndroid.cpp",
 ]
-@@ -135,16 +137,17 @@ include('/ipc/chromium/chromium-config.m
+@@ -136,16 +138,17 @@ include("/ipc/chromium/chromium-config.m
-FINAL_LIBRARY = 'xul'
+FINAL_LIBRARY = "xul"
 LOCAL_INCLUDES += [
-'/docshell/base',
+"/docshell/base",
-'/dom/base',
+"/dom/base",
-'/dom/ipc',
+"/dom/ipc",
-'/netwerk/base',
+"/netwerk/base",
-'/netwerk/protocol/http',
+"/netwerk/protocol/http",
-+    '/toolkit/xre',
++    "/toolkit/xre",
 ]
-if CONFIG['MOZ_ENABLE_DBUS']:
+if CONFIG["MOZ_ENABLE_DBUS"]:
-CXXFLAGS += CONFIG['TK_CFLAGS']
+CXXFLAGS += CONFIG["TK_CFLAGS"]
-CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
+CXXFLAGS += CONFIG["MOZ_DBUS_CFLAGS"]
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
+if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-CXXFLAGS += CONFIG['TK_CFLAGS']
+CXXFLAGS += CONFIG["TK_CFLAGS"]
 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp
 new file mode 100644
 --- /dev/null
 +++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp
 @@ -0,0 +1,53 @@
 NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?");
 gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions));
 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
 --- a/widget/gtk/moz.build
 +++ b/widget/gtk/moz.build
-@@ -134,16 +134,17 @@ FINAL_LIBRARY = 'xul'
+@@ -138,16 +138,17 @@ FINAL_LIBRARY = "xul"
 LOCAL_INCLUDES += [
-'/layout/base',
+"/layout/base",
-'/layout/forms',
+"/layout/forms",
-'/layout/generic',
+"/layout/generic",
-'/layout/xul',
+"/layout/xul",
-'/other-licenses/atk-1.0',
+"/other-licenses/atk-1.0",
-'/third_party/cups/include',
+"/third_party/cups/include",
-+    '/toolkit/xre',
++    "/toolkit/xre",
-'/widget',
+"/widget",
-'/widget/headless',
+"/widget/headless",
 ]
-if CONFIG['MOZ_X11']:
+if CONFIG["MOZ_X11"]:
 LOCAL_INCLUDES += [
-'/widget/x11',
+"/widget/x11",
 ]
 diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
 --- a/widget/gtk/nsFilePicker.cpp
 +++ b/widget/gtk/nsFilePicker.cpp
 @@ -1,15 +1,16 @@
 if (directive->regfunc) {
 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
 --- a/xpcom/components/moz.build
 +++ b/xpcom/components/moz.build
-@@ -62,16 +62,17 @@ LOCAL_INCLUDES += [
+@@ -66,16 +66,17 @@ LOCAL_INCLUDES += [
-'!..',
+"!..",
-'../base',
+"../base",
-'../build',
+"../build",
-'../ds',
+"../ds",
-'/chrome',
+"/chrome",
-'/js/xpconnect/loader',
+"/js/xpconnect/loader",
-'/layout/build',
+"/layout/build",
-'/modules/libjar',
+"/modules/libjar",
-+    '/toolkit/xre',
++    "/toolkit/xre",
 ]
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
+if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
-CXXFLAGS += CONFIG['TK_CFLAGS']
+CXXFLAGS += CONFIG["TK_CFLAGS"]
-if CONFIG['MOZ_ENABLE_DBUS']:
+if CONFIG["MOZ_ENABLE_DBUS"]:
-CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
+CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]
-include('/ipc/chromium/chromium-config.mozbuild')
+include("/ipc/chromium/chromium-config.mozbuild")
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -46,16 +46,17 @@
+@@ -49,16 +49,17 @@
 #include "prproces.h"
 #include "nsIDirectoryEnumerator.h"
 #include "nsSimpleEnumerator.h"
 #include "private/pprio.h"
 #include "prlink.h"
 #  include <Carbon/Carbon.h>
 #  include "CocoaFileUtils.h"
 #  include "prmem.h"
 #  include "plbase64.h"
-@@ -1898,62 +1899,77 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1968,62 +1969,77 @@ nsLocalFile::SetPersistentDescriptor(con
 NS_IMETHODIMP
 nsLocalFile::Reveal() {
 if (!FilePreferences::IsAllowedPath(mPath)) {
 return NS_ERROR_FILE_ACCESS_DENIED;

branch	firefox84
changeset 1152	4cfe46c9a944
parent 1144	8a43aff7e982
child 1156	c3d884659acf