--- a/mozilla-kde.patch Thu Dec 10 14:36:59 2020 +0100
+++ b/mozilla-kde.patch Sun Dec 27 10:49:49 2020 +0100
@@ -3,7 +3,7 @@
# 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>
@@ -13,7 +13,7 @@
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"
@@ -31,7 +31,7 @@
#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)
@@ -69,7 +69,7 @@
// 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);
@@ -91,13 +91,13 @@
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',
- 'SharedPrefMap.cpp',
+ "Preferences.cpp",
+ "SharedPrefMap.cpp",
]
+LOCAL_INCLUDES += [
@@ -106,52 +106,52 @@
+
gen_all_tuple = tuple(gen_h + gen_cpp + gen_rs)
- GeneratedFile(*gen_all_tuple, script='init/generate_static_pref_list.py',
- entry_point='emit_code', inputs=['init/StaticPrefList.yaml'])
-
- PYTHON_UNITTEST_MANIFESTS += [
- 'test/python.ini',
- ]
+ GeneratedFile(
+ *gen_all_tuple,
+ script="init/generate_static_pref_list.py",
+ entry_point="emit_code",
+ 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):
- 'contentaccessible': Flag,
- 'os': StringFlag,
- 'osversion': VersionFlag,
- 'abi': StringFlag,
- 'platform': Flag,
- 'xpcnativewrappers': Flag,
- 'tablet': Flag,
- 'process': StringFlag,
-+ 'desktop': StringFlag,
+@@ -228,16 +228,17 @@ class Flags(OrderedDict):
+ "contentaccessible": Flag,
+ "os": StringFlag,
+ "osversion": VersionFlag,
+ "abi": StringFlag,
+ "platform": Flag,
+ "xpcnativewrappers": Flag,
+ "tablet": Flag,
+ "process": 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):
- 'platformversion',
- 'os',
- 'osversion',
- 'abi',
- 'xpcnativewrappers',
- 'tablet',
- 'process',
- 'contentaccessible',
-+ 'desktop',
+@@ -38,16 +38,17 @@ class ManifestEntry(object):
+ "platformversion",
+ "os",
+ "osversion",
+ "abi",
+ "xpcnativewrappers",
+ "tablet",
+ "process",
+ "contentaccessible",
++ "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
@@ -159,23 +159,23 @@
+++ 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('**'):
- BUG_COMPONENT = ('Toolkit', 'Downloads API')
+ with Files("**"):
+ 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()
@@ -356,26 +356,26 @@
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
- '../components/printingui',
+@@ -91,17 +91,19 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "co
+ "../components/printingui",
]
- elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
+ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "uikit":
UNIFIED_SOURCES += [
- 'nsNativeAppSupportDefault.cpp',
- 'UIKitDirProvider.mm',
+ "nsNativeAppSupportDefault.cpp",
+ "UIKitDirProvider.mm",
]
- elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
+ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
+ EXPORTS += ['nsKDEUtils.h']
UNIFIED_SOURCES += [
-+ 'nsKDEUtils.cpp',
- 'nsNativeAppSupportUnix.cpp',
++ "nsKDEUtils.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
@@ -841,44 +841,44 @@
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'):
- CXXFLAGS += ['-Wno-error=shadow']
+ if CONFIG["CC_TYPE"] in ("clang", "gcc"):
+ CXXFLAGS += ["-Wno-error=shadow"]
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
+ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
UNIFIED_SOURCES += [
-+ 'unix/nsCommonRegistry.cpp',
- 'unix/nsGNOMERegistry.cpp',
-+ 'unix/nsKDERegistry.cpp',
- 'unix/nsMIMEInfoUnix.cpp',
++ "unix/nsCommonRegistry.cpp",
+ "unix/nsGNOMERegistry.cpp",
++ "unix/nsKDERegistry.cpp",
+ "unix/nsMIMEInfoUnix.cpp",
]
- elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "android":
UNIFIED_SOURCES += [
- 'android/nsAndroidHandlerApp.cpp',
- 'android/nsExternalURLHandlerService.cpp',
- 'android/nsMIMEInfoAndroid.cpp',
+ "android/nsAndroidHandlerApp.cpp",
+ "android/nsExternalURLHandlerService.cpp",
+ "android/nsMIMEInfoAndroid.cpp",
]
-@@ -135,16 +137,17 @@ include('/ipc/chromium/chromium-config.m
- FINAL_LIBRARY = 'xul'
+@@ -136,16 +138,17 @@ include("/ipc/chromium/chromium-config.m
+ FINAL_LIBRARY = "xul"
LOCAL_INCLUDES += [
- '/docshell/base',
- '/dom/base',
- '/dom/ipc',
- '/netwerk/base',
- '/netwerk/protocol/http',
-+ '/toolkit/xre',
+ "/docshell/base",
+ "/dom/base",
+ "/dom/ipc",
+ "/netwerk/base",
+ "/netwerk/protocol/http",
++ "/toolkit/xre",
]
- if CONFIG['MOZ_ENABLE_DBUS']:
- CXXFLAGS += CONFIG['TK_CFLAGS']
- CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
+ if CONFIG["MOZ_ENABLE_DBUS"]:
+ CXXFLAGS += CONFIG["TK_CFLAGS"]
+ CXXFLAGS += CONFIG["MOZ_DBUS_CFLAGS"]
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
- CXXFLAGS += CONFIG['TK_CFLAGS']
+ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
+ CXXFLAGS += CONFIG["TK_CFLAGS"]
diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp
new file mode 100644
--- /dev/null
@@ -1293,23 +1293,23 @@
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/forms',
- '/layout/generic',
- '/layout/xul',
- '/other-licenses/atk-1.0',
- '/third_party/cups/include',
-+ '/toolkit/xre',
- '/widget',
- '/widget/headless',
+ "/layout/base",
+ "/layout/forms",
+ "/layout/generic",
+ "/layout/xul",
+ "/other-licenses/atk-1.0",
+ "/third_party/cups/include",
++ "/toolkit/xre",
+ "/widget",
+ "/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
@@ -1816,28 +1816,28 @@
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 += [
- '!..',
- '../base',
- '../build',
- '../ds',
- '/chrome',
- '/js/xpconnect/loader',
- '/layout/build',
- '/modules/libjar',
-+ '/toolkit/xre',
+@@ -66,16 +66,17 @@ LOCAL_INCLUDES += [
+ "!..",
+ "../base",
+ "../build",
+ "../ds",
+ "/chrome",
+ "/js/xpconnect/loader",
+ "/layout/build",
+ "/modules/libjar",
++ "/toolkit/xre",
]
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
- CXXFLAGS += CONFIG['TK_CFLAGS']
- if CONFIG['MOZ_ENABLE_DBUS']:
- CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
+ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
+ CXXFLAGS += CONFIG["TK_CFLAGS"]
+ if CONFIG["MOZ_ENABLE_DBUS"]:
+ 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"
@@ -1855,7 +1855,7 @@
# include "prmem.h"
# include "plbase64.h"
-@@ -1898,62 +1899,77 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1968,62 +1969,77 @@ nsLocalFile::SetPersistentDescriptor(con
NS_IMETHODIMP
nsLocalFile::Reveal() {