--- a/mozilla-kde.patch	Wed Mar 17 23:38:40 2010 +0100
+++ b/mozilla-kde.patch	Thu Mar 18 06:45:36 2010 +0100
@@ -40,7 +40,7 @@
  #define SELECTED_SKIN_PREF   "general.skins.selectedSkin"
  
  static NS_DEFINE_CID(kCSSLoaderCID, NS_CSS_LOADER_CID);
-@@ -1607,16 +1608,17 @@ nsChromeRegistry::ProcessManifestBuffer(
+@@ -1608,16 +1609,17 @@ nsChromeRegistry::ProcessManifestBuffer(
  
    NS_NAMED_LITERAL_STRING(kPlatform, "platform");
    NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers");
@@ -58,7 +58,7 @@
    rv = io->GetProtocolHandler("resource", getter_AddRefs(ph));
    NS_ENSURE_SUCCESS(rv, rv);
    
-@@ -1650,35 +1652,39 @@ nsChromeRegistry::ProcessManifestBuffer(
+@@ -1651,35 +1653,39 @@ nsChromeRegistry::ProcessManifestBuffer(
        if (NS_SUCCEEDED(rv)) {
          CopyUTF8toUTF16(s, osTarget);
          ToLowerCase(osTarget);
@@ -98,7 +98,7 @@
  
    // outer loop tokenizes by newline
    while (nsnull != (token = nsCRT::strtok(newline, kNewlines, &newline))) {
-@@ -1712,41 +1718,43 @@ nsChromeRegistry::ProcessManifestBuffer(
+@@ -1713,41 +1719,43 @@ nsChromeRegistry::ProcessManifestBuffer(
  
        PRBool platform = PR_FALSE;
        PRBool xpcNativeWrappers = PR_TRUE;
@@ -143,7 +143,7 @@
        if (NS_FAILED(rv))
          continue;
  
-@@ -1797,38 +1805,40 @@ nsChromeRegistry::ProcessManifestBuffer(
+@@ -1798,38 +1806,40 @@ nsChromeRegistry::ProcessManifestBuffer(
        }
  
        EnsureLowerCase(package);
@@ -185,7 +185,7 @@
        if (NS_FAILED(rv))
          continue;
  
-@@ -1859,38 +1869,40 @@ nsChromeRegistry::ProcessManifestBuffer(
+@@ -1860,38 +1870,40 @@ nsChromeRegistry::ProcessManifestBuffer(
        }
  
        EnsureLowerCase(package);
@@ -227,7 +227,7 @@
        if (NS_FAILED(rv))
          continue;
  
-@@ -1923,38 +1935,40 @@ nsChromeRegistry::ProcessManifestBuffer(
+@@ -1924,38 +1936,40 @@ nsChromeRegistry::ProcessManifestBuffer(
                                "Warning: malformed chrome overlay instruction.");
          continue;
        }
@@ -269,7 +269,7 @@
        rv |= io->NewURI(nsDependentCString(overlay), nsnull, nsnull,
                         getter_AddRefs(overlayuri));
        if (NS_FAILED(rv)) {
-@@ -1979,38 +1993,40 @@ nsChromeRegistry::ProcessManifestBuffer(
+@@ -1980,38 +1994,40 @@ nsChromeRegistry::ProcessManifestBuffer(
                                "Warning: malformed chrome style instruction.");
          continue;
        }
@@ -311,7 +311,7 @@
        rv |= io->NewURI(nsDependentCString(overlay), nsnull, nsnull,
                         getter_AddRefs(overlayuri));
        if (NS_FAILED(rv))
-@@ -2039,38 +2055,40 @@ nsChromeRegistry::ProcessManifestBuffer(
+@@ -2040,38 +2056,40 @@ nsChromeRegistry::ProcessManifestBuffer(
                                "Warning: malformed chrome override instruction.");
          continue;
        }
@@ -353,7 +353,7 @@
        rv |= io->NewURI(nsDependentCString(resolved), nsnull, manifestURI,
                         getter_AddRefs(resolveduri));
        if (NS_FAILED(rv))
-@@ -2101,38 +2119,40 @@ nsChromeRegistry::ProcessManifestBuffer(
+@@ -2102,38 +2120,40 @@ nsChromeRegistry::ProcessManifestBuffer(
        }
  
        EnsureLowerCase(package);
@@ -2593,7 +2593,7 @@
  	content \
  	docshell \
  	dom \
-@@ -131,17 +133,17 @@ CMMSRCS = nsNativeAppSupportCocoa.mm
+@@ -132,17 +134,17 @@ CMMSRCS = nsNativeAppSupportCocoa.mm
  else
  ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
  CPPSRCS += nsNativeAppSupportOS2.cpp
@@ -3404,7 +3404,7 @@
 --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
 +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
 @@ -40,27 +40,30 @@
- #ifdef MOZ_PLATFORM_HILDON
+ #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
  #include <glib.h>
  #include <hildon-uri.h>
  #include <hildon-mime.h>
@@ -3428,7 +3428,7 @@
  {
 -  nsresult rv = nsGNOMERegistry::LoadURL(aURI);
 +  nsresult rv = nsCommonRegistry::LoadURL(aURI);
- #ifdef MOZ_PLATFORM_HILDON
+ #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
    if (NS_FAILED(rv)){
      HildonURIAction *action = hildon_uri_get_default_action(mType.get(), nsnull);
      if (action) {
@@ -3545,7 +3545,7 @@
    // Check the GConf registry for a protocol handler
 -  *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme);
 +  *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme);
- #ifdef MOZ_PLATFORM_HILDON
+ #ifdef MOZ_PLATFORM_MAEMO
    *aHandlerExists = nsMIMEInfoUnix::HandlerExists(aProtocolScheme);
  #endif
  #endif
@@ -3651,7 +3651,7 @@
  #include "nsAccessibilityHelper.h"
 +#include "nsKDEUtils.h"
  
- #ifdef MOZ_PLATFORM_HILDON
+ #ifdef MOZ_PLATFORM_MAEMO
  #include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h>
  #endif
  
@@ -3969,9 +3969,9 @@
  LOCAL_INCLUDES	= -I..
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
  
- ifdef MOZ_PLATFORM_HILDON
- CFLAGS          += $(MOZ_DBUS_GLIB_CFLAGS) $(LIBHILDONMIME_CFLAGS)
- CXXFLAGS        += $(MOZ_DBUS_GLIB_CFLAGS) $(LIBHILDONMIME_CFLAGS)
+ ifeq ($(MOZ_PLATFORM_MAEMO), 5)
+ CFLAGS          += $(MOZ_DBUS_GLIB_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS)
+ CXXFLAGS        += $(MOZ_DBUS_GLIB_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS)
  endif
  
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
@@ -3989,7 +3989,7 @@
 +#include "nsKDEUtils.h"
  #endif
  
- #ifdef MOZ_PLATFORM_HILDON
+ #if (MOZ_PLATFORM_MAEMO == 5)
  #include <glib.h>
  #include <hildon-uri.h>
  #include <hildon-mime.h>