--- a/mozilla-kde.patch Thu Jun 11 22:04:26 2020 +0200
+++ b/mozilla-kde.patch Fri Jun 12 23:01:02 2020 +0200
@@ -3,7 +3,7 @@
# Date 1559294891 -7200
# Fri May 31 11:28:11 2019 +0200
# Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
-# Parent b517aa8dfa37d729db9590fe699caa38f899dfba
+# Parent aa58e8c70d1448a08407c6c191ea8b76d61e8bf6
Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Author: Lubos Lunak <lunak@suse.com>
@@ -175,7 +175,7 @@
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
-@@ -1205,36 +1205,66 @@ nsUnknownContentTypeDialog.prototype = {
+@@ -1203,36 +1203,66 @@ nsUnknownContentTypeDialog.prototype = {
params.handlerApp &&
params.handlerApp.executable &&
params.handlerApp.executable.isFile()
@@ -800,7 +800,7 @@
using mozilla::dom::RemoteHandlerApp;
namespace {
-@@ -294,17 +294,17 @@ mozilla::ipc::IPCResult HandlerServicePa
+@@ -299,17 +299,17 @@ mozilla::ipc::IPCResult HandlerServicePa
mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocolOS(
const nsCString& aProtocolScheme, bool* aHandlerExists) {
if (aProtocolScheme.Length() > MAX_SCHEME_LENGTH) {
@@ -819,7 +819,7 @@
/*
* Check if a handler exists for the provided protocol. Check the datastore
-@@ -323,17 +323,17 @@ mozilla::ipc::IPCResult HandlerServicePa
+@@ -328,17 +328,17 @@ mozilla::ipc::IPCResult HandlerServicePa
nsCOMPtr<nsIExternalProtocolService> protoSvc =
do_GetService(NS_EXTERNALPROTOCOLSERVICE_CONTRACTID, &rv);
if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -1214,7 +1214,7 @@
#include "nsIFileStreams.h"
#include "nsILineInputStream.h"
#include "nsIFile.h"
-@@ -1023,17 +1023,17 @@ nsresult nsOSHelperAppService::GetHandle
+@@ -1022,17 +1022,17 @@ nsresult nsOSHelperAppService::GetHandle
nsresult nsOSHelperAppService::OSProtocolHandlerExists(
const char* aProtocolScheme, bool* aHandlerExists) {
@@ -1233,7 +1233,7 @@
nsCOMPtr<nsIHandlerService> handlerSvc =
do_GetService(NS_HANDLERSERVICE_CONTRACTID, &rv);
if (NS_SUCCEEDED(rv) && handlerSvc) {
-@@ -1043,17 +1043,17 @@ nsresult nsOSHelperAppService::OSProtoco
+@@ -1042,17 +1042,17 @@ nsresult nsOSHelperAppService::OSProtoco
}
return rv;
@@ -1252,7 +1252,7 @@
NS_IMETHODIMP nsOSHelperAppService::IsCurrentAppOSDefaultForProtocol(
const nsACString& aScheme, bool* _retval) {
-@@ -1140,17 +1140,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel
+@@ -1139,17 +1139,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel
nsresult rv =
LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType,
minorType, mime_types_description, true);
@@ -1271,7 +1271,7 @@
rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType,
minorType, mime_types_description, false);
-@@ -1252,17 +1252,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel
+@@ -1251,17 +1251,17 @@ already_AddRefed<nsMIMEInfoBase> nsOSHel
// Now look up our extensions
nsAutoString extensions, mime_types_description;
@@ -1293,7 +1293,7 @@
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
--- a/widget/gtk/moz.build
+++ b/widget/gtk/moz.build
-@@ -129,16 +129,17 @@ include('/ipc/chromium/chromium-config.m
+@@ -131,16 +131,17 @@ include('/ipc/chromium/chromium-config.m
FINAL_LIBRARY = 'xul'
@@ -1331,13 +1331,13 @@
#include "nsGtkUtils.h"
#include "nsIFileURL.h"
#include "nsIGIOService.h"
-@@ -20,16 +21,18 @@
- #include "nsArrayEnumerator.h"
+@@ -22,16 +23,18 @@
#include "nsMemory.h"
#include "nsEnumeratorUtils.h"
#include "nsNetUtil.h"
#include "nsReadableUtils.h"
- #include "mozcontainer.h"
+ #include "MozContainer.h"
+ #include "gfxPlatformGtk.h"
#include "nsFilePicker.h"
+#include "nsKDEUtils.h"
@@ -1350,7 +1350,7 @@
#define MAX_PREVIEW_SOURCE_SIZE 4096
nsIFile* nsFilePicker::mPrevDisplayDirectory = nullptr;
-@@ -223,17 +226,19 @@ nsFilePicker::AppendFilters(int32_t aFil
+@@ -231,17 +234,19 @@ nsFilePicker::AppendFilters(int32_t aFil
mAllowURLs = !!(aFilterMask & filterAllowURLs);
return nsBaseFilePicker::AppendFilters(aFilterMask);
}
@@ -1371,7 +1371,7 @@
mFilters.AppendElement(filter);
mFilterNames.AppendElement(name);
-@@ -333,16 +338,39 @@ nsresult nsFilePicker::Show(int16_t* aRe
+@@ -341,16 +346,39 @@ nsresult nsFilePicker::Show(int16_t* aRe
return NS_OK;
}
@@ -1411,7 +1411,7 @@
GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
const gchar* accept_button;
-@@ -562,16 +590,244 @@ void nsFilePicker::Done(void* file_choos
+@@ -570,16 +598,244 @@ void nsFilePicker::Done(void* file_choos
mCallback->Done(result);
mCallback = nullptr;
} else {
@@ -1685,7 +1685,7 @@
diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
--- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp
-@@ -33,16 +33,17 @@
+@@ -34,16 +34,17 @@
#include "nsTextFormatter.h"
#include "nsVersionComparator.h"
#include "nsXPCOMCIDInternal.h"
@@ -1703,7 +1703,7 @@
int argc;
bool ischrome;
-@@ -393,16 +394,17 @@ void ParseManifest(NSLocationType aType,
+@@ -394,16 +395,17 @@ void ParseManifest(NSLocationType aType,
NS_NAMED_LITERAL_STRING(kRemoteEnabled, "remoteenabled");
NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired");
NS_NAMED_LITERAL_STRING(kApplication, "application");
@@ -1721,7 +1721,7 @@
NS_NAMED_LITERAL_STRING(kMain, "main");
NS_NAMED_LITERAL_STRING(kContent, "content");
-@@ -448,39 +450,44 @@ void ParseManifest(NSLocationType aType,
+@@ -449,39 +451,44 @@ void ParseManifest(NSLocationType aType,
CopyUTF8toUTF16(s, abi);
abi.Insert(char16_t('_'), 0);
abi.Insert(osTarget, 0);
@@ -1742,8 +1742,8 @@
+ desktop = NS_LITERAL_STRING("win");
# pragma warning(pop)
#elif defined(MOZ_WIDGET_COCOA)
- SInt32 majorVersion = nsCocoaFeatures::OSXVersionMajor();
- SInt32 minorVersion = nsCocoaFeatures::OSXVersionMinor();
+ SInt32 majorVersion = nsCocoaFeatures::macOSVersionMajor();
+ SInt32 minorVersion = nsCocoaFeatures::macOSVersionMinor();
nsTextFormatter::ssprintf(osVersion, u"%ld.%ld", majorVersion, minorVersion);
+ desktop = NS_LITERAL_STRING("macosx");
#elif defined(MOZ_WIDGET_GTK)
@@ -1766,7 +1766,7 @@
process = kMain;
}
-@@ -567,25 +574,27 @@ void ParseManifest(NSLocationType aType,
+@@ -568,25 +575,27 @@ void ParseManifest(NSLocationType aType,
TriState stOsVersion = eUnspecified;
TriState stOs = eUnspecified;
TriState stABI = eUnspecified;
@@ -1794,7 +1794,7 @@
continue;
}
-@@ -622,17 +631,17 @@ void ParseManifest(NSLocationType aType,
+@@ -623,17 +632,17 @@ void ParseManifest(NSLocationType aType,
}
LogMessageWithContext(
@@ -1833,7 +1833,7 @@
if CONFIG['MOZ_ENABLE_DBUS']:
CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
- if CONFIG['MOZ_LAYOUT_DEBUGGER']:
+ 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
@@ -1855,7 +1855,7 @@
# include "prmem.h"
# include "plbase64.h"
-@@ -1907,62 +1908,77 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1898,62 +1899,77 @@ nsLocalFile::SetPersistentDescriptor(con
NS_IMETHODIMP
nsLocalFile::Reveal() {