--- a/mozilla-kde.patch Wed Apr 25 13:47:56 2012 +0200
+++ b/mozilla-kde.patch Sat Apr 28 23:20:28 2012 +0200
@@ -45,7 +45,7 @@
#include "prefapi.h"
#include "prefread.h"
#include "prefapi_private_data.h"
-@@ -937,16 +938,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -941,16 +942,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
static nsresult pref_LoadPrefsInDirList(const char *listId)
{
@@ -80,7 +80,7 @@
return NS_OK;
bool hasMore;
-@@ -962,17 +981,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -966,17 +985,17 @@ static nsresult pref_LoadPrefsInDirList(
nsCAutoString leaf;
path->GetNativeLeafName(leaf);
@@ -99,7 +99,7 @@
{
nsZipItemPtr<char> manifest(jarReader, name, true);
NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1062,28 +1081,40 @@ static nsresult pref_InitInitialObjects(
+@@ -1070,28 +1089,40 @@ 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)
@@ -137,9 +137,9 @@
NS_WARNING("Error parsing application default preferences.");
// Load jar:$app/omni.jar!/defaults/preferences/*.js
+ // or jar:$gre/omni.jar!/defaults/preferences/*.js.
nsRefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP);
- if (appJarReader) {
- rv = appJarReader->FindInit("defaults/preferences/*.js$", &findPtr);
+ // GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which
diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in
--- a/toolkit/components/downloads/Makefile.in
+++ b/toolkit/components/downloads/Makefile.in
@@ -179,7 +179,7 @@
#include "AndroidBridge.h"
#endif
-@@ -2221,16 +2225,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2259,16 +2263,25 @@ nsDownload::SetState(DownloadState aStat
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
// Master pref to control this function.
@@ -205,7 +205,7 @@
PRInt64 goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2254,19 +2267,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2292,19 +2305,20 @@ nsDownload::SetState(DownloadState aStat
// If downloads are automatically removed per the user's
// retention policy, there's no reason to make the text clickable
// because if it is, they'll click open the download manager and
@@ -2192,7 +2192,7 @@
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
-@@ -96,17 +96,18 @@ else
+@@ -100,17 +100,18 @@ else
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
CMMSRCS = nsNativeAppSupportCocoa.mm
EXPORTS += MacQuirks.h
@@ -3755,7 +3755,7 @@
diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
-@@ -188,17 +188,17 @@ include $(topsrcdir)/ipc/chromium/chromi
+@@ -189,17 +189,17 @@ include $(topsrcdir)/ipc/chromium/chromi
DEFINES += -D_IMPL_NS_COM
ifeq ($(OS_ARCH),Linux)
@@ -3795,7 +3795,7 @@
#include "prmem.h"
#include "plbase64.h"
-@@ -1796,44 +1797,51 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1798,44 +1799,51 @@ nsLocalFile::SetPersistentDescriptor(con
return InitWithNativePath(aPersistentDescriptor);
#endif
}
@@ -3861,7 +3861,7 @@
return rv;
}
return NS_ERROR_FAILURE;
-@@ -1859,16 +1867,23 @@ nsLocalFile::Launch()
+@@ -1861,16 +1869,23 @@ nsLocalFile::Launch()
if (nsnull == connection)
return NS_ERROR_FAILURE;