mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:b8c834aafde2
+:c3d884659acf
 # HG changeset patch
 # User msirringhaus@suse.de
 # Date 1559294891 -7200
 #      Fri May 31 11:28:11 2019 +0200
 # Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
-# Parent  4b9aa59b15c3247d263cc32804786b3a6bff7912
+# Parent  929fbcb071c2e1ff551c73e8c364e9c1f4495171
 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
-@@ -82,16 +82,17 @@
+@@ -84,16 +84,17 @@
-#include "nsXPCOM.h"
-#include "nsXULAppAPI.h"
-#include "nsZipArchive.h"
 #include "plbase64.h"
 #include "PLDHashTable.h"
 #include "plstr.h"
 #include "prlink.h"
 #include "xpcpublic.h"
+#ifdef MOZ_BACKGROUNDTASKS
+#  include "mozilla/BackgroundTasks.h"
+#endif
 +#include "nsKDEUtils.h"
 #ifdef DEBUG
 #  include <map>
 #endif
 #ifdef MOZ_MEMORY
 #  include "mozmemory.h"
 #endif
-@@ -4459,25 +4460,37 @@ nsresult Preferences::InitInitialObjects
+@@ -4573,25 +4574,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.
-@@ -4523,17 +4536,17 @@ nsresult Preferences::InitInitialObjects
+@@ -4656,17 +4669,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
-@@ -116,16 +116,20 @@ EXPORTS.mozilla += [
+@@ -117,16 +117,20 @@ EXPORTS.mozilla += [
 ]
 EXPORTS.mozilla += sorted(["!" + g for g in gen_h])
 UNIFIED_SOURCES += [
 "Preferences.cpp",
 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
-@@ -228,16 +228,17 @@ class Flags(OrderedDict):
+@@ -229,16 +229,17 @@ class Flags(OrderedDict):
-"contentaccessible": Flag,
 "os": StringFlag,
 "osversion": VersionFlag,
 "abi": StringFlag,
 "platform": Flag,
 "xpcnativewrappers": Flag,
 "tablet": Flag,
 "process": StringFlag,
-+	"desktop": StringFlag,
+"backgroundtask": StringFlag,
++        "desktop": StringFlag,
 }
 RE = re.compile(r"([!<>=]+)")
 def __init__(self, *flags):
 """
 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
-@@ -38,16 +38,17 @@ class ManifestEntry(object):
+@@ -39,16 +39,17 @@ class ManifestEntry(object):
-"platformversion",
 "os",
 "osversion",
 "abi",
 "xpcnativewrappers",
 "tablet",
 "process",
 "contentaccessible",
+"backgroundtask",
 +        "desktop",
 ]
 def __init__(self, base, *flags):
 """
 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
-@@ -1243,36 +1243,66 @@ nsUnknownContentTypeDialog.prototype = {
+@@ -1231,36 +1231,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
-@@ -91,17 +91,19 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "co
+@@ -92,17 +92,19 @@ elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "co
 "../components/printingui",
 ]
 elif CONFIG["MOZ_WIDGET_TOOLKIT"] == "uikit":
 UNIFIED_SOURCES += [
 "nsNativeAppSupportDefault.cpp",
 #include "nsReadableUtils.h"
 #include "nsUnicharUtils.h"
 #include "nsIFileStreams.h"
 #include "nsILineInputStream.h"
 #include "nsIFile.h"
-@@ -1019,17 +1019,17 @@ nsresult nsOSHelperAppService::GetHandle
+@@ -1020,17 +1020,17 @@ nsresult nsOSHelperAppService::GetHandle
 nsresult nsOSHelperAppService::OSProtocolHandlerExists(
 const char* aProtocolScheme, bool* aHandlerExists) {
 nsresult rv = NS_OK;
 } else {
 *aHandlerExists = false;
 nsCOMPtr<nsIHandlerService> handlerSvc =
 do_GetService(NS_HANDLERSERVICE_CONTRACTID, &rv);
 if (NS_SUCCEEDED(rv) && handlerSvc) {
-@@ -1039,17 +1039,17 @@ nsresult nsOSHelperAppService::OSProtoco
+@@ -1040,17 +1040,17 @@ nsresult nsOSHelperAppService::OSProtoco
 }
 return rv;
 }
 #endif
 }
 NS_IMETHODIMP nsOSHelperAppService::IsCurrentAppOSDefaultForProtocol(
 const nsACString& aScheme, bool* _retval) {
-@@ -1136,17 +1136,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel
+@@ -1137,17 +1137,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel
 nsresult rv =
 LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType,
 minorType, mime_types_description, true);
 if (NS_FAILED(rv) || majorType.IsEmpty()) {
 }
 #endif
 rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType,
 minorType, mime_types_description, false);
-@@ -1247,17 +1247,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel
+@@ -1248,17 +1248,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel
 // Now look up our extensions
 nsAutoString extensions, mime_types_description;
 LookUpExtensionsAndDescription(majorType, minorType, extensions,
 mime_types_description);
 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
-@@ -138,16 +138,17 @@ FINAL_LIBRARY = "xul"
+@@ -137,16 +137,17 @@ FINAL_LIBRARY = "xul"
 LOCAL_INCLUDES += [
 "/layout/base",
 "/layout/forms",
 "/layout/generic",
 gboolean modal);
 diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
 --- a/xpcom/components/ManifestParser.cpp
 +++ b/xpcom/components/ManifestParser.cpp
-@@ -34,16 +34,17 @@
+@@ -38,16 +38,17 @@
 #include "nsTextFormatter.h"
 #include "nsVersionComparator.h"
 #include "nsXPCOMCIDInternal.h"
 #include "nsIConsoleService.h"
 struct ManifestDirective {
 const char* directive;
 int argc;
 bool ischrome;
-@@ -393,16 +394,17 @@ void ParseManifest(NSLocationType aType,
+@@ -397,16 +398,17 @@ void ParseManifest(NSLocationType aType,
 constexpr auto kRemoteEnabled = u"remoteenabled"_ns;
 constexpr auto kRemoteRequired = u"remoterequired"_ns;
 constexpr auto kApplication = u"application"_ns;
 constexpr auto kAppVersion = u"appversion"_ns;
 constexpr auto kGeckoVersion = u"platformversion"_ns;
 +  constexpr auto kDesktop = u"desktop"_ns;
 constexpr auto kProcess = u"process"_ns;
 #if defined(MOZ_WIDGET_ANDROID)
 constexpr auto kTablet = u"tablet"_ns;
 #endif
+// You might expect this to be guarded by MOZ_BACKGROUNDTASKS, but it's not
-constexpr auto kMain = u"main"_ns;
+// possible to have conditional manifest contents, so we need to recognize and
-constexpr auto kContent = u"content"_ns;
+// discard these tokens even when MOZ_BACKGROUNDTASKS is not set.
+constexpr auto kBackgroundTask = u"backgroundtask"_ns;
-@@ -448,39 +450,44 @@ void ParseManifest(NSLocationType aType,
+@@ -456,39 +458,44 @@ void ParseManifest(NSLocationType aType,
 CopyUTF8toUTF16(s, abi);
 abi.Insert(char16_t('_'), 0);
 abi.Insert(osTarget, 0);
 }
 }
 process = kContent;
 } else {
 process = kMain;
 }
-@@ -567,25 +574,27 @@ void ParseManifest(NSLocationType aType,
+@@ -583,25 +590,27 @@ void ParseManifest(NSLocationType aType,
-TriState stOsVersion = eUnspecified;
+// When in background task mode, default to not registering
-TriState stOs = eUnspecified;
+// category directivies unless backgroundtask=1 is specified.
-TriState stABI = eUnspecified;
+TriState stBackgroundTask = (BackgroundTasks::IsBackgroundTaskMode() &&
-TriState stProcess = eUnspecified;
+strcmp("category", directive->directive) == 0)
-#if defined(MOZ_WIDGET_ANDROID)
+? eBad
-TriState stTablet = eUnspecified;
+: eUnspecified;
 #endif
 int flags = 0;
 +    TriState stDesktop = eUnspecified;
 while ((token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) &&
 CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion,
 stGeckoVersion)) {
 continue;
 }
-@@ -622,17 +631,17 @@ void ParseManifest(NSLocationType aType,
+@@ -650,17 +659,17 @@ void ParseManifest(NSLocationType aType,
 }
 LogMessageWithContext(
 aFile, line, "Unrecognized chrome manifest modifier '%s'.", token);
 ok = false;
 -        stGeckoVersion == eBad || stOs == eBad || stOsVersion == eBad ||
 +        stGeckoVersion == eBad || stOs == eBad || stOsVersion == eBad || stDesktop == eBad ||
 #ifdef MOZ_WIDGET_ANDROID
 stTablet == eBad ||
 #endif
+#ifdef MOZ_BACKGROUNDTASKS
+stBackgroundTask == eBad ||
+#endif
 stABI == eBad || stProcess == eBad) {
 continue;
-}
-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
 @@ -66,16 +66,17 @@ LOCAL_INCLUDES += [
 "!..",
 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")
+if CONFIG["MOZ_BACKGROUNDTASKS"]:
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
 @@ -49,16 +49,17 @@
 #include "prproces.h"
 #  include <Carbon/Carbon.h>
 #  include "CocoaFileUtils.h"
 #  include "prmem.h"
 #  include "plbase64.h"
-@@ -1968,62 +1969,77 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -2001,62 +2002,77 @@ nsLocalFile::SetPersistentDescriptor(con
 NS_IMETHODIMP
 nsLocalFile::Reveal() {
 if (!FilePreferences::IsAllowedPath(mPath)) {
 return NS_ERROR_FILE_ACCESS_DENIED;

branch	firefox87
changeset 1156	c3d884659acf
parent 1152	4cfe46c9a944
child 1157	57fc0524b50c