diff -r df9c4a6e84f8 -r 7d934b2f5014 firefox-kde.patch
--- a/firefox-kde.patch	Wed Apr 25 13:47:56 2012 +0200
+++ b/firefox-kde.patch	Sat Apr 28 23:20:28 2012 +0200
@@ -1158,12 +1158,12 @@
  #endif
  
  #if defined(XP_WIN) && !defined(__MINGW32__)
- #include "nsIEProfileMigrator.h"
- #elif defined(XP_MACOSX)
- #include "nsSafariProfileMigrator.h"
+ #include "nsIEHistoryEnumerator.h"
  #endif
  
-@@ -67,18 +67,16 @@ using namespace mozilla::browser;
+ #include "rdf.h"
+ #include "nsFeedSniffer.h"
+@@ -65,18 +65,16 @@ using namespace mozilla::browser;
  
  /////////////////////////////////////////////////////////////////////////////
  
@@ -1177,12 +1177,12 @@
  #endif
  
  #if defined(XP_WIN) && !defined(__MINGW32__)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator)
- #elif defined(XP_MACOSX)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsSafariProfileMigrator)
+ NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator)
  #endif
  
-@@ -102,17 +100,17 @@ NS_DEFINE_NAMED_CID(NS_SAFARIPROFILEMIGR
+ NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
+ 
+@@ -97,17 +95,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID)
  #endif
  NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID);
  
@@ -1197,10 +1197,10 @@
      { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor },
      { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create },
  #if defined(XP_WIN) && !defined(__MINGW32__)
-     { &kNS_WINIEPROFILEMIGRATOR_CID, false, NULL, nsIEProfileMigratorConstructor },
+     { &kNS_WINIEHISTORYENUMERATOR_CID, false, NULL, nsIEHistoryEnumeratorConstructor },
  #elif defined(XP_MACOSX)
      { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor },
-     { &kNS_SAFARIPROFILEMIGRATOR_CID, false, NULL, nsSafariProfileMigratorConstructor },
+ #endif
 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
@@ -1714,7 +1714,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
-@@ -467,16 +467,17 @@
+@@ -495,16 +495,17 @@
  #endif
  #endif