--- a/MozillaFirefox/MozillaFirefox.spec Fri Jun 08 08:05:14 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec Sat Jun 09 20:36:56 2012 +0200
@@ -91,7 +91,6 @@
Patch7: mozilla-language.patch
Patch8: mozilla-ntlm-full-path.patch
Patch9: mozilla-repo.patch
-Patch10: mozilla-dump_syms-static.patch
Patch11: mozilla-sle11.patch
Patch12: mozilla-disable-neon-option.patch
Patch13: mozilla-yarr-pcre.patch
@@ -218,7 +217,6 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
-%patch10 -p1
%if %suse_version < 1120
%patch11 -p1
%endif
--- a/MozillaFirefox/mozilla-dump_syms-static.patch Fri Jun 08 08:05:14 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-dump_syms-static.patch
\ No newline at end of file
--- a/firefox-branded-icons.patch Fri Jun 08 08:05:14 2012 +0200
+++ b/firefox-branded-icons.patch Sat Jun 09 20:36:56 2012 +0200
@@ -1,10 +1,10 @@
# HG changeset patch
-# Parent 9e165dc62d6ba0c3b2a82387a238fe5811acdc92
+# Parent 8e4bf8e8a79138350231e03dc567d893f67b2a29
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
-@@ -160,16 +160,21 @@ endif
+@@ -127,16 +127,21 @@ endif
endif #} LIBXUL_SDK
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
@@ -29,7 +29,7 @@
diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
--- a/browser/branding/official/Makefile.in
+++ b/browser/branding/official/Makefile.in
-@@ -65,18 +65,21 @@ OSX_BRANDING_FILES = \
+@@ -35,18 +35,21 @@ OSX_BRANDING_FILES = \
firefox.icns \
disk.icns \
document.icns \
@@ -54,8 +54,8 @@
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
-@@ -476,18 +476,21 @@
- @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
+@@ -496,18 +496,21 @@
+ @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
#ifdef SHIP_FEEDBACK
@BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
#endif
--- a/firefox-kde-114.patch Fri Jun 08 08:05:14 2012 +0200
+++ b/firefox-kde-114.patch Sat Jun 09 20:36:56 2012 +0200
@@ -1,27 +1,25 @@
# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent 51bf77cf40165f6567ca7d9a5ff90286739e525a
+# Parent 0db25ab919ad61d91a46d7700d3f06e2b66f9feb
With openSUSE 11.4 the desktop file name changed from MozillaFirefox to firefox
diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
--- a/browser/components/preferences/advanced.js
+++ b/browser/components/preferences/advanced.js
-@@ -705,17 +705,17 @@ var gAdvancedPane = {
- shellSvc.setDefaultBrowser(true, false);
- if (kde_session == 1) {
- var shellObj = Components.classes["@mozilla.org/file/local;1"]
- .createInstance(Components.interfaces.nsILocalFile);
- shellObj.initWithPath("/usr/bin/kwriteconfig");
- var process = Components.classes["@mozilla.org/process/util;1"]
- .createInstance(Components.interfaces.nsIProcess);
- process.init(shellObj);
-- var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "MozillaFirefox"];
-+ var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "firefox"];
- process.run(false, args, args.length);
- }
- }
+@@ -719,15 +719,15 @@ var gAdvancedPane = {
+ if (kde_session == 1) {
+ var shellObj = Components.classes["@mozilla.org/file/local;1"]
+ .createInstance(Components.interfaces.nsILocalFile);
+ shellObj.initWithPath("/usr/bin/kwriteconfig");
+ var process = Components.classes["@mozilla.org/process/util;1"]
+ .createInstance(Components.interfaces.nsIProcess);
+ process.init(shellObj);
+ var args = ["--file", "kdeglobals", "--group", "General", "--key",
+- "BrowserApplication", "MozillaFirefox"];
++ "BrowserApplication", "firefox"];
+ process.run(false, args, args.length);
}
- else {
- promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser",
- [brandShortName]);
- psvc.alert(window, promptTitle, promptMessage);
+ document.getElementById("setDefaultPane").selectedIndex = 1;
+ }
+ #endif
+ };
--- a/firefox-kde.patch Fri Jun 08 08:05:14 2012 +0200
+++ b/firefox-kde.patch Sat Jun 09 20:36:56 2012 +0200
@@ -1122,7 +1122,7 @@
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
-@@ -32,16 +32,18 @@ browser.jar:
+@@ -35,16 +35,18 @@ browser.jar:
content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png)
content/browser/abouthome/mozilla.png (content/abouthome/mozilla.png)
content/browser/abouthome/noise.png (content/abouthome/noise.png)
@@ -1144,7 +1144,7 @@
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
--- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp
-@@ -41,17 +41,17 @@
+@@ -8,17 +8,17 @@
#include "nsBrowserCompsCID.h"
#include "DirectoryProvider.h"
@@ -1163,7 +1163,7 @@
#include "rdf.h"
#include "nsFeedSniffer.h"
-@@ -65,18 +65,16 @@ using namespace mozilla::browser;
+@@ -32,18 +32,16 @@ using namespace mozilla::browser;
/////////////////////////////////////////////////////////////////////////////
@@ -1182,7 +1182,7 @@
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
-@@ -97,17 +95,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID)
+@@ -64,17 +62,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID)
#endif
NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID);
@@ -1204,54 +1204,57 @@
diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
--- a/browser/components/preferences/advanced.js
+++ b/browser/components/preferences/advanced.js
-@@ -716,24 +716,42 @@ var gAdvancedPane = {
- var brandBundle = document.getElementById("bundleBrand");
- var shellBundle = document.getElementById("bundleShell");
- var brandShortName = brandBundle.getString("brandShortName");
- var promptTitle = shellBundle.getString("setDefaultBrowserTitle");
- var promptMessage;
- const IPS = Components.interfaces.nsIPromptService;
- var psvc = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
- .getService(IPS);
-+
+@@ -22,16 +22,22 @@ var gAdvancedPane = {
+ if (extraArgs && extraArgs["advancedTab"]){
+ advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]);
+ } else {
+ var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex");
+ if (preference.value !== null)
+ advancedPrefs.selectedIndex = preference.value;
+ }
+
+ var env = Components.classes["@mozilla.org/process/environment;1"]
+ .getService(Components.interfaces.nsIEnvironment);
+ var kde_session = 0;
+ if (env.get('KDE_FULL_SESSION') == "true")
+ kde_session = 1;
+
- if (!shellSvc.isDefaultBrowser(false)) {
- promptMessage = shellBundle.getFormattedString("setDefaultBrowserMessage",
- [brandShortName]);
- var rv = psvc.confirmEx(window, promptTitle, promptMessage,
- IPS.STD_YES_NO_BUTTONS,
- null, null, null, null, { });
-- if (rv == 0)
-+ if (rv == 0) {
- shellSvc.setDefaultBrowser(true, false);
-+ if (kde_session == 1) {
-+ var shellObj = Components.classes["@mozilla.org/file/local;1"]
-+ .createInstance(Components.interfaces.nsILocalFile);
-+ shellObj.initWithPath("/usr/bin/kwriteconfig");
-+ var process = Components.classes["@mozilla.org/process/util;1"]
-+ .createInstance(Components.interfaces.nsIProcess);
-+ process.init(shellObj);
-+ var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "MozillaFirefox"];
-+ process.run(false, args, args.length);
-+ }
-+ }
- }
- else {
- promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser",
- [brandShortName]);
- psvc.alert(window, promptTitle, promptMessage);
- }
+ #ifdef HAVE_SHELL_SERVICE
+ this.updateSetDefaultBrowser();
+ #endif
+ #ifdef MOZ_UPDATER
+ this.updateReadPrefs();
+ #endif
+ this.updateOfflineApps();
+ #ifdef MOZ_CRASHREPORTER
+@@ -705,12 +711,23 @@ var gAdvancedPane = {
+ /**
+ * Set browser as the operating system default browser.
+ */
+ setDefaultBrowser: function()
+ {
+ var shellSvc = Components.classes["@mozilla.org/browser/shell-service;1"]
+ .getService(Components.interfaces.nsIShellService);
+ shellSvc.setDefaultBrowser(true, false);
++ if (kde_session == 1) {
++ var shellObj = Components.classes["@mozilla.org/file/local;1"]
++ .createInstance(Components.interfaces.nsILocalFile);
++ shellObj.initWithPath("/usr/bin/kwriteconfig");
++ var process = Components.classes["@mozilla.org/process/util;1"]
++ .createInstance(Components.interfaces.nsIProcess);
++ process.init(shellObj);
++ var args = ["--file", "kdeglobals", "--group", "General", "--key",
++ "BrowserApplication", "MozillaFirefox"];
++ process.run(false, args, args.length);
++ }
+ document.getElementById("setDefaultPane").selectedIndex = 1;
}
#endif
+ };
diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
--- a/browser/components/shell/src/Makefile.in
+++ b/browser/components/shell/src/Makefile.in
-@@ -51,17 +51,18 @@ endif
+@@ -17,17 +17,18 @@ USE_STATIC_LIBS = 1
ifeq ($(OS_ARCH),WINNT)
CPPSRCS = nsWindowsShellService.cpp
@@ -1714,9 +1717,9 @@
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
-@@ -500,16 +500,17 @@
- #ifdef MOZ_SERVICES_SYNC
+@@ -521,16 +521,17 @@
@BINPATH@/@PREF_DIR@/services-sync.js
+ @BINPATH@/@PREF_DIR@/services-aitc.js
#endif
@BINPATH@/greprefs.js
@BINPATH@/defaults/autoconfig/platform.js
--- a/firefox-multilocale-chrome.patch Fri Jun 08 08:05:14 2012 +0200
+++ b/firefox-multilocale-chrome.patch Sat Jun 09 20:36:56 2012 +0200
@@ -1,12 +1,12 @@
# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent dd43958a61127a39cb7e59ba6118a57b685255e2
+# Parent 2f0c475e3ea9ba2309ab4ff7debb8bd0d6850a14
Add searchplugins to chrome packaging for proper localization
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
-@@ -356,16 +356,20 @@ pref("browser.download.useToolkitUI", tr
+@@ -332,16 +332,20 @@ pref("browser.download.useToolkitUI", tr
pref("browser.download.panel.removeFinishedDownloads", false);
// search engines URL
@@ -30,7 +30,7 @@
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
-@@ -153,39 +153,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr
+@@ -121,39 +121,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr
install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ;
install:: $(addprefix generic/profile/,$(PROFILE_FILES))
@@ -95,7 +95,7 @@
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
-@@ -103,16 +103,17 @@
+@@ -108,16 +108,17 @@
locale/browser-region/region.properties (%chrome/browser-region/region.properties)
# the following files are browser-specific overrides
* locale/browser/netError.dtd (%chrome/overrides/netError.dtd)
@@ -108,8 +108,8 @@
% locale testpilot @AB_CD@ %locale/feedback/
locale/feedback/main.dtd (%feedback/main.dtd)
locale/feedback/main.properties (%feedback/main.properties)
+ % locale pdf.js @AB_CD@ %locale/pdfviewer/
+ locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties)
+ locale/pdfviewer/chrome.properties (%pdfviewer/chrome.properties)
#ifdef MOZ_WEBAPP_RUNTIME
% locale webapprt @AB_CD@ %locale/webapprt/
- locale/webapprt/webapp.dtd (%webapprt/webapp.dtd)
- locale/webapprt/webapp.properties (%webapprt/webapp.properties)
- #endif
--- a/mozilla-dump_syms-static.patch Fri Jun 08 08:05:14 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# HG changeset patch
-# Parent 364802dc5df3b480143a54d318ceef74f32453fb
-NO-BUG: Ignore a hack which is not needed in distribution build environments.
-
-diff --git a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
---- a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
-+++ b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
-@@ -58,11 +58,11 @@ HOST_LIBS += \
- $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/dwarf/$(LIB_PREFIX)host_breakpad_dwarf_s.$(LIB_SUFFIX) \
- $(NULL)
-
- # force C++ linking
- CPP_PROG_LINK = 1
-
- #XXX: bug 554854 causes us to be unable to run binaries on the build slaves
- # due to them having an older libstdc++
--HOST_LDFLAGS += -static
-+#HOST_LDFLAGS += -static
-
- include $(topsrcdir)/config/rules.mk
--- a/mozilla-kde.patch Fri Jun 08 08:05:14 2012 +0200
+++ b/mozilla-kde.patch Sat Jun 09 20:36:56 2012 +0200
@@ -7,7 +7,7 @@
diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
-@@ -77,14 +77,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas
+@@ -45,14 +45,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas
# Optimizer bug with GCC 3.2.2 on OS/2
ifeq ($(OS_ARCH), OS2)
nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp
@@ -27,7 +27,7 @@
diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp
--- a/modules/libpref/src/Preferences.cpp
+++ b/modules/libpref/src/Preferences.cpp
-@@ -57,16 +57,17 @@
+@@ -23,16 +23,17 @@
#include "nsIStringEnumerator.h"
#include "nsIZipReader.h"
#include "nsPrefBranch.h"
@@ -45,7 +45,7 @@
#include "prefapi.h"
#include "prefread.h"
#include "prefapi_private_data.h"
-@@ -941,16 +942,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -907,16 +908,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
static nsresult pref_LoadPrefsInDirList(const char *listId)
{
@@ -80,7 +80,7 @@
return NS_OK;
bool hasMore;
-@@ -966,17 +985,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -932,17 +951,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);
-@@ -1070,28 +1089,40 @@ static nsresult pref_InitInitialObjects(
+@@ -1036,28 +1055,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)
@@ -143,8 +143,7 @@
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
-@@ -73,8 +73,11 @@ EXTRA_COMPONENTS = \
- nsDownloadManagerUI.js \
+@@ -41,9 +41,12 @@ EXTRA_COMPONENTS = \
nsDownloadManagerUI.manifest \
$(NULL)
endif
@@ -152,13 +151,15 @@
TEST_DIRS += test
include $(topsrcdir)/config/rules.mk
-+
+
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
+
++
+ CXXFLAGS += $(TK_CFLAGS)
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
-@@ -74,16 +74,20 @@
+@@ -35,16 +35,20 @@
#ifdef XP_WIN
#include <shlobj.h>
@@ -179,7 +180,7 @@
#include "AndroidBridge.h"
#endif
-@@ -2259,16 +2263,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2236,16 +2240,25 @@ nsDownload::SetState(DownloadState aStat
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
// Master pref to control this function.
@@ -205,7 +206,7 @@
PRInt64 goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2292,19 +2305,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2269,19 +2282,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
@@ -220,7 +221,7 @@
}
+ }
- #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID)
+ #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GTK2)
nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget);
nsCOMPtr<nsIFile> file;
nsAutoString path;
@@ -230,7 +231,7 @@
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
-@@ -44,29 +44,33 @@ toolkit.jar:
+@@ -45,29 +45,33 @@ toolkit.jar:
*+ content/global/viewZoomOverlay.js (viewZoomOverlay.js)
*+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml)
*+ content/global/bindings/browser.xml (widgets/browser.xml)
@@ -2097,7 +2098,7 @@
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
-@@ -46,16 +46,18 @@
+@@ -12,16 +12,18 @@
#include "nsArrayUtils.h"
#include "prnetdb.h"
#include "prenv.h"
@@ -2116,7 +2117,7 @@
nsUnixSystemProxySettings() {}
nsresult Init();
-@@ -67,16 +69,17 @@ private:
+@@ -33,16 +35,17 @@ private:
nsCOMPtr<nsIGSettingsService> mGSettings;
nsCOMPtr<nsIGSettingsCollection> mProxySettings;
nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings;
@@ -2134,7 +2135,7 @@
nsUnixSystemProxySettings::Init()
{
// If this is a GNOME session, load gconf and try to use its preferences.
-@@ -529,16 +532,19 @@ nsUnixSystemProxySettings::GetProxyForUR
+@@ -495,16 +498,19 @@ nsUnixSystemProxySettings::GetProxyForUR
nsCAutoString host;
rv = aURI->GetHost(host);
NS_ENSURE_SUCCESS(rv, rv);
@@ -2154,7 +2155,7 @@
if (mGConf)
return GetProxyFromGConf(scheme, host, port, aResult);
-@@ -564,8 +570,34 @@ static const mozilla::Module::ContractID
+@@ -530,8 +536,34 @@ static const mozilla::Module::ContractID
static const mozilla::Module kUnixProxyModule = {
mozilla::Module::kVersion,
@@ -2192,7 +2193,7 @@
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
-@@ -100,17 +100,18 @@ else
+@@ -69,17 +69,18 @@ else
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
CMMSRCS = nsNativeAppSupportCocoa.mm
EXPORTS += MacQuirks.h
@@ -2678,7 +2679,7 @@
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$(srcdir)
+@@ -58,18 +58,19 @@ LOCAL_INCLUDES = -I$(srcdir)
LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \
-I$(topsrcdir)/dom/ipc \
-I$(topsrcdir)/content/base/src \
@@ -3046,7 +3047,7 @@
diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
--- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
-@@ -50,30 +50,33 @@
+@@ -16,30 +16,33 @@
#include <QString>
#if (MOZ_ENABLE_CONTENTACTION)
#include <contentaction/contentaction.h>
@@ -3082,7 +3083,7 @@
nsCAutoString spec;
aURI->GetAsciiSpec(spec);
if (hildon_uri_open(spec.get(), action, nsnull))
-@@ -95,22 +98,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI *
+@@ -61,22 +64,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI *
return rv;
}
@@ -3107,7 +3108,7 @@
if (*_retval)
return NS_OK;
-@@ -153,16 +156,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -119,16 +122,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get()));
if (action.isValid()) {
action.trigger();
@@ -3141,7 +3142,7 @@
nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIURI> uri;
-@@ -180,17 +200,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -146,17 +166,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
/* Fallback to GnomeVFS */
nsCOMPtr<nsIGnomeVFSMimeApp> app;
if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app)
@@ -3163,7 +3164,7 @@
diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
--- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp
+++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
-@@ -44,17 +44,17 @@
+@@ -10,17 +10,17 @@
#if defined(MOZ_ENABLE_CONTENTACTION)
#include <contentaction/contentaction.h>
#include <QString>
@@ -3182,7 +3183,7 @@
#include "nsXPIDLString.h"
#include "nsIURL.h"
#include "nsIFileStreams.h"
-@@ -1191,29 +1191,29 @@ nsresult nsOSHelperAppService::OSProtoco
+@@ -1157,29 +1157,29 @@ nsresult nsOSHelperAppService::OSProtoco
ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':');
if (action.isValid())
@@ -3214,7 +3215,7 @@
nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile)
{
-@@ -1299,17 +1299,17 @@ nsOSHelperAppService::GetFromExtension(c
+@@ -1265,17 +1265,17 @@ nsOSHelperAppService::GetFromExtension(c
minorType,
mime_types_description,
true);
@@ -3233,7 +3234,7 @@
rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
majorType,
-@@ -1425,17 +1425,17 @@ nsOSHelperAppService::GetFromType(const
+@@ -1391,17 +1391,17 @@ nsOSHelperAppService::GetFromType(const
#ifdef MOZ_WIDGET_GTK2
nsMIMEInfoBase *gnomeInfo = nsnull;
if (handler.IsEmpty()) {
@@ -3255,7 +3256,7 @@
diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
--- a/widget/gtk2/Makefile.in
+++ b/widget/gtk2/Makefile.in
-@@ -135,11 +135,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME='
+@@ -104,11 +104,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME='
INCLUDES += \
-I$(srcdir)/../xpwidgets \
@@ -3273,11 +3274,11 @@
diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
--- a/widget/gtk2/nsFilePicker.cpp
+++ b/widget/gtk2/nsFilePicker.cpp
-@@ -33,16 +33,17 @@
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+@@ -1,16 +1,17 @@
+ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+ /* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/Util.h"
@@ -3291,7 +3292,7 @@
#include "nsIStringBundle.h"
#include "nsArrayEnumerator.h"
-@@ -51,16 +52,17 @@
+@@ -19,16 +20,17 @@
#include "nsNetUtil.h"
#include "nsReadableUtils.h"
#include "mozcontainer.h"
@@ -3309,7 +3310,7 @@
using namespace mozilla;
#define MAX_PREVIEW_SIZE 180
-@@ -285,17 +287,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil
+@@ -253,17 +255,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil
return nsBaseFilePicker::AppendFilters(aFilterMask);
}
@@ -3330,7 +3331,7 @@
mFilters.AppendElement(filter);
mFilterNames.AppendElement(name);
-@@ -390,16 +394,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat
+@@ -358,16 +362,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat
return NS_ERROR_FAILURE;
}
@@ -3350,7 +3351,7 @@
GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
? GTK_STOCK_SAVE : GTK_STOCK_OPEN;
-@@ -538,8 +545,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
+@@ -506,8 +513,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
*aReturn = nsIFilePicker::returnCancel;
break;
}
@@ -3588,7 +3589,7 @@
diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h
--- a/widget/gtk2/nsFilePicker.h
+++ b/widget/gtk2/nsFilePicker.h
-@@ -89,11 +89,17 @@ protected:
+@@ -57,11 +57,17 @@ protected:
nsString mDefault;
nsString mDefaultExtension;
@@ -3609,7 +3610,7 @@
diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
--- a/xpcom/components/Makefile.in
+++ b/xpcom/components/Makefile.in
-@@ -91,10 +91,11 @@ LOCAL_INCLUDES = \
+@@ -59,10 +59,11 @@ LOCAL_INCLUDES = \
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1
@@ -3624,7 +3625,7 @@
diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
--- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp
-@@ -63,16 +63,17 @@
+@@ -30,16 +30,17 @@
#include "nsTextFormatter.h"
#include "nsVersionComparator.h"
#include "nsXPCOMCIDInternal.h"
@@ -3642,7 +3643,7 @@
const char* directive;
int argc;
-@@ -430,16 +431,17 @@ ParseManifest(NSLocationType type, FileL
+@@ -397,16 +398,17 @@ ParseManifest(NSLocationType type, FileL
NS_NAMED_LITERAL_STRING(kPlatform, "platform");
NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible");
NS_NAMED_LITERAL_STRING(kApplication, "application");
@@ -3660,7 +3661,7 @@
NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers");
nsAutoString appID;
-@@ -477,41 +479,46 @@ ParseManifest(NSLocationType type, FileL
+@@ -444,41 +446,46 @@ ParseManifest(NSLocationType type, FileL
CopyUTF8toUTF16(s, abi);
abi.Insert(PRUnichar('_'), 0);
abi.Insert(osTarget, 0);
@@ -3707,7 +3708,7 @@
char *token;
char *newline = buf;
-@@ -593,24 +600,26 @@ ParseManifest(NSLocationType type, FileL
+@@ -560,24 +567,26 @@ ParseManifest(NSLocationType type, FileL
TriState stOsVersion = eUnspecified;
TriState stOs = eUnspecified;
TriState stABI = eUnspecified;
@@ -3734,7 +3735,7 @@
#if defined(MOZ_WIDGET_ANDROID)
bool tablet = false;
if (CheckFlag(kTablet, wtoken, tablet)) {
-@@ -639,16 +648,17 @@ ParseManifest(NSLocationType type, FileL
+@@ -606,16 +615,17 @@ ParseManifest(NSLocationType type, FileL
}
if (!ok ||
@@ -3755,7 +3756,7 @@
diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
-@@ -189,17 +189,17 @@ include $(topsrcdir)/ipc/chromium/chromi
+@@ -157,17 +157,17 @@ include $(topsrcdir)/ipc/chromium/chromi
DEFINES += -D_IMPL_NS_COM
ifeq ($(OS_ARCH),Linux)
@@ -3777,7 +3778,7 @@
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -90,16 +90,17 @@
+@@ -48,16 +48,17 @@
#include "prproces.h"
#include "nsIDirectoryEnumerator.h"
#include "nsISimpleEnumerator.h"
@@ -3795,7 +3796,7 @@
#include "prmem.h"
#include "plbase64.h"
-@@ -1798,44 +1799,51 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1763,44 +1764,51 @@ nsLocalFile::SetPersistentDescriptor(con
return InitWithNativePath(aPersistentDescriptor);
#endif
}
@@ -3861,7 +3862,7 @@
return rv;
}
return NS_ERROR_FAILURE;
-@@ -1861,16 +1869,23 @@ nsLocalFile::Launch()
+@@ -1826,16 +1834,23 @@ nsLocalFile::Launch()
if (nsnull == connection)
return NS_ERROR_FAILURE;
--- a/mozilla-repo.patch Fri Jun 08 08:05:14 2012 +0200
+++ b/mozilla-repo.patch Sat Jun 09 20:36:56 2012 +0200
@@ -1,10 +1,10 @@
# HG changeset patch
-# Parent d50497c25f208e4868a386f081edc790a505795c
+# Parent c9af3b8022c3f92070c1bd205553d799887cd1b8
diff --git a/build/Makefile.in b/build/Makefile.in
--- a/build/Makefile.in
+++ b/build/Makefile.in
-@@ -95,17 +95,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_
+@@ -62,17 +62,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_
APP_INI_DEPS += $(DEPTH)/config/autoconf.mk
MOZ_SOURCE_STAMP := $(firstword $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg parent --template="{node|short}\n" 2>/dev/null))
@@ -26,7 +26,7 @@
diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in
--- a/toolkit/content/Makefile.in
+++ b/toolkit/content/Makefile.in
-@@ -67,17 +67,17 @@ endif
+@@ -35,17 +35,17 @@ endif
ifeq (Android,$(OS_TARGET))
DEFINES += -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME)
endif
@@ -48,7 +48,7 @@
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
-@@ -162,20 +162,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
+@@ -128,20 +128,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
TEST_PACKAGE = $(PKG_BASENAME).tests.zip
ifneq (,$(wildcard $(DIST)/bin/application.ini))
@@ -74,7 +74,7 @@
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
-@@ -240,20 +240,20 @@ endif
+@@ -220,20 +220,20 @@ endif
MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))
ifdef MOZ_SOURCE_STAMP
@@ -91,11 +91,11 @@
+ SOURCE_REPO ?= $(strip $(SOURCE_REPO))
+ SOURCE_REPO ?= $(patsubst ssh://%,http://%,$(SOURCE_REPO))
+ SOURCE_REPO ?= $(patsubst %/,%,$(SOURCE_REPO))
- $(call errorIfEmpty,SOURCE_REPO)
+
+ # command set should change based on revision control use.
+ # warn for now in case (git, bzr, ...) is in use.
+ $(call warnIfEmpty,SOURCE_REPO)
# extra sanity check for old versions of hg, no showconfig support
ifeq (http,$(patsubst http%,http,$(SOURCE_REPO)))
INIARGS += --sourcerepo=$(SOURCE_REPO)
- endif
-
- endif # MOZ_SOURCE_STAMP
--- a/mozilla-shared-nss-db.patch Fri Jun 08 08:05:14 2012 +0200
+++ b/mozilla-shared-nss-db.patch Sat Jun 09 20:36:56 2012 +0200
@@ -7,7 +7,7 @@
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
-@@ -590,16 +590,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO
+@@ -573,16 +573,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO
MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@
MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@
@@ -31,7 +31,7 @@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -8180,16 +8180,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8270,16 +8270,31 @@ AC_SUBST(QCMS_LIBS)
dnl ========================================================
dnl HarfBuzz
@@ -66,7 +66,7 @@
diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
-@@ -119,12 +119,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS)
+@@ -86,12 +86,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS)
DEFINES += \
-DNSS_ENABLE_ECC \
-DDLL_PREFIX=\"$(DLL_PREFIX)\" \
@@ -85,14 +85,12 @@
diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
-@@ -39,16 +39,23 @@
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
+@@ -1,14 +1,21 @@
+ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
*
- * ***** END LICENSE BLOCK ***** */
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#ifdef MOZ_ENABLE_NSSHELPER
+#pragma GCC visibility push(default)
@@ -109,7 +107,7 @@
#include "nsNetUtil.h"
#include "nsAppDirectoryServiceDefs.h"
#include "nsDirectoryService.h"
-@@ -1776,18 +1783,34 @@ nsNSSComponent::InitializeNSS(bool showW
+@@ -1738,18 +1745,34 @@ nsNSSComponent::InitializeNSS(bool showW
ConfigureInternalPKCS11Token();
// The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@@ -149,7 +147,7 @@
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
-@@ -439,17 +439,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
+@@ -446,17 +446,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
endif
endif
endif
--- a/series Fri Jun 08 08:05:14 2012 +0200
+++ b/series Sat Jun 09 20:36:56 2012 +0200
@@ -13,7 +13,6 @@
mozilla-language.patch
mozilla-ntlm-full-path.patch
mozilla-repo.patch
-mozilla-dump_syms-static.patch
mozilla-sle11.patch
mozilla-gcc47.patch
mozilla-arm-disable-edsp.patch
--- a/xulrunner/mozilla-dump_syms-static.patch Fri Jun 08 08:05:14 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-dump_syms-static.patch
\ No newline at end of file
--- a/xulrunner/xulrunner.spec Fri Jun 08 08:05:14 2012 +0200
+++ b/xulrunner/xulrunner.spec Sat Jun 09 20:36:56 2012 +0200
@@ -75,7 +75,6 @@
Patch5: mozilla-prefer_plugin_pref.patch
Patch6: mozilla-language.patch
Patch7: mozilla-ntlm-full-path.patch
-Patch8: mozilla-dump_syms-static.patch
Patch9: mozilla-sle11.patch
Patch10: mozilla-arm-cpu-detection.patch
Patch11: mozilla-yarr-pcre.patch
@@ -192,7 +191,6 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
-%patch8 -p1
%if %suse_version < 1120
%patch9 -p1
%endif