diff -r ab25aac2aa83 -r 18c2dc922e51 mozilla-kde.patch --- a/mozilla-kde.patch Tue Nov 19 18:46:37 2013 +0100 +++ b/mozilla-kde.patch Sun Dec 29 22:45:13 2013 +0100 @@ -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 -@@ -35,14 +35,15 @@ endif +@@ -33,14 +33,15 @@ endif # Optimizer bug with GCC 3.2.2 on OS/2 ifeq ($(OS_ARCH), OS2) nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp @@ -26,7 +26,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 -@@ -26,16 +26,17 @@ +@@ -27,16 +27,17 @@ #include "nsIZipReader.h" #include "nsPrefBranch.h" #include "nsXPIDLString.h" @@ -44,7 +44,7 @@ #include "prefread.h" #include "prefapi_private_data.h" -@@ -1098,16 +1099,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char +@@ -1100,16 +1101,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char static nsresult pref_LoadPrefsInDirList(const char *listId) { @@ -79,7 +79,7 @@ return NS_OK; bool hasMore; -@@ -1123,17 +1142,17 @@ static nsresult pref_LoadPrefsInDirList( +@@ -1125,17 +1144,17 @@ static nsresult pref_LoadPrefsInDirList( nsAutoCString leaf; path->GetNativeLeafName(leaf); @@ -98,7 +98,7 @@ { nsZipItemPtr manifest(jarReader, name, true); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); -@@ -1227,28 +1246,40 @@ static nsresult pref_InitInitialObjects( +@@ -1229,28 +1248,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) @@ -2137,7 +2137,7 @@ nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly) { // dbus prevents us from being threadsafe, but this routine should not block anyhow -@@ -498,16 +501,19 @@ nsUnixSystemProxySettings::GetProxyFromG +@@ -504,16 +507,19 @@ nsUnixSystemProxySettings::GetProxyFromG nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec, @@ -2157,7 +2157,7 @@ if (mGConf) return GetProxyFromGConf(aScheme, aHost, aPort, aResult); -@@ -533,8 +539,34 @@ static const mozilla::Module::ContractID +@@ -539,8 +545,34 @@ static const mozilla::Module::ContractID static const mozilla::Module kUnixProxyModule = { mozilla::Module::kVersion, @@ -2195,27 +2195,28 @@ diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build --- a/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build -@@ -44,18 +44,20 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt +@@ -43,18 +43,20 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt 'nsNativeAppSupportQt.cpp', 'nsQAppInstance.cpp', ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2': - CPP_SOURCES += [ + SOURCES += [ 'nsNativeAppSupportOS2.cpp', ] elif CONFIG['MOZ_ENABLE_GTK']: + EXPORTS += ['nsKDEUtils.h'] - CPP_SOURCES += [ - 'nsNativeAppSupportUnix.cpp', -+ 'nsKDEUtils.cpp' + SOURCES += [ +- 'nsNativeAppSupportUnix.cpp', ++ 'nsKDEUtils.cpp', ++ 'nsNativeAppSupportUnix.cpp' ] else: - CPP_SOURCES += [ + SOURCES += [ 'nsNativeAppSupportDefault.cpp', ] if CONFIG['MOZ_X11']: - CPP_SOURCES += [ + SOURCES += [ diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp new file mode 100644 --- /dev/null @@ -2616,12 +2617,12 @@ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in -@@ -45,9 +45,10 @@ ifdef MOZ_ENABLE_DBUS +@@ -44,9 +44,10 @@ endif + ifdef MOZ_ENABLE_DBUS LOCAL_INCLUDES += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS) endif include $(topsrcdir)/config/rules.mk - include $(topsrcdir)/ipc/chromium/chromium-config.mk ifneq (,$(filter qt gtk2 gtk3, $(MOZ_WIDGET_TOOLKIT))) CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS) @@ -2630,25 +2631,26 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build --- a/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build -@@ -73,16 +73,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco +@@ -73,17 +73,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco ] else: - CPP_SOURCES += [ - 'nsOSHelperAppService.cpp', + SOURCES += [ + osdir + '/nsOSHelperAppService.cpp', ] if CONFIG['MOZ_ENABLE_GTK']: - CPP_SOURCES += [ -+ 'nsCommonRegistry.cpp', -+ 'nsKDERegistry.cpp', - 'nsGNOMERegistry.cpp', - 'nsMIMEInfoUnix.cpp', + SOURCES += [ ++ 'unix/nsCommonRegistry.cpp', + 'unix/nsGNOMERegistry.cpp', ++ 'unix/nsKDERegistry.cpp', + 'unix/nsMIMEInfoUnix.cpp', ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': - CPP_SOURCES += [ - 'nsMIMEInfoAndroid.cpp', - 'nsAndroidHandlerApp.cpp', - 'nsExternalSharingAppService.cpp', + SOURCES += [ + 'android/nsAndroidHandlerApp.cpp', + 'android/nsExternalSharingAppService.cpp', + 'android/nsExternalURLHandlerService.cpp', + 'android/nsMIMEInfoAndroid.cpp', diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp new file mode 100644 --- /dev/null @@ -3069,10 +3071,10 @@ #endif // Now look up our extensions -diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in ---- a/widget/gtk2/Makefile.in -+++ b/widget/gtk2/Makefile.in -@@ -38,11 +38,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' +diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in +--- a/widget/gtk/Makefile.in ++++ b/widget/gtk/Makefile.in +@@ -26,11 +26,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' INCLUDES += \ -I$(srcdir)/../xpwidgets \ @@ -3087,9 +3089,9 @@ ifdef MOZ_X11 INCLUDES += -I$(srcdir)/../shared/x11 endif -diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp ---- a/widget/gtk2/nsFilePicker.cpp -+++ b/widget/gtk2/nsFilePicker.cpp +diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp +--- a/widget/gtk/nsFilePicker.cpp ++++ b/widget/gtk/nsFilePicker.cpp @@ -1,32 +1,34 @@ /* -*- 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 @@ -3125,7 +3127,7 @@ nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr; void -@@ -225,17 +227,19 @@ nsFilePicker::AppendFilters(int32_t aFil +@@ -226,17 +228,19 @@ nsFilePicker::AppendFilters(int32_t aFil return nsBaseFilePicker::AppendFilters(aFilterMask); } @@ -3146,7 +3148,7 @@ mFilters.AppendElement(filter); mFilterNames.AppendElement(name); -@@ -349,16 +353,32 @@ nsFilePicker::Show(int16_t *aReturn) +@@ -350,16 +354,32 @@ nsFilePicker::Show(int16_t *aReturn) NS_IMETHODIMP nsFilePicker::Open(nsIFilePickerShownCallback *aCallback) @@ -3179,7 +3181,7 @@ GtkFileChooserAction action = GetGtkFileChooserAction(mMode); const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE) -@@ -537,8 +557,235 @@ nsFilePicker::Done(GtkWidget* file_choos +@@ -538,8 +558,235 @@ nsFilePicker::Done(GtkWidget* file_choos if (mCallback) { mCallback->Done(result); mCallback = nullptr; @@ -3415,9 +3417,9 @@ + return NS_OK; + } + -diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h ---- a/widget/gtk2/nsFilePicker.h -+++ b/widget/gtk2/nsFilePicker.h +diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h +--- a/widget/gtk/nsFilePicker.h ++++ b/widget/gtk/nsFilePicker.h @@ -66,11 +66,17 @@ protected: nsString mDefault; nsString mDefaultExtension; @@ -3547,7 +3549,7 @@ bool contentAccessible = false; + TriState stDesktop = eUnspecified; - while (NULL != (token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) && ok) { + while (nullptr != (token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) && ok) { ToLowerCase(token); NS_ConvertASCIItoUTF16 wtoken(token); @@ -3584,8 +3586,8 @@ diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in -@@ -7,9 +7,9 @@ include $(topsrcdir)/config/rules.mk - include $(topsrcdir)/ipc/chromium/chromium-config.mk +@@ -6,9 +6,9 @@ MOZILLA_INTERNAL_API = 1 + include $(topsrcdir)/config/rules.mk ifeq ($(OS_ARCH),Linux) ifneq (,$(findstring lib64,$(libdir))) @@ -3598,11 +3600,11 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp --- a/xpcom/io/nsLocalFileUnix.cpp +++ b/xpcom/io/nsLocalFileUnix.cpp -@@ -42,16 +42,17 @@ - #include "prproces.h" +@@ -43,16 +43,17 @@ #include "nsIDirectoryEnumerator.h" #include "nsISimpleEnumerator.h" #include "private/pprio.h" + #include "prlink.h" #ifdef MOZ_WIDGET_GTK #include "nsIGIOService.h" @@ -3616,7 +3618,7 @@ #include "prmem.h" #include "plbase64.h" -@@ -1727,44 +1728,51 @@ nsLocalFile::SetPersistentDescriptor(con +@@ -1728,44 +1729,51 @@ nsLocalFile::SetPersistentDescriptor(con return InitWithNativePath(aPersistentDescriptor); #endif } @@ -3682,7 +3684,7 @@ return rv; } return NS_ERROR_FAILURE; -@@ -1772,16 +1780,23 @@ nsLocalFile::Reveal() +@@ -1773,16 +1781,23 @@ nsLocalFile::Reveal() return NS_ERROR_FAILURE; #endif }