--- a/firefox-kde.patch	Mon Jun 17 22:57:16 2013 +0200
+++ b/firefox-kde.patch	Tue Jul 16 12:35:11 2013 +0200
@@ -1214,11 +1214,11 @@
 +*       content/browser/browser-kde.xul               (content/browser-kde.xul)
 +%       override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
  *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
+ *       content/browser/chatWindow.xul                (content/chatWindow.xul)
          content/browser/content.js                    (content/content.js)
          content/browser/newtab/newTab.xul             (content/newtab/newTab.xul)
  *       content/browser/newtab/newTab.js              (content/newtab/newTab.js)
          content/browser/newtab/newTab.css             (content/newtab/newTab.css)
-         content/browser/newtab/preload.xhtml          (content/newtab/preload.xhtml)
  *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
          content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
@@ -1232,7 +1232,7 @@
  #include "nsWindowsShellService.h"
  #elif defined(XP_MACOSX)
  #include "nsMacShellService.h"
- #elif defined(MOZ_WIDGET_GTK2)
+ #elif defined(MOZ_WIDGET_GTK)
 -#include "nsGNOMEShellService.h"
 +#include "nsUnixShellService.h"
  #endif
@@ -1252,7 +1252,7 @@
  NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService)
  #elif defined(XP_MACOSX)
  NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
--#elif defined(MOZ_WIDGET_GTK2)
+-#elif defined(MOZ_WIDGET_GTK)
 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
  #endif
  
@@ -1270,7 +1270,7 @@
      { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor },
  #if defined(XP_WIN)
      { &kNS_SHELLSERVICE_CID, false, NULL, nsWindowsShellServiceConstructor },
- #elif defined(MOZ_WIDGET_GTK2)
+ #elif defined(MOZ_WIDGET_GTK)
 -    { &kNS_SHELLSERVICE_CID, false, NULL, nsGNOMEShellServiceConstructor },
 +    { &kNS_SHELLSERVICE_CID, false, NULL, nsUnixShellServiceConstructor },
  #endif
@@ -1307,7 +1307,7 @@
      // when the user will select the default.  We refresh here periodically
      // in case the default changes.  On other Windows OS's defaults can also
      // be set while the prefs are open.
-@@ -797,14 +803,25 @@ var gAdvancedPane = {
+@@ -857,14 +863,25 @@ var gAdvancedPane = {
     * Set browser as the operating system default browser.
     */
    setDefaultBrowser: function()
@@ -1336,26 +1336,42 @@
 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
-@@ -15,17 +15,18 @@ USE_STATIC_LIBS = 1
+@@ -17,10 +17,12 @@ DISABLED_EXTRA_COMPONENTS = nsSetDefault
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+ DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\" \
+   -DMOZ_APP_VERSION=\"$(MOZ_APP_VERSION)\"
+ 
+ CXXFLAGS += $(TK_CFLAGS)
  
- ifeq ($(OS_ARCH),WINNT)
- CPPSRCS = nsWindowsShellService.cpp
- else
- ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
- CPPSRCS = nsMacShellService.cpp
- else
- ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
--CPPSRCS = nsGNOMEShellService.cpp
-+CPPSRCS = nsUnixShellService.cpp nsGNOMEShellService.cpp nsKDEShellService.cpp
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
- endif
- endif
- endif
++
+ clobber::
+ 	rm -f $(DIST)/lib/$(LIBRARY_NAME).lib
+diff --git a/browser/components/shell/src/moz.build b/browser/components/shell/src/moz.build
+--- a/browser/components/shell/src/moz.build
++++ b/browser/components/shell/src/moz.build
+@@ -11,17 +11,19 @@ if CONFIG['OS_ARCH'] == 'WINNT':
+         'nsWindowsShellService.cpp',
+     ]
+ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+     CPP_SOURCES += [
+         'nsMacShellService.cpp',
+     ]
+ elif CONFIG['MOZ_WIDGET_GTK']:
+     CPP_SOURCES += [
++        'nsUnixShellService.cpp',
+         'nsGNOMEShellService.cpp',
++	'nsKDEShellService.cpp'
+     ]
  
- ifdef CPPSRCS
- LIBRARY_NAME = shellservice_s
- endif
+ if CPP_SOURCES:
+     LIBRARY_NAME = 'shellservice_s'
  
+ EXTRA_COMPONENTS += [
+     'nsSetDefaultBrowser.js',
+     'nsSetDefaultBrowser.manifest',
 diff --git a/browser/components/shell/src/nsKDEShellService.cpp b/browser/components/shell/src/nsKDEShellService.cpp
 new file mode 100644
 --- /dev/null
@@ -1769,7 +1785,7 @@
 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
-@@ -604,19 +604,21 @@
+@@ -601,19 +601,21 @@
  @BINPATH@/defaults/autoconfig/prefcalls.js
  @BINPATH@/browser/defaults/profile/prefs.js