--- a/firefox-branded-icons.patch Wed Mar 30 19:01:28 2011 +0200
+++ b/firefox-branded-icons.patch Tue Apr 12 11:22:16 2011 +0200
@@ -1,9 +1,10 @@
# HG changeset patch
-# Parent 33dfbc62844ac4883fbedb77d782a1b9ef5596c4
+# Parent 20b50e5bd650d19c30c308bb3b10f9903c83f581
+
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
-@@ -281,16 +281,21 @@ endif
+@@ -277,16 +277,21 @@ endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
libs::
@@ -29,7 +30,7 @@
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -423,18 +423,21 @@
- #if MOZ_UPDATE_CHANNEL == beta
+ #ifdef SHIP_FEEDBACK
@BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
#endif
@BINPATH@/chrome/toolkit@JAREXT@
--- a/mozilla-kde.patch Wed Mar 30 19:01:28 2011 +0200
+++ b/mozilla-kde.patch Tue Apr 12 11:22:16 2011 +0200
@@ -21,7 +21,7 @@
diff --git a/modules/libpref/src/nsPrefService.cpp b/modules/libpref/src/nsPrefService.cpp
--- a/modules/libpref/src/nsPrefService.cpp
+++ b/modules/libpref/src/nsPrefService.cpp
-@@ -55,16 +55,17 @@
+@@ -53,16 +53,17 @@
#include "nsIStringEnumerator.h"
#include "nsIZipReader.h"
#include "nsPrefBranch.h"
@@ -39,7 +39,7 @@
#include "prefapi.h"
#include "prefread.h"
#include "prefapi_private_data.h"
-@@ -772,30 +773,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -758,30 +759,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
}
static nsresult pref_LoadPrefsInDirList(const char *listId)
@@ -89,7 +89,7 @@
}
//----------------------------------------------------------------------------------------
-@@ -890,24 +909,36 @@ static nsresult pref_InitInitialObjects(
+@@ -876,24 +895,36 @@ 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_MAC) || defined(XP_MACOSX)
@@ -160,11 +160,11 @@
#include <CoreFoundation/CoreFoundation.h>
#endif
- #define DOWNLOAD_MANAGER_BUNDLE "chrome://mozapps/locale/downloads/downloads.properties"
- #define DOWNLOAD_MANAGER_ALERT_ICON "chrome://mozapps/skin/downloads/downloadIcon.png"
- #define PREF_BDM_SHOWALERTONCOMPLETE "browser.download.manager.showAlertOnComplete"
- #define PREF_BDM_SHOWALERTINTERVAL "browser.download.manager.showAlertInterval"
-@@ -2199,16 +2203,25 @@ nsDownload::SetState(DownloadState aStat
+ #ifdef ANDROID
+ #include "AndroidBridge.h"
+ #endif
+
+@@ -2203,16 +2207,25 @@ nsDownload::SetState(DownloadState aStat
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
// Master pref to control this function.
@@ -190,7 +190,8 @@
PRInt64 goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2234,16 +2247,17 @@ nsDownload::SetState(DownloadState aStat
+@@ -2237,17 +2250,17 @@ nsDownload::SetState(DownloadState aStat
+ // retention policy, there's no reason to make the text clickable
// because if it is, they'll click open the download manager and
// the items they downloaded will have been removed.
alerts->ShowAlertNotification(
@@ -198,11 +199,11 @@
message, !removeWhenDone, EmptyString(), mDownloadManager,
EmptyString());
}
- }
+- }
+ } // end non-KDE block
}
- #if (defined(XP_WIN) && !defined(WINCE)) || defined(XP_MACOSX)
+ #if (defined(XP_WIN) && !defined(WINCE)) || defined(XP_MACOSX) || defined(ANDROID)
nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget);
nsCOMPtr<nsIFile> file;
nsAutoString path;
@@ -2573,13 +2574,13 @@
diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
-@@ -90,18 +90,19 @@ LOCAL_INCLUDES += -I$(topsrcdir)/dom/bas
+@@ -88,18 +88,19 @@ LOCAL_INCLUDES = -I$(srcdir)
+ LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \
-I$(topsrcdir)/dom/ipc \
-I$(topsrcdir)/content/base/src \
-I$(topsrcdir)/content/events/src \
-I$(topsrcdir)/netwerk/base/src \
-I$(topsrcdir)/netwerk/protocol/http
- endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-OSHELPER += nsGNOMERegistry.cpp
@@ -3635,10 +3636,10 @@
continue;
if (directive->regfunc) {
- #ifdef MOZ_IPC
if (GeckoProcessType_Default != XRE_GetProcessType())
continue;
- #endif
+
+ if (!nsChromeRegistry::gChromeRegistry) {
diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
--- a/mozilla-pkgconfig.patch Wed Mar 30 19:01:28 2011 +0200
+++ b/mozilla-pkgconfig.patch Tue Apr 12 11:22:16 2011 +0200
@@ -14,17 +14,17 @@
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
+# the apilibdir always ends with 1.9 as every patch update will provide a link
-+apilibdir = $(dir $(installdir))xulrunner-2.0
++apilibdir = $(dir $(installdir))xulrunner-2.2
+
- $(MOZILLA_VERSION).system.conf: $(topsrcdir)/config/milestone.txt Makefile
- printf "[%s]\nGRE_PATH=%s\nxulrunner=true\nabi=%s" \
- $(MOZILLA_VERSION) $(installdir) $(TARGET_XPCOM_ABI)> $@
+ # Add pkg-config files to the install:: target
- ifndef SKIP_GRE_REGISTRATION
- # to register xulrunner per-user, override this with $HOME/.gre.d
- regdir = /etc/gre.d
-
-@@ -116,16 +119,17 @@ pkg_config_files += mozilla-nss.pc
+ pkg_config_files = \
+ libxul.pc \
+ libxul-embedding.pc \
+ mozilla-js.pc \
+ mozilla-plugin.pc \
+ mozilla-gtkmozembed.pc \
+@@ -103,16 +106,17 @@ pkg_config_files += mozilla-nss.pc
endif
%.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS)
--- a/mozilla-xulrunner22/mozilla-xulrunner22.spec Wed Mar 30 19:01:28 2011 +0200
+++ b/mozilla-xulrunner22/mozilla-xulrunner22.spec Tue Apr 12 11:22:16 2011 +0200
@@ -32,7 +32,7 @@
License: MPLv1.1 or GPLv2+ or LGPLv2+
Version: 2.2a
Release: 1
-%define releasedate 2011033000
+%define releasedate 2011041100
%define version_internal 2.2a1pre
%define apiversion 2.2
%define uaweight 220000