diff -r d51f3999a1c2 -r 3c0dff7ca9c4 firefox-kde.patch
--- a/firefox-kde.patch	Thu Jul 07 08:00:10 2011 +0200
+++ b/firefox-kde.patch	Fri Jul 08 08:21:23 2011 +0200
@@ -1105,7 +1105,7 @@
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -22,16 +22,18 @@ browser.jar:
+@@ -21,16 +21,18 @@ browser.jar:
  *       content/browser/aboutHome.css                 (content/aboutHome.css)
          content/browser/aboutHome-restore-icon.png    (content/aboutHome-restore-icon.png)
          content/browser/aboutHome-restore-icon-small.png    (content/aboutHome-restore-icon-small.png)
@@ -1119,11 +1119,11 @@
  *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
  *       content/browser/fullscreen-video.xhtml        (content/fullscreen-video.xhtml)
  *       content/browser/inspector.html                (content/inspector.html)
+ *       content/browser/scratchpad.xul                (content/scratchpad.xul)
+ *       content/browser/scratchpad.js                 (content/scratchpad.js)
  *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
  *       content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
  *       content/browser/pageinfo/pageInfo.css         (content/pageinfo/pageInfo.css)
- *       content/browser/pageinfo/pageInfo.xml         (content/pageinfo/pageInfo.xml)
- *       content/browser/pageinfo/feeds.js             (content/pageinfo/feeds.js)
 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
 --- a/browser/components/build/nsModule.cpp
 +++ b/browser/components/build/nsModule.cpp
@@ -1140,13 +1140,13 @@
 +#include "nsUnixShellService.h"
  #endif
  
- #ifndef WINCE
- 
  #include "nsProfileMigrator.h"
- #include "nsDogbertProfileMigrator.h"
  #if !defined(XP_OS2)
  #include "nsOperaProfileMigrator.h"
-@@ -82,18 +82,16 @@ using namespace mozilla::browser;
+ #endif
+ #include "nsSeamonkeyProfileMigrator.h"
+ #if defined(XP_WIN) && !defined(__MINGW32__)
+@@ -72,18 +72,16 @@ using namespace mozilla::browser;
  
  /////////////////////////////////////////////////////////////////////////////
  
@@ -1159,14 +1159,14 @@
 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
  #endif
  
- #ifndef WINCE
- 
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator)
  #if !defined(XP_OS2)
  NS_GENERIC_FACTORY_CONSTRUCTOR(nsOperaProfileMigrator)
  #endif
-@@ -145,17 +143,17 @@ NS_DEFINE_NAMED_CID(NS_SEAMONKEYPROFILEM
- #endif /* WINCE */
+ NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator)
+ NS_GENERIC_FACTORY_CONSTRUCTOR(nsSeamonkeyProfileMigrator)
+ #if defined(XP_WIN) && !defined(__MINGW32__)
+@@ -117,17 +115,17 @@ NS_DEFINE_NAMED_CID(NS_OPERAPROFILEMIGRA
+ NS_DEFINE_NAMED_CID(NS_SEAMONKEYPROFILEMIGRATOR_CID);
  NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID);
  
  static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
@@ -1179,11 +1179,11 @@
  #endif
      { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor },
      { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create },
- #ifndef WINCE
      { &kNS_FIREFOX_PROFILEMIGRATOR_CID, false, NULL, nsProfileMigratorConstructor },
  #if defined(XP_WIN) && !defined(__MINGW32__)
      { &kNS_WINIEPROFILEMIGRATOR_CID, false, NULL, nsIEProfileMigratorConstructor },
  #elif defined(XP_MACOSX)
+     { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor },
 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
 --- a/browser/components/preferences/advanced.js
 +++ b/browser/components/preferences/advanced.js
@@ -1236,7 +1236,7 @@
 +++ b/browser/components/shell/src/Makefile.in
 @@ -52,17 +52,18 @@ endif
  
- ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))
+ ifeq ($(OS_ARCH),WINNT)
  CPPSRCS = nsWindowsShellService.cpp
  else
  ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
@@ -1626,7 +1626,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
-@@ -442,16 +442,17 @@
+@@ -435,16 +435,17 @@
  #endif
  #endif