diff -r 937669e1c537 -r 20f8b5f0aea6 firefox-kde.patch
--- a/firefox-kde.patch	Tue Feb 21 20:51:21 2012 +0100
+++ b/firefox-kde.patch	Tue Feb 21 21:10:03 2012 +0100
@@ -1153,12 +1153,12 @@
  #endif
  
  #include "nsProfileMigrator.h"
- #if !defined(XP_OS2)
- #include "nsOperaProfileMigrator.h"
- #endif
  #if defined(XP_WIN) && !defined(__MINGW32__)
  #include "nsIEProfileMigrator.h"
-@@ -71,18 +71,16 @@ using namespace mozilla::browser;
+ #elif defined(XP_MACOSX)
+ #include "nsSafariProfileMigrator.h"
+ #endif
+@@ -68,18 +68,16 @@ using namespace mozilla::browser;
  
  /////////////////////////////////////////////////////////////////////////////
  
@@ -1171,13 +1171,13 @@
 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
  #endif
  
- #if !defined(XP_OS2)
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsOperaProfileMigrator)
- #endif
  NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator)
  #if defined(XP_WIN) && !defined(__MINGW32__)
  NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator)
-@@ -114,17 +112,17 @@ NS_DEFINE_NAMED_CID(NS_OPERAPROFILEMIGRA
+ #elif defined(XP_MACOSX)
+ NS_GENERIC_FACTORY_CONSTRUCTOR(nsSafariProfileMigrator)
+ #endif
+@@ -105,17 +103,17 @@ NS_DEFINE_NAMED_CID(NS_SAFARIPROFILEMIGR
  #endif
  NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID);
  
@@ -1199,7 +1199,7 @@
 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
-@@ -690,24 +690,42 @@ var gAdvancedPane = {
+@@ -697,24 +697,42 @@ var gAdvancedPane = {
      var brandBundle = document.getElementById("bundleBrand");
      var shellBundle = document.getElementById("bundleShell");
      var brandShortName = brandBundle.getString("brandShortName");
@@ -1246,7 +1246,7 @@
 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
-@@ -52,17 +52,18 @@ endif
+@@ -51,17 +51,18 @@ endif
  
  ifeq ($(OS_ARCH),WINNT)
  CPPSRCS = nsWindowsShellService.cpp
@@ -1702,7 +1702,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
-@@ -426,16 +426,17 @@
+@@ -440,16 +440,17 @@
  #endif
  #endif