diff -r c0ae7c025b78 -r a9baaad57fa4 mozilla-kde.patch --- 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 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 @@ -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 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 fileURL = do_QueryInterface(mTarget); nsCOMPtr 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 mGSettings; nsCOMPtr mProxySettings; nsInterfaceHashtable 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 #if (MOZ_ENABLE_CONTENTACTION) #include @@ -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 ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr uri; -@@ -180,17 +200,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns +@@ -146,17 +166,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns /* Fallback to GnomeVFS */ nsCOMPtr 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 #include @@ -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;