--- a/mozilla-kde.patch Sat Sep 19 22:04:22 2015 +0200
+++ b/mozilla-kde.patch Sat Oct 31 20:58:31 2015 +0100
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent 3f3d1e5db92a45cf3758ee5ba77c577fcfb364c9
+# Parent 21f164ba2522a31ab9cfb4766acff17526183f8e
Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Author: Lubos Lunak <lunak@suse.com>
@@ -28,7 +28,7 @@
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
-@@ -27,16 +27,17 @@
+@@ -30,16 +30,17 @@
#include "nsIZipReader.h"
#include "nsPrefBranch.h"
#include "nsXPIDLString.h"
@@ -46,7 +46,7 @@
#include "prefread.h"
#include "prefapi_private_data.h"
-@@ -1153,16 +1154,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -1148,16 +1149,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
static nsresult pref_LoadPrefsInDirList(const char *listId)
{
@@ -81,7 +81,7 @@
return NS_OK;
bool hasMore;
-@@ -1178,17 +1197,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1173,17 +1192,17 @@ static nsresult pref_LoadPrefsInDirList(
nsAutoCString leaf;
path->GetNativeLeafName(leaf);
@@ -100,7 +100,7 @@
{
nsZipItemPtr<char> manifest(jarReader, name, true);
NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1282,26 +1301,38 @@ static nsresult pref_InitInitialObjects(
+@@ -1277,26 +1296,38 @@ static nsresult pref_InitInitialObjects(
/* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
static const char* specialFiles[] = {
#if defined(XP_MACOSX)
@@ -205,7 +205,7 @@
diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
--- a/toolkit/components/downloads/nsDownloadManager.cpp
+++ b/toolkit/components/downloads/nsDownloadManager.cpp
-@@ -46,16 +46,20 @@
+@@ -51,16 +51,20 @@
#ifdef XP_WIN
#include <shlobj.h>
#include "nsWindowsHelpers.h"
@@ -226,7 +226,7 @@
#include "AndroidBridge.h"
#endif
-@@ -2711,16 +2715,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2714,16 +2718,25 @@ nsDownload::SetState(DownloadState aStat
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
// Master pref to control this function.
@@ -252,7 +252,7 @@
int64_t goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2751,16 +2764,17 @@ nsDownload::SetState(DownloadState aStat
+@@ -2754,16 +2767,17 @@ nsDownload::SetState(DownloadState aStat
NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
message, !removeWhenDone,
mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"),
@@ -2183,9 +2183,9 @@
diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
-@@ -14,16 +14,17 @@
- #include "prenv.h"
+@@ -15,16 +15,17 @@
#include "nsPrintfCString.h"
+ #include "nsNetCID.h"
#include "nsNetUtil.h"
#include "nsISupportsPrimitives.h"
#include "nsIGSettingsService.h"
@@ -2201,7 +2201,7 @@
nsUnixSystemProxySettings()
: mSchemeProxySettings(4)
-@@ -38,16 +39,17 @@ private:
+@@ -39,16 +40,17 @@ private:
nsCOMPtr<nsIGSettingsService> mGSettings;
nsCOMPtr<nsIGSettingsCollection> mProxySettings;
nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings;
@@ -2219,7 +2219,7 @@
nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)
{
// dbus prevents us from being threadsafe, but this routine should not block anyhow
-@@ -504,16 +506,19 @@ nsUnixSystemProxySettings::GetProxyFromG
+@@ -505,16 +507,19 @@ nsUnixSystemProxySettings::GetProxyFromG
nsresult
nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec,
@@ -2239,7 +2239,7 @@
if (mGConf)
return GetProxyFromGConf(aScheme, aHost, aPort, aResult);
-@@ -539,8 +544,34 @@ static const mozilla::Module::ContractID
+@@ -540,8 +545,34 @@ static const mozilla::Module::ContractID
static const mozilla::Module kUnixProxyModule = {
mozilla::Module::kVersion,
@@ -2277,7 +2277,7 @@
diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
-@@ -43,17 +43,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
+@@ -48,17 +48,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'ui
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
EXPORTS += ['nsQAppInstance.h']
SOURCES += [
@@ -3606,7 +3606,7 @@
+ desktop = NS_LITERAL_STRING("android");
#endif
- if (XRE_GetProcessType() == GeckoProcessType_Content) {
+ if (XRE_IsContentProcess()) {
process = kContent;
} else {
process = kMain;