diff -r bf541a540a74 -r 3cc9f17ca9bb mozilla-kde.patch
--- a/mozilla-kde.patch	Sat Jul 30 10:49:37 2016 +0200
+++ b/mozilla-kde.patch	Mon Aug 01 14:45:11 2016 +0200
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  d153e2141b97a77b90ba0b9befe2d80330dcd472
+# Parent  972c67cdd5dd4463abbee60036b686d4cb78e616
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@@ -27,7 +27,7 @@
  #include "prefread.h"
  #include "prefapi_private_data.h"
  
-@@ -1138,16 +1139,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
+@@ -1145,16 +1146,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
  
  static nsresult pref_LoadPrefsInDirList(const char *listId)
  {
@@ -62,7 +62,7 @@
      return NS_OK;
  
    bool hasMore;
-@@ -1163,17 +1182,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1170,17 +1189,17 @@ static nsresult pref_LoadPrefsInDirList(
  
      nsAutoCString leaf;
      path->GetNativeLeafName(leaf);
@@ -81,7 +81,7 @@
  {
    nsZipItemPtr<char> manifest(jarReader, name, true);
    NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1267,24 +1286,36 @@ static nsresult pref_InitInitialObjects(
+@@ -1274,24 +1293,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_MACOSX)
@@ -187,7 +187,7 @@
 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
 --- a/toolkit/components/downloads/moz.build
 +++ b/toolkit/components/downloads/moz.build
-@@ -64,15 +64,16 @@ if not CONFIG['MOZ_SUITE']:
+@@ -60,15 +60,16 @@ if not CONFIG['MOZ_SUITE']:
          'nsDownloadManagerUI.js',
          'nsDownloadManagerUI.manifest',
      ]
@@ -2296,7 +2296,7 @@
          'nsNativeAppSupportQt.cpp',
          'nsQAppInstance.cpp',
      ]
- elif CONFIG['MOZ_ENABLE_GTK']:
+ elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
 +    EXPORTS += ['nsKDEUtils.h']
      UNIFIED_SOURCES += [
 +        'nsKDEUtils.cpp',
@@ -2715,11 +2715,11 @@
          osdir + '/nsOSHelperAppService.cpp',
      ]
  
- if CONFIG['MOZ_ENABLE_GTK']:
+ if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
      UNIFIED_SOURCES += [
 +        'unix/nsCommonRegistry.cpp',
          'unix/nsGNOMERegistry.cpp',
-+	'unix/nsKDERegistry.cpp',
++        'unix/nsKDERegistry.cpp',
          'unix/nsMIMEInfoUnix.cpp',
      ]
  elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
@@ -3164,7 +3164,7 @@
 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
 --- a/widget/gtk/moz.build
 +++ b/widget/gtk/moz.build
-@@ -86,16 +86,17 @@ else:
+@@ -90,16 +90,17 @@ else:
  include('/ipc/chromium/chromium-config.mozbuild')
  
  FINAL_LIBRARY = 'xul'
@@ -3684,7 +3684,7 @@
 +    '/toolkit/xre'
  ]
  
- if CONFIG['MOZ_WIDGET_GTK']:
+ if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
      CXXFLAGS += CONFIG['TK_CFLAGS']
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp