--- a/mozilla-kde.patch	Sat Jul 23 15:16:24 2011 +0200
+++ b/mozilla-kde.patch	Sat Jul 23 15:31:44 2011 +0200
@@ -1,7 +1,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
-@@ -87,14 +87,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas
+@@ -77,14 +77,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
@@ -39,7 +39,7 @@
  #include "prefapi.h"
  #include "prefread.h"
  #include "prefapi_private_data.h"
-@@ -822,30 +823,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
+@@ -966,30 +967,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
  }
  
  static nsresult pref_LoadPrefsInDirList(const char *listId)
@@ -89,7 +89,7 @@
  }
  
  static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name)
-@@ -938,28 +957,40 @@ static nsresult pref_InitInitialObjects(
+@@ -1082,28 +1101,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)
@@ -133,15 +133,15 @@
 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
-@@ -79,8 +79,10 @@ endif
+@@ -77,8 +77,10 @@ EXTRA_COMPONENTS = \
+   $(NULL)
+ endif
  
  ifdef ENABLE_TESTS
  DIRS += test
  endif
  
  include $(topsrcdir)/config/rules.mk
- 
- EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
 +
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
@@ -168,7 +168,7 @@
  #include "AndroidBridge.h"
  #endif
  
-@@ -2192,16 +2196,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2203,16 +2207,25 @@ nsDownload::SetState(DownloadState aStat
        nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
  
        // Master pref to control this function.
@@ -194,7 +194,7 @@
          PRInt64 goat = PR_Now() - mStartTime;
          showTaskbarAlert = goat > alertIntervalUSec;
  
-@@ -2225,19 +2238,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2236,19 +2249,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
@@ -2178,7 +2178,7 @@
 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
 --- a/toolkit/xre/Makefile.in
 +++ b/toolkit/xre/Makefile.in
-@@ -97,17 +97,18 @@ EXPORTS = nsWindowsDllInterceptor.h
+@@ -98,17 +98,18 @@ EXPORTS = nsWindowsDllInterceptor.h
  else
  ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
  CMMSRCS = nsNativeAppSupportCocoa.mm
@@ -3119,7 +3119,7 @@
  #include "nsXPIDLString.h"
  #include "nsIURL.h"
  #include "nsIFileStreams.h"
-@@ -1219,29 +1219,29 @@ nsresult nsOSHelperAppService::OSProtoco
+@@ -1191,29 +1191,29 @@ nsresult nsOSHelperAppService::OSProtoco
      ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':');
  
    if (action.isValid())
@@ -3151,7 +3151,7 @@
  
  nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile)
  {
-@@ -1327,17 +1327,17 @@ nsOSHelperAppService::GetFromExtension(c
+@@ -1299,17 +1299,17 @@ nsOSHelperAppService::GetFromExtension(c
                                           minorType,
                                           mime_types_description,
                                           PR_TRUE);
@@ -3170,7 +3170,7 @@
  
      rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
                                    majorType,
-@@ -1453,17 +1453,17 @@ nsOSHelperAppService::GetFromType(const 
+@@ -1425,17 +1425,17 @@ nsOSHelperAppService::GetFromType(const 
  #ifdef MOZ_WIDGET_GTK2
    nsMIMEInfoBase *gnomeInfo = nsnull;
    if (handler.IsEmpty()) {
@@ -3192,7 +3192,7 @@
 diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in
 --- a/widget/src/gtk2/Makefile.in
 +++ b/widget/src/gtk2/Makefile.in
-@@ -158,11 +158,14 @@ endif
+@@ -134,11 +134,14 @@ endif
  
  DEFINES		+= -DCAIRO_GFX
  
@@ -3246,7 +3246,7 @@
  #define MAX_PREVIEW_SIZE 180
  
  nsILocalFile *nsFilePicker::mPrevDisplayDirectory = nsnull;
-@@ -271,17 +273,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil
+@@ -282,17 +284,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil
    return nsBaseFilePicker::AppendFilters(aFilterMask);
  }
  
@@ -3267,7 +3267,7 @@
  
    mFilters.AppendElement(filter);
    mFilterNames.AppendElement(name);
-@@ -419,16 +423,19 @@ confirm_overwrite_file(GtkWidget *parent
+@@ -430,16 +434,19 @@ confirm_overwrite_file(GtkWidget *parent
    gtk_widget_destroy(dialog);
  
    return result;
@@ -3287,7 +3287,7 @@
    GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget);
  
    GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
-@@ -569,8 +576,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
+@@ -580,8 +587,234 @@ nsFilePicker::Show(PRInt16 *aReturn)
      *aReturn = nsIFilePicker::returnCancel;
      break;
    }
@@ -3690,7 +3690,7 @@
 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
 --- a/xpcom/io/Makefile.in
 +++ b/xpcom/io/Makefile.in
-@@ -192,17 +192,17 @@ include $(topsrcdir)/ipc/chromium/chromi
+@@ -190,17 +190,17 @@ include $(topsrcdir)/ipc/chromium/chromi
  DEFINES		+= -D_IMPL_NS_COM
  
  ifeq ($(OS_ARCH),Linux)