OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=239

MozillaThunderbird.spec

@@ -82,9 +82,9 @@ Patch3:         mozilla-nongnome-proxies.patch
 Patch4:         mozilla-kde.patch
 Patch5:         mozilla-arm-disable-edsp.patch
 Patch7:         mozilla-ppc.patch
-Patch8:         mozilla-libffi-ppc64le.patch
+Patch8:         libffi-ppc64le.patch
-Patch9:         mozilla-xpcom-ppc64le.patch
+Patch9:         xpcom-ppc64le.patch
-Patch10:        mozilla-ppc64le.patch
+Patch10:        ppc64le-support.patch
 # Thunderbird/mail
 Patch20:        tb-ssldap.patch
 Patch21:        tb-develdirs.patch

mozilla-arm-disable-edsp.patch

@@ -1,13 +1,13 @@
 # HG changeset patch
 # User Adrian Schröter <adrian@suse.de>
-# Parent b945e0c3b145b6b2245f42bab52f911c2d1f6759
+# Parent 5b26dbfe65bd4986ea3792f02bc025fec293b51f
 disable ESDP support (no BNC or BMO reference yet :-()
 
-diff --git a/mozglue/build/arm.h b/mozglue/build/arm.h
+diff --git a/xpcom/glue/arm.h b/xpcom/glue/arm.h
---- a/mozglue/build/arm.h
+--- a/xpcom/glue/arm.h
-+++ b/mozglue/build/arm.h
++++ b/xpcom/glue/arm.h
-@@ -116,17 +116,17 @@ namespace mozilla {
+@@ -143,17 +143,17 @@ namespace mozilla {
-     extern bool MFBT_DATA neon_enabled;
+     extern bool NS_COM_GLUE neon_enabled;
  #endif
  #endif
    }

mozilla-kde.patch

@@ -7,7 +7,7 @@ Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
 diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
 --- a/modules/libpref/src/Makefile.in
 +++ b/modules/libpref/src/Makefile.in
-@@ -33,14 +33,15 @@ endif
+@@ -49,14 +49,15 @@ endif
  # Optimizer bug with GCC 3.2.2 on OS/2
  ifeq ($(OS_ARCH), OS2)
  nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp
@@ -26,7 +26,8 @@ diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
 diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp
 --- a/modules/libpref/src/Preferences.cpp
 +++ b/modules/libpref/src/Preferences.cpp
-@@ -27,16 +27,17 @@
+@@ -23,16 +23,17 @@
+ #include "nsIStringEnumerator.h"
  #include "nsIZipReader.h"
  #include "nsPrefBranch.h"
  #include "nsXPIDLString.h"
@@ -34,7 +35,6 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
  #include "nsCOMArray.h"
  #include "nsXPCOMCID.h"
  #include "nsAutoPtr.h"
- #include "nsPrintfCString.h"
 +#include "nsKDEUtils.h"
  
  #include "nsQuickSort.h"
@@ -44,7 +44,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
  #include "prefread.h"
  #include "prefapi_private_data.h"
  
-@@ -1100,16 +1101,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
+@@ -972,16 +973,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
  
  static nsresult pref_LoadPrefsInDirList(const char *listId)
  {
@@ -79,7 +79,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
      return NS_OK;
  
    bool hasMore;
-@@ -1125,17 +1144,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -997,17 +1016,17 @@ static nsresult pref_LoadPrefsInDirList(
  
      nsAutoCString leaf;
      path->GetNativeLeafName(leaf);
@@ -98,7 +98,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
  {
    nsZipItemPtr<char> manifest(jarReader, name, true);
    NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1229,28 +1248,40 @@ static nsresult pref_InitInitialObjects(
+@@ -1101,28 +1120,40 @@ static nsresult pref_InitInitialObjects(
    /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
    static const char* specialFiles[] = {
  #if defined(XP_MACOSX)
@@ -184,24 +184,25 @@ diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpac
 diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in
 --- a/toolkit/components/downloads/Makefile.in
 +++ b/toolkit/components/downloads/Makefile.in
-@@ -4,9 +4,10 @@
+@@ -23,9 +23,11 @@ ifndef MOZ_SUITE
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ DISABLED_EXTRA_COMPONENTS = \
+   nsDownloadManagerUI.js \
+   nsDownloadManagerUI.manifest \
+   $(NULL)
+ endif
  
  include $(topsrcdir)/config/rules.mk
  
- CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI
++LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
- 
++
- LOCAL_INCLUDES += \
+ CXXFLAGS += $(TK_CFLAGS)
-   -I$(srcdir)/../protobuf \
-+  -I$(topsrcdir)/toolkit/xre \
-   $(NULL)
 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
 --- a/toolkit/components/downloads/nsDownloadManager.cpp
 +++ b/toolkit/components/downloads/nsDownloadManager.cpp
-@@ -41,16 +41,20 @@
+@@ -38,16 +38,20 @@
+ 
  #ifdef XP_WIN
  #include <shlobj.h>
- #include "nsWindowsHelpers.h"
  #ifdef DOWNLOAD_SCANNER
  #include "nsDownloadScanner.h"
  #endif
@@ -219,7 +220,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
  #include "AndroidBridge.h"
  #endif
  
-@@ -2686,16 +2690,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2609,16 +2613,25 @@ nsDownload::SetState(DownloadState aStat
        nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
  
        // Master pref to control this function.
@@ -245,7 +246,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
          int64_t goat = PR_Now() - mStartTime;
          showTaskbarAlert = goat > alertIntervalUSec;
  
-@@ -2722,19 +2735,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2645,19 +2658,20 @@ nsDownload::SetState(DownloadState aStat
                // retention policy, there's no reason to make the text clickable
                // because if it is, they'll click open the download manager and
                // the items they downloaded will have been removed.
@@ -260,7 +261,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
        }
 +      }
  
- #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GTK)
+ #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GTK2)
        nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget);
        nsCOMPtr<nsIFile> file;
        nsAutoString path;
@@ -270,7 +271,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
-@@ -53,29 +53,33 @@ toolkit.jar:
+@@ -50,29 +50,33 @@ toolkit.jar:
     content/global/viewZoomOverlay.js          (viewZoomOverlay.js)
  *+ content/global/bindings/autocomplete.xml    (widgets/autocomplete.xml)
     content/global/bindings/browser.xml         (widgets/browser.xml)
@@ -764,7 +765,7 @@ diff --git a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widge
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/content/widgets/preferences-kde.xml
-@@ -0,0 +1,1332 @@
+@@ -0,0 +1,1339 @@
 +<?xml version="1.0"?>
 +
 +<!DOCTYPE bindings [
@@ -1358,7 +1359,6 @@ new file mode 100644
 +	<xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
 +	<xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
 +	<xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
-+	
 +#else
 +                pack="end">
 +        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
@@ -1507,7 +1507,7 @@ new file mode 100644
 +
 +          this._selector.selectedItem = document.getAnonymousElementByAttribute(this, "pane", aPaneElement.id);
 +          if (!aPaneElement.loaded) {
-+            let OverlayLoadObserver = function(aPane)
++            function OverlayLoadObserver(aPane)
 +            {
 +              this._pane = aPane;
 +            }
@@ -2069,8 +2069,7 @@ new file mode 100644
 +    </handlers>
 +  </binding>
 +          
-+  <binding id="panebutton" role="xul:listitem"
++  <binding id="panebutton" extends="chrome://global/content/bindings/radio.xml#radio">
-+           extends="chrome://global/content/bindings/radio.xml#radio">
 +    <resources>
 +      <stylesheet src="chrome://global/skin/preferences.css"/>
 +    </resources>
@@ -2078,6 +2077,15 @@ new file mode 100644
 +      <xul:image class="paneButtonIcon" xbl:inherits="src"/>
 +      <xul:label class="paneButtonLabel" xbl:inherits="value=label"/>
 +    </content>
++    <implementation implements="nsIAccessible">
++      <property name="accessibleType" readonly="true">
++        <getter>
++          <![CDATA[
++            return Components.interfaces.nsIAccessibleProvider.XULListitem;
++          ]]>
++        </getter>
++      </property>
++    </implementation>
 +  </binding>
 +
 +</bindings>
@@ -2117,9 +2125,9 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
    NS_DECL_ISUPPORTS
    NS_DECL_NSISYSTEMPROXYSETTINGS
  
-   nsUnixSystemProxySettings()
+   nsUnixSystemProxySettings() {}
-     : mSchemeProxySettings(5)
+   nsresult Init();
-@@ -38,16 +40,17 @@ private:
+@@ -35,16 +37,17 @@ private:
    nsCOMPtr<nsIGSettingsService> mGSettings;
    nsCOMPtr<nsIGSettingsCollection> mProxySettings;
    nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings;
@@ -2137,7 +2145,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
  nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)
  {
    // dbus prevents us from being threadsafe, but this routine should not block anyhow
-@@ -504,16 +507,19 @@ nsUnixSystemProxySettings::GetProxyFromG
+@@ -496,16 +499,19 @@ nsUnixSystemProxySettings::GetProxyFromG
  
  nsresult
  nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec,
@@ -2157,7 +2165,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
    if (mGConf)
      return GetProxyFromGConf(aScheme, aHost, aPort, aResult);
  
-@@ -539,8 +545,34 @@ static const mozilla::Module::ContractID
+@@ -531,8 +537,34 @@ static const mozilla::Module::ContractID
  
  static const mozilla::Module kUnixProxyModule = {
    mozilla::Module::kVersion,
@@ -2195,28 +2203,27 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
 diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
 --- a/toolkit/xre/moz.build
 +++ b/toolkit/xre/moz.build
-@@ -43,18 +43,20 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
+@@ -38,18 +38,20 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
          'nsNativeAppSupportQt.cpp',
          'nsQAppInstance.cpp',
      ]
  elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
-     SOURCES += [
+     CPP_SOURCES += [
          'nsNativeAppSupportOS2.cpp',
      ]
  elif CONFIG['MOZ_ENABLE_GTK']:
 +    EXPORTS += ['nsKDEUtils.h']
-     SOURCES += [
+     CPP_SOURCES += [
--        'nsNativeAppSupportUnix.cpp',
+         'nsNativeAppSupportUnix.cpp',
-+        'nsKDEUtils.cpp',
++	'nsKDEUtils.cpp'
-+        'nsNativeAppSupportUnix.cpp'
      ]
  else:
-     SOURCES += [
+     CPP_SOURCES += [
          'nsNativeAppSupportDefault.cpp',
      ]
  
  if CONFIG['MOZ_X11']:
-     SOURCES += [
+     CPP_SOURCES += [
 diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp
 new file mode 100644
 --- /dev/null
@@ -2617,11 +2624,11 @@ new file mode 100644
 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
 --- a/uriloader/exthandler/Makefile.in
 +++ b/uriloader/exthandler/Makefile.in
-@@ -44,9 +44,10 @@ endif
+@@ -86,9 +86,10 @@ EXTRA_COMPONENTS = \
- ifdef MOZ_ENABLE_DBUS
+ # we don't want the shared lib, but we want to force the creation of a static lib.
- LOCAL_INCLUDES   += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS)
+ FORCE_STATIC_LIB = 1
- endif
+ include $(topsrcdir)/config/config.mk
- 
+ include $(topsrcdir)/ipc/chromium/chromium-config.mk
  include $(topsrcdir)/config/rules.mk
  
  ifneq (,$(filter qt gtk2 gtk3, $(MOZ_WIDGET_TOOLKIT)))
@@ -2631,26 +2638,25 @@ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
 --- a/uriloader/exthandler/moz.build
 +++ b/uriloader/exthandler/moz.build
-@@ -73,17 +73,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
+@@ -68,16 +68,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
-     ]
+     pass
  else:
-     SOURCES += [
+     CPP_SOURCES += [
-         osdir + '/nsOSHelperAppService.cpp',
+         'nsOSHelperAppService.cpp',
      ]
  
  if CONFIG['MOZ_ENABLE_GTK']:
-     SOURCES += [
+     CPP_SOURCES += [
-+        'unix/nsCommonRegistry.cpp',
++        'nsCommonRegistry.cpp',
-         'unix/nsGNOMERegistry.cpp',
++	'nsKDERegistry.cpp',
-+        'unix/nsKDERegistry.cpp',
+         'nsGNOMERegistry.cpp',
-         'unix/nsMIMEInfoUnix.cpp',
+         'nsMIMEInfoUnix.cpp',
      ]
  elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-     SOURCES += [
+     CPP_SOURCES += [
-         'android/nsAndroidHandlerApp.cpp',
+         'nsMIMEInfoAndroid.cpp',
-         'android/nsExternalSharingAppService.cpp',
+         'nsAndroidHandlerApp.cpp',
-         'android/nsExternalURLHandlerService.cpp',
+         'nsExternalSharingAppService.cpp',
-         'android/nsMIMEInfoAndroid.cpp',
 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp
 new file mode 100644
 --- /dev/null
@@ -2868,7 +2874,7 @@ new file mode 100644
 diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
 --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
 +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
-@@ -10,30 +10,33 @@
+@@ -16,30 +16,33 @@
  #include <QString>
  #if (MOZ_ENABLE_CONTENTACTION)
  #include <contentaction/contentaction.h>
@@ -2897,14 +2903,14 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
 -  nsresult rv = nsGNOMERegistry::LoadURL(aURI);
 +  nsresult rv = nsCommonRegistry::LoadURL(aURI);
  
- #ifdef MOZ_WIDGET_QT
+ #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
-   if (NS_FAILED(rv)) {
+   if (NS_FAILED(rv)){
+     HildonURIAction *action = hildon_uri_get_default_action(mSchemeOrType.get(), nullptr);
+     if (action) {
        nsAutoCString spec;
        aURI->GetAsciiSpec(spec);
-     if (QDesktopServices::openUrl(QUrl(spec.get()))) {
+       if (hildon_uri_open(spec.get(), action, nullptr))
-       rv = NS_OK;
+@@ -67,22 +70,22 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo
-     }
-@@ -48,22 +51,22 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo
  {
    // if mDefaultApplication is set, it means the application has been set from
    // either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to
@@ -2929,7 +2935,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
    if (*_retval)
      return NS_OK;
  
-@@ -97,16 +100,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -130,16 +133,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
      ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get()));
    if (action.isValid()) {
      action.trigger();
@@ -2963,7 +2969,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler
      nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
      NS_ENSURE_SUCCESS(rv, rv);
      nsCOMPtr<nsIURI> uri;
-@@ -124,17 +144,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -157,17 +177,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
      /* Fallback to GnomeVFS */
      nsCOMPtr<nsIGnomeVFSMimeApp> app;
      if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app)
@@ -3004,7 +3010,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
  #include "nsXPIDLString.h"
  #include "nsIURL.h"
  #include "nsIFileStreams.h"
-@@ -1157,26 +1157,26 @@ nsresult nsOSHelperAppService::OSProtoco
+@@ -1157,29 +1157,29 @@ nsresult nsOSHelperAppService::OSProtoco
      ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':');
  
    if (action.isValid())
@@ -3015,6 +3021,9 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
    // Check the GConf registry for a protocol handler
 -  *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme);
 +  *aHandlerExists = nsCommonRegistry::HandlerExists(aProtocolScheme);
+ #if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
+   *aHandlerExists = nsMIMEInfoUnix::HandlerExists(aProtocolScheme);
+ #endif
  #endif
  
    return NS_OK;
@@ -3033,7 +3042,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
  
  nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile)
  {
-@@ -1263,17 +1263,17 @@ nsOSHelperAppService::GetFromExtension(c
+@@ -1266,17 +1266,17 @@ nsOSHelperAppService::GetFromExtension(c
                                           mime_types_description,
                                           true);
  
@@ -3052,7 +3061,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
  
      rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
                                    majorType,
-@@ -1386,17 +1386,17 @@ nsOSHelperAppService::GetFromType(const 
+@@ -1389,17 +1389,17 @@ nsOSHelperAppService::GetFromType(const 
  #ifdef MOZ_WIDGET_GTK
    nsRefPtr<nsMIMEInfoBase> gnomeInfo;
    if (handler.IsEmpty()) {
@@ -3071,10 +3080,10 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
  #endif
  
    // Now look up our extensions
-diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in
+diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
---- a/widget/gtk/Makefile.in
+--- a/widget/gtk2/Makefile.in
-+++ b/widget/gtk/Makefile.in
++++ b/widget/gtk2/Makefile.in
-@@ -26,11 +26,14 @@ DEFINES		+= -DCAIRO_GFX -DMOZ_APP_NAME='
+@@ -67,11 +67,14 @@ DEFINES		+= -DCAIRO_GFX -DMOZ_APP_NAME='
  
  INCLUDES	+= \
  		-I$(srcdir)/../xpwidgets \
@@ -3089,10 +3098,10 @@ diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in
  ifdef MOZ_X11
  INCLUDES   	+= -I$(srcdir)/../shared/x11
  endif
-diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
+diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
---- a/widget/gtk/nsFilePicker.cpp
+--- a/widget/gtk2/nsFilePicker.cpp
-+++ b/widget/gtk/nsFilePicker.cpp
++++ b/widget/gtk2/nsFilePicker.cpp
-@@ -1,32 +1,34 @@
+@@ -1,31 +1,33 @@
  /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
  /* This Source Code Form is subject to the terms of the Mozilla Public
   * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -3103,7 +3112,6 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
  #include <gtk/gtk.h>
 +#include <gdk/gdkx.h>
  
- #include "nsGtkUtils.h"
  #include "nsIFileURL.h"
  #include "nsIURI.h"
  #include "nsIWidget.h"
@@ -3120,14 +3128,14 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
  #include "nsFilePicker.h"
 +#include "nsKDEUtils.h"
  
+ #if (MOZ_PLATFORM_MAEMO == 5)
+ #include <hildon-fm-2/hildon/hildon-file-chooser-dialog.h>
+ #endif
+ 
  using namespace mozilla;
  
  #define MAX_PREVIEW_SIZE 180
- 
+@@ -242,17 +244,19 @@ nsFilePicker::AppendFilters(int32_t aFil
- nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr;
- 
- void
-@@ -226,17 +228,19 @@ nsFilePicker::AppendFilters(int32_t aFil
    return nsBaseFilePicker::AppendFilters(aFilterMask);
  }
  
@@ -3148,7 +3156,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
  
    mFilters.AppendElement(filter);
    mFilterNames.AppendElement(name);
-@@ -350,16 +354,32 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -366,16 +370,32 @@ nsFilePicker::Show(int16_t *aReturn)
  
  NS_IMETHODIMP
  nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
@@ -3181,7 +3189,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
  
    GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
    const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-@@ -538,8 +558,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -567,8 +587,235 @@ nsFilePicker::Done(GtkWidget* file_choos
    if (mCallback) {
      mCallback->Done(result);
      mCallback = nullptr;
@@ -3417,10 +3425,10 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
 +    return NS_OK;
 +    }
 +
-diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h
+diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h
---- a/widget/gtk/nsFilePicker.h
+--- a/widget/gtk2/nsFilePicker.h
-+++ b/widget/gtk/nsFilePicker.h
++++ b/widget/gtk2/nsFilePicker.h
-@@ -66,11 +66,17 @@ protected:
+@@ -67,11 +67,17 @@ protected:
    nsString  mDefault;
    nsString  mDefaultExtension;
  
@@ -3441,13 +3449,13 @@ diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h
 diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
 --- a/xpcom/components/Makefile.in
 +++ b/xpcom/components/Makefile.in
-@@ -14,9 +14,10 @@ LOCAL_INCLUDES	= \
+@@ -28,9 +28,10 @@ LOCAL_INCLUDES	= \
- 	-I$(topsrcdir)/chrome/src \
+ FORCE_STATIC_LIB = 1
- 	-I$(topsrcdir)/modules/libjar \
- 	$(NULL)
  
  include $(topsrcdir)/config/rules.mk
  
+ DEFINES	+= -D_IMPL_NS_COM
+ 
  ifdef MOZ_WIDGET_GTK
  CXXFLAGS        += $(TK_CFLAGS)
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
@@ -3549,7 +3557,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
      bool contentAccessible = false;
 +    TriState stDesktop = eUnspecified;
  
-     while (nullptr != (token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) && ok) {
+     while (NULL != (token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) && ok) {
        ToLowerCase(token);
        NS_ConvertASCIItoUTF16 wtoken(token);
  
@@ -3586,8 +3594,8 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
 diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
 --- a/xpcom/io/Makefile.in
 +++ b/xpcom/io/Makefile.in
-@@ -6,9 +6,9 @@ MOZILLA_INTERNAL_API = 1
+@@ -43,17 +43,17 @@ include $(topsrcdir)/ipc/chromium/chromi
- include $(topsrcdir)/config/rules.mk
+ DEFINES		+= -D_IMPL_NS_COM
  
  ifeq ($(OS_ARCH),Linux)
  ifneq (,$(findstring lib64,$(libdir)))
@@ -3597,14 +3605,22 @@ diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
  
 -LOCAL_INCLUDES	+= -I..
 +LOCAL_INCLUDES	+= -I.. -I$(topsrcdir)/toolkit/xre
+ 
+ ifeq ($(MOZ_PLATFORM_MAEMO),5)
+ CFLAGS          += $(MOZ_DBUS_CFLAGS)
+ CXXFLAGS        += $(MOZ_DBUS_CFLAGS)
+ endif
+ 
+ ifdef MOZ_PLATFORM_MAEMO
+ CFLAGS          += $(MOZ_PLATFORM_MAEMO_CFLAGS) $(MOZ_QT_CFLAGS)
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -43,16 +43,17 @@
+@@ -50,16 +50,17 @@
+ #include "prproces.h"
  #include "nsIDirectoryEnumerator.h"
  #include "nsISimpleEnumerator.h"
  #include "private/pprio.h"
- #include "prlink.h"
  
  #ifdef MOZ_WIDGET_GTK
  #include "nsIGIOService.h"
@@ -3618,7 +3634,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
  #include "prmem.h"
  #include "plbase64.h"
  
-@@ -1728,44 +1729,51 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1753,44 +1754,51 @@ nsLocalFile::SetPersistentDescriptor(con
      return InitWithNativePath(aPersistentDescriptor);
  #endif
  }
@@ -3684,15 +3700,15 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
        return rv;
      }
      return NS_ERROR_FAILURE;
-@@ -1773,16 +1781,23 @@ nsLocalFile::Reveal()
+@@ -1816,16 +1824,23 @@ nsLocalFile::Launch()
-     return NS_ERROR_FAILURE;
- #endif
- }
  
- NS_IMETHODIMP
+     if (nullptr == connection)
- nsLocalFile::Launch()
+       return NS_ERROR_FAILURE;
- {
+ 
- #ifdef MOZ_WIDGET_GTK
+     if (hildon_mime_open_file(connection, mPath.get()) != kHILDON_SUCCESS)
+       return NS_ERROR_FAILURE;
+     return NS_OK;
+ #else
 +    if( nsKDEUtils::kdeSupport()) {
 +      nsTArray<nsCString> command;
 +      command.AppendElement( NS_LITERAL_CSTRING("OPEN") );

mozilla-ppc.patch

@@ -2,6 +2,7 @@
 # Parent 21d0e194954e451f0f1935d0ed68ee9eae432ddf
 # User Wolfgang Rosenauer <wr@rosenauer.org>
 Bug 746112 - RegExp hang on ppc64 in execute.
+Bug 750620 - Make double-conversion portable to exotic architectures. TM: mozilla15
 
 diff --git a/js/src/yarr/YarrInterpreter.h b/js/src/yarr/YarrInterpreter.h
 --- a/js/src/yarr/YarrInterpreter.h
@@ -88,3 +89,25 @@ diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c
  /*
   * VM page size. It must divide the runtime CPU page size or the code
   * will abort.
+diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h
+--- a/mfbt/double-conversion/utils.h
++++ b/mfbt/double-conversion/utils.h
+@@ -50,17 +50,17 @@
+ // the result is equal to 89255e-22.
+ // The best way to test this, is to create a division-function and to compare
+ // the output of the division with the expected result. (Inlining must be
+ // disabled.)
+ // On Linux,x86 89255e-22 != Div_double(89255.0/1e22)
+ #if defined(_M_X64) || defined(__x86_64__) || \
+     defined(__ARMEL__) || defined(__avr32__) || \
+     defined(__hppa__) || defined(__ia64__) || \
+-    defined(__mips__) || defined(__powerpc__) || \
++    defined(__mips__) || defined(__powerpc__) || defined(__powerpc64__) || \
+     defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
+     defined(__SH4__) || defined(__alpha__) || \
+     defined(_MIPS_ARCH_MIPS32R2)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+ #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
+ #if defined(_WIN32)
+ // Windows uses a 64bit wide floating point stack.
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1

mozilla-ppc64le.patch

@@ -1,257 +0,0 @@
-# HG changeset patch
-# Parent e4ca21871e28639789930658e135a14f86069919
-# User Ulrich Weigand <uweigand@de.ibm.com>
-General PPC64 LE support
-
-diff --git a/configure.in b/configure.in
---- a/configure.in
-+++ b/configure.in
-@@ -1082,17 +1082,17 @@ esac
- 
- # Only set CPU_ARCH if we recognize the value of OS_TEST
- 
- case "$OS_TEST" in
- *86 | i86pc)
-     CPU_ARCH=x86
-     ;;
- 
--powerpc64 | ppc64)
-+powerpc64 | ppc64 | powerpc64le | ppc64le)
-     CPU_ARCH=ppc64
-     ;;
- 
- powerpc | ppc | rs6000)
-     CPU_ARCH=ppc
-     ;;
- 
- Alpha | alpha | ALPHA)
-diff --git a/js/src/assembler/wtf/Platform.h b/js/src/assembler/wtf/Platform.h
---- a/js/src/assembler/wtf/Platform.h
-+++ b/js/src/assembler/wtf/Platform.h
-@@ -160,26 +160,32 @@
- /* WTF_CPU_PPC - PowerPC 32-bit */
- #if   defined(__ppc__)     \
-     || defined(__PPC__)     \
-     || defined(__powerpc__) \
-     || defined(__powerpc)   \
-     || defined(__POWERPC__) \
-     || defined(_M_PPC)      \
-     || defined(__PPC)
-+#if !defined(__ppc64__) && !defined(__PPC64__)
- #define WTF_CPU_PPC 1
-+#endif
-+#if !defined(__LITTLE_ENDIAN__)
- #define WTF_CPU_BIG_ENDIAN 1
- #endif
-+#endif
- 
- /* WTF_CPU_PPC64 - PowerPC 64-bit */
- #if   defined(__ppc64__) \
-     || defined(__PPC64__)
- #define WTF_CPU_PPC64 1
-+#if !defined(__LITTLE_ENDIAN__)
- #define WTF_CPU_BIG_ENDIAN 1
- #endif
-+#endif
- 
- /* WTF_CPU_SH4 - SuperH SH-4 */
- #if defined(__SH4__)
- #define WTF_CPU_SH4 1
- #endif
- 
- /* WTF_CPU_SPARC32 - SPARC 32-bit */
- #if defined(__sparc) && !defined(__arch64__) || defined(__sparcv8)
-diff --git a/js/src/configure.in b/js/src/configure.in
---- a/js/src/configure.in
-+++ b/js/src/configure.in
-@@ -923,17 +923,17 @@ esac
- 
- # Only set CPU_ARCH if we recognize the value of OS_TEST
- 
- case "$OS_TEST" in
- *86 | i86pc)
-     CPU_ARCH=x86
-     ;;
- 
--powerpc64 | ppc64)
-+powerpc64 | ppc64 | powerpc64le | ppc64le)
-     CPU_ARCH=ppc64
-     ;;
- 
- powerpc | ppc | rs6000)
-     CPU_ARCH=ppc
-     ;;
- 
- Alpha | alpha | ALPHA)
-diff --git a/js/src/jscpucfg.h b/js/src/jscpucfg.h
---- a/js/src/jscpucfg.h
-+++ b/js/src/jscpucfg.h
-@@ -22,17 +22,17 @@
- 
- # ifdef __WATCOMC__
- #  define HAVE_VA_LIST_AS_ARRAY 1
- # endif
- 
- # define IS_LITTLE_ENDIAN 1
- # undef  IS_BIG_ENDIAN
- 
--#elif defined(__APPLE__)
-+#elif defined(__APPLE__) || defined(__powerpc__) || defined(__ppc__)
- # if __LITTLE_ENDIAN__
- #  define IS_LITTLE_ENDIAN 1
- #  undef  IS_BIG_ENDIAN
- # elif __BIG_ENDIAN__
- #  undef  IS_LITTLE_ENDIAN
- #  define IS_BIG_ENDIAN 1
- # endif
- 
-@@ -84,18 +84,17 @@
- #  if defined(_STACK_GROWS_UPWARD)
- #   define JS_STACK_GROWTH_DIRECTION (1)
- #  elif defined(_STACK_GROWS_DOWNWARD)
- #   define JS_STACK_GROWTH_DIRECTION (-1)
- #  endif
- # endif
- 
- #elif defined(__sparc) || defined(__sparc__) || \
--      defined(_POWER) || defined(__powerpc__) || \
--      defined(__ppc__) || defined(__hppa) || \
-+      defined(_POWER) || defined(__hppa) || \
-       defined(_MIPSEB) || defined(_BIG_ENDIAN)
- /* IA64 running HP-UX will have _BIG_ENDIAN defined.
-  * IA64 running Linux will have endian.h and be handled above.
-  */
- # undef IS_LITTLE_ENDIAN
- # define IS_BIG_ENDIAN 1
- 
- #else /* !defined(__sparc) && !defined(__sparc__) && ... */
-diff --git a/media/webrtc/trunk/webrtc/typedefs.h b/media/webrtc/trunk/webrtc/typedefs.h
---- a/media/webrtc/trunk/webrtc/typedefs.h
-+++ b/media/webrtc/trunk/webrtc/typedefs.h
-@@ -47,23 +47,33 @@
- //#define WEBRTC_ARCH_ARM_FAMILY
- //#define WEBRTC_ARCH_ARMEL
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
- #define WEBRTC_LITTLE_ENDIAN
- #elif defined(__powerpc64__)
- #define WEBRTC_ARCH_PPC64 1
- #define WEBRTC_ARCH_64_BITS 1
-+#ifdef __LITTLE_ENDIAN__
-+#define WEBRTC_ARCH_LITTLE_ENDIAN
-+#define WEBRTC_LITTLE_ENDIAN
-+#else
- #define WEBRTC_ARCH_BIG_ENDIAN
- #define WEBRTC_BIG_ENDIAN
-+#endif
- #elif defined(__ppc__) || defined(__powerpc__)
- #define WEBRTC_ARCH_PPC 1
- #define WEBRTC_ARCH_32_BITS 1
-+#ifdef __LITTLE_ENDIAN__
-+#define WEBRTC_ARCH_LITTLE_ENDIAN
-+#define WEBRTC_LITTLE_ENDIAN
-+#else
- #define WEBRTC_ARCH_BIG_ENDIAN
- #define WEBRTC_BIG_ENDIAN
-+#endif
- #elif defined(__sparc64__)
- #define WEBRTC_ARCH_SPARC 1
- #define WEBRTC_ARCH_64_BITS 1
- #define WEBRTC_ARCH_BIG_ENDIAN
- #define WEBRTC_BIG_ENDIAN
- #elif defined(__sparc__)
- #define WEBRTC_ARCH_SPARC 1
- #define WEBRTC_ARCH_32_BITS 1
-diff --git a/mfbt/Endian.h b/mfbt/Endian.h
---- a/mfbt/Endian.h
-+++ b/mfbt/Endian.h
-@@ -86,17 +86,17 @@
- #    error "CPU type is unknown"
- #  endif
- #elif defined(_WIN32)
- #  if defined(_M_IX86)
- #    define MOZ_LITTLE_ENDIAN 1
- #  else
- #    error "CPU type is unknown"
- #  endif
--#elif defined(__APPLE__)
-+#elif defined(__APPLE__) || defined(__powerpc__) || defined(__ppc__)
- #  if __LITTLE_ENDIAN__
- #    define MOZ_LITTLE_ENDIAN 1
- #  elif __BIG_ENDIAN__
- #    define MOZ_BIG_ENDIAN 1
- #  endif
- #elif defined(__GNUC__) && \
-       defined(__BYTE_ORDER__) && \
-       defined(__ORDER_LITTLE_ENDIAN__) && \
-@@ -114,18 +114,17 @@
- #  endif
- /*
-  * We can't include useful headers like <endian.h> or <sys/isa_defs.h>
-  * here because they're not present on all platforms.  Instead we have
-  * this big conditional that ideally will catch all the interesting
-  * cases.
-  */
- #elif defined(__sparc) || defined(__sparc__) || \
--      defined(_POWER) || defined(__powerpc__) || \
--      defined(__ppc__) || defined(__hppa) || \
-+      defined(_POWER) || defined(__hppa) || \
-       defined(_MIPSEB) || defined(__ARMEB__) || \
-       defined(__s390__) || \
-       (defined(__sh__) && defined(__LITTLE_ENDIAN__)) || \
-       (defined(__ia64) && defined(__BIG_ENDIAN__))
- #  define MOZ_BIG_ENDIAN 1
- #elif defined(__i386) || defined(__i386__) || \
-       defined(__x86_64) || defined(__x86_64__) || \
-       defined(_MIPSEL) || defined(__ARMEL__) || \
-diff --git a/nsprpub/pr/include/md/_linux.cfg b/nsprpub/pr/include/md/_linux.cfg
---- a/nsprpub/pr/include/md/_linux.cfg
-+++ b/nsprpub/pr/include/md/_linux.cfg
-@@ -24,18 +24,23 @@
- #elif defined(__GNU__)
- #define PR_AF_INET6 26  /* same as AF_INET6 */
- #else
- #define PR_AF_INET6 10  /* same as AF_INET6 */
- #endif
- 
- #ifdef __powerpc64__
- 
-+#ifdef __LITTLE_ENDIAN__
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+#else
- #undef  IS_LITTLE_ENDIAN
- #define IS_BIG_ENDIAN    1
-+#endif
- #define IS_64
- 
- #define PR_BYTES_PER_BYTE   1
- #define PR_BYTES_PER_SHORT  2
- #define PR_BYTES_PER_INT    4
- #define PR_BYTES_PER_INT64  8
- #define PR_BYTES_PER_LONG   8
- #define PR_BYTES_PER_FLOAT  4
-@@ -70,18 +75,23 @@
- #define PR_ALIGN_OF_POINTER 8
- #define PR_ALIGN_OF_WORD    8
- 
- #define PR_BYTES_PER_WORD_LOG2   3
- #define PR_BYTES_PER_DWORD_LOG2  3
- 
- #elif defined(__powerpc__)
- 
-+#ifdef __LITTLE_ENDIAN__
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+#else
- #undef  IS_LITTLE_ENDIAN
- #define IS_BIG_ENDIAN    1
-+#endif
- 
- #define PR_BYTES_PER_BYTE   1
- #define PR_BYTES_PER_SHORT  2
- #define PR_BYTES_PER_INT    4
- #define PR_BYTES_PER_INT64  8
- #define PR_BYTES_PER_LONG   4
- #define PR_BYTES_PER_FLOAT  4
- #define PR_BYTES_PER_DOUBLE 8

ppc64le-support.patch

@@ -0,0 +1,159 @@
+Index: mozilla/configure.in
+===================================================================
+--- mozilla.orig/configure.in
++++ mozilla/configure.in
+@@ -1084,7 +1084,7 @@ case "$OS_TEST" in
+     CPU_ARCH=x86
+     ;;
+ 
+-powerpc64 | ppc64)
++powerpc64 | ppc64 | powerpc64le | ppc64le)
+     CPU_ARCH=ppc64
+     ;;
+ 
+Index: mozilla/js/src/configure.in
+===================================================================
+--- mozilla.orig/js/src/configure.in
++++ mozilla/js/src/configure.in
+@@ -915,7 +915,7 @@ case "$OS_TEST" in
+     CPU_ARCH=x86
+     ;;
+ 
+-powerpc64 | ppc64)
++powerpc64 | ppc64 | powerpc64le | ppc64le)
+     CPU_ARCH=ppc64
+     ;;
+ 
+Index: mozilla/mfbt/Endian.h
+===================================================================
+--- mozilla.orig/mfbt/Endian.h
++++ mozilla/mfbt/Endian.h
+@@ -91,7 +91,7 @@
+ #  else
+ #    error "CPU type is unknown"
+ #  endif
+-#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__powerpc__) || defined(__ppc__)
+ #  if __LITTLE_ENDIAN__
+ #    define MOZ_LITTLE_ENDIAN 1
+ #  elif __BIG_ENDIAN__
+@@ -119,8 +119,7 @@
+  * cases.
+  */
+ #elif defined(__sparc) || defined(__sparc__) || \
+-      defined(_POWER) || defined(__powerpc__) || \
+-      defined(__ppc__) || defined(__hppa) || \
++      defined(_POWER) || defined(__hppa) || \
+       defined(_MIPSEB) || defined(__ARMEB__) || \
+       defined(__s390__) || \
+       (defined(__sh__) && defined(__LITTLE_ENDIAN__)) || \
+Index: mozilla/js/src/jscpucfg.h
+===================================================================
+--- mozilla.orig/js/src/jscpucfg.h
++++ mozilla/js/src/jscpucfg.h
+@@ -31,7 +31,7 @@
+ # define JS_BYTES_PER_WORD   4
+ # define JS_BITS_PER_WORD_LOG2   5
+ 
+-#elif defined(__APPLE__)
++#elif defined(__APPLE__) || defined(__powerpc__) || defined(__ppc__)
+ # if __LITTLE_ENDIAN__
+ #  define IS_LITTLE_ENDIAN 1
+ #  undef  IS_BIG_ENDIAN
+@@ -93,8 +93,7 @@
+ # endif
+ 
+ #elif defined(__sparc) || defined(__sparc__) || \
+-      defined(_POWER) || defined(__powerpc__) || \
+-      defined(__ppc__) || defined(__hppa) || \
++      defined(_POWER) || defined(__hppa) || \
+       defined(_MIPSEB) || defined(_BIG_ENDIAN)
+ /* IA64 running HP-UX will have _BIG_ENDIAN defined.
+  * IA64 running Linux will have endian.h and be handled above.
+Index: mozilla/js/src/assembler/wtf/Platform.h
+===================================================================
+--- mozilla.orig/js/src/assembler/wtf/Platform.h
++++ mozilla/js/src/assembler/wtf/Platform.h
+@@ -165,16 +165,22 @@
+     || defined(__POWERPC__) \
+     || defined(_M_PPC)      \
+     || defined(__PPC)
++#if !defined(__ppc64__) && !defined(__PPC64__)
+ #define WTF_CPU_PPC 1
++#endif
++#if !defined(__LITTLE_ENDIAN__)
+ #define WTF_CPU_BIG_ENDIAN 1
+ #endif
++#endif
+ 
+ /* WTF_CPU_PPC64 - PowerPC 64-bit */
+ #if   defined(__ppc64__) \
+     || defined(__PPC64__)
+ #define WTF_CPU_PPC64 1
++#if !defined(__LITTLE_ENDIAN__)
+ #define WTF_CPU_BIG_ENDIAN 1
+ #endif
++#endif
+ 
+ /* WTF_CPU_SH4 - SuperH SH-4 */
+ #if defined(__SH4__)
+Index: mozilla/nsprpub/pr/include/md/_linux.cfg
+===================================================================
+--- mozilla.orig/nsprpub/pr/include/md/_linux.cfg
++++ mozilla/nsprpub/pr/include/md/_linux.cfg
+@@ -29,8 +29,13 @@
+ 
+ #ifdef __powerpc64__
+ 
++#ifdef __LITTLE_ENDIAN__
++#define IS_LITTLE_ENDIAN 1
++#undef  IS_BIG_ENDIAN
++#else
+ #undef  IS_LITTLE_ENDIAN
+ #define IS_BIG_ENDIAN    1
++#endif
+ #define IS_64
+ 
+ #define PR_BYTES_PER_BYTE   1
+@@ -75,8 +80,13 @@
+ 
+ #elif defined(__powerpc__)
+ 
++#ifdef __LITTLE_ENDIAN__
++#define IS_LITTLE_ENDIAN 1
++#undef  IS_BIG_ENDIAN
++#else
+ #undef  IS_LITTLE_ENDIAN
+ #define IS_BIG_ENDIAN    1
++#endif
+ 
+ #define PR_BYTES_PER_BYTE   1
+ #define PR_BYTES_PER_SHORT  2
+Index: mozilla/media/webrtc/trunk/webrtc/typedefs.h
+===================================================================
+--- mozilla.orig/media/webrtc/trunk/webrtc/typedefs.h
++++ mozilla/media/webrtc/trunk/webrtc/typedefs.h
+@@ -52,13 +52,23 @@
+ #elif defined(__powerpc64__)
+ #define WEBRTC_ARCH_PPC64 1
+ #define WEBRTC_ARCH_64_BITS 1
++#ifdef __LITTLE_ENDIAN__
++#define WEBRTC_ARCH_LITTLE_ENDIAN
++#define WEBRTC_LITTLE_ENDIAN
++#else
+ #define WEBRTC_ARCH_BIG_ENDIAN
+ #define WEBRTC_BIG_ENDIAN
++#endif
+ #elif defined(__ppc__) || defined(__powerpc__)
+ #define WEBRTC_ARCH_PPC 1
+ #define WEBRTC_ARCH_32_BITS 1
++#ifdef __LITTLE_ENDIAN__
++#define WEBRTC_ARCH_LITTLE_ENDIAN
++#define WEBRTC_LITTLE_ENDIAN
++#else
+ #define WEBRTC_ARCH_BIG_ENDIAN
+ #define WEBRTC_BIG_ENDIAN
++#endif
+ #elif defined(__sparc64__)
+ #define WEBRTC_ARCH_SPARC 1
+ #define WEBRTC_ARCH_64_BITS 1

xpcom-ppc64le.patch

@@ -1,39 +1,8 @@
-# HG changeset patch
+Index: mozilla/xpcom/reflect/xptcall/src/md/unix/moz.build
-# Parent 5f1384375f10a5f0ee7c8288adef9593822e4e68
+===================================================================
-# User Ulrich Weigand <uweigand@de.ibm.com>
+--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/moz.build
-PPC64 LE support for XPCOM
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/moz.build
-
+@@ -198,6 +198,13 @@ if CONFIG['OS_TEST'] == 'powerpc64':
-diff --git a/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
---- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-+++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-@@ -161,17 +161,17 @@ endif
- ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST)))
- ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
- AS		:= $(CC) -c -x assembler-with-cpp
- endif
- 
- #
- # Linux/PPC64
- #
--ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
-+ifneq (,$(filter Linuxpowerpc64 Linuxpowerpc64le FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
- ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
- AS             := $(CC) -c -x assembler-with-cpp
- endif
- 
- #
- # NetBSD/PPC
- #
- ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST)))                           
-diff --git a/xpcom/reflect/xptcall/src/md/unix/moz.build b/xpcom/reflect/xptcall/src/md/unix/moz.build
---- a/xpcom/reflect/xptcall/src/md/unix/moz.build
-+++ b/xpcom/reflect/xptcall/src/md/unix/moz.build
-@@ -186,16 +186,23 @@ if CONFIG['OS_TEST'] == 'powerpc':
- 
- if CONFIG['OS_TEST'] == 'powerpc64':
-     if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD'):
-           SOURCES += [
-               'xptcinvoke_ppc64_linux.cpp',
                'xptcstubs_ppc64_linux.cpp',
            ]
  
@@ -46,21 +15,25 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/moz.build b/xpcom/reflect/xptcall
 +
  if CONFIG['OS_TEST'] in ('macppc', 'bebox', 'ofppc', 'prep', 'amigappc'):
      if CONFIG['OS_ARCH'] == 'NetBSD':
-         SOURCES += [
+         CPP_SOURCES += [
-             'xptcinvoke_ppc_netbsd.cpp',
+Index: mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-             'xptcstubs_ppc_netbsd.cpp',
+===================================================================
-         ]
+--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/Makefile.in
- 
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
- if CONFIG['OS_ARCH'] == 'OpenBSD' and CONFIG['OS_TEST'] == 'powerpc':
+@@ -166,7 +166,7 @@ endif
-diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s
+ #
---- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s
+ # Linux/PPC64
-+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s
+ #
-@@ -12,33 +12,51 @@
+-ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
- .set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
++ifneq (,$(filter Linuxpowerpc64 Linuxpowerpc64le FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
- .set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
+ ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
- .set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
+ AS             := $(CC) -c -x assembler-with-cpp
- .set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
+ endif
- .set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
+Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s
+===================================================================
+--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s
+@@ -17,12 +17,29 @@
  .set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
  .set f30,30; .set f31,31
  
@@ -90,11 +63,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xp
          .section ".toc","aw"
          .section ".text"
          .align 2
-         .globl  NS_InvokeByIndex
+@@ -34,6 +51,7 @@ NS_InvokeByIndex:
-         .section ".opd","aw"
-         .align 3
- NS_InvokeByIndex:
-         .quad   .NS_InvokeByIndex,.TOC.@tocbase
          .previous
          .type   NS_InvokeByIndex,@function
  .NS_InvokeByIndex:
@@ -102,17 +71,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xp
          mflr    0
          std     0,16(r1)
  
-         std     r29,-24(r1)
+@@ -56,7 +74,7 @@ NS_InvokeByIndex:
-         std     r30,-16(r1)
-         std     r31,-8(r1)
- 
-         mr      r29,r3                  # Save 'that' in r29
-@@ -51,51 +69,55 @@ NS_InvokeByIndex:
-         # that the stack remains 16-byte aligned.
-         #
-         #  | ..128-byte stack frame.. |     | 7 GP | 13 FP | 3 NV |
-         #  |               |(params)........| regs | regs  | regs |
-         # (r1)...........(+112)....(+128)
          #                               (-23*8).(-16*8).(-3*8)..(r31)
  
          # +stack frame, -unused stack params, +regs storage, +1 for alignment
@@ -121,15 +80,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xp
          rldicr  r7,r7,3,59              # multiply by 8 and mask with ~15
          neg     r7,r7
          stdux   r1,r1,r7
- 
+@@ -72,7 +90,7 @@ NS_InvokeByIndex:
- 
-         # Call invoke_copy_to_stack(uint64_t* gpregs, double* fpregs,
-         #                           uint32_t paramCount, nsXPTCVariant* s, 
-         #                           uint64_t* d))
- 
-         # r5, r6 are passed through intact (paramCount, params)
-         # r7 (d) has to be r1+112 -- where parameters are passed on the stack.
-         # r3, r4 are above that, easier to address from r31 than from r1
  
          subi    r3,r31,(23*8)           # r3 --> GPRS
          subi    r4,r31,(16*8)           # r4 --> FPRS
@@ -138,10 +89,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xp
          bl      invoke_copy_to_stack
          nop
  
-         # Set up to invoke function
+@@ -83,14 +101,18 @@ NS_InvokeByIndex:
- 
-         ld      r9,0(r29)               # vtable (r29 is 'that')
-         mr      r3,r29                  # self is first arg, obviously
  
          sldi    r30,r30,3               # Find function descriptor 
          add     r9,r9,r30
@@ -165,17 +113,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xp
  
          # Load FP and GP registers as required
          ld      r4, -(23*8)(r31) 
-         ld      r5, -(22*8)(r31) 
+@@ -117,7 +139,7 @@ NS_InvokeByIndex:
-         ld      r6, -(21*8)(r31) 
-         ld      r7, -(20*8)(r31) 
-         ld      r8, -(19*8)(r31) 
-         ld      r9, -(18*8)(r31) 
-@@ -112,21 +134,25 @@ NS_InvokeByIndex:
-         lfd     f9, -(8*8)(r31)
-         lfd     f10, -(7*8)(r31)
-         lfd     f11, -(6*8)(r31)
-         lfd     f12, -(5*8)(r31)
-         lfd     f13, -(4*8)(r31)
  
          bctrl                           # Do it
  
@@ -184,8 +122,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xp
          ld      r1,0(r1)                # Revert stack frame
          ld      0,16(r1)                # Reload lr
          ld      29,-24(r1)              # Restore NVGPRS
-         ld      30,-16(r1)
+@@ -126,7 +148,11 @@ NS_InvokeByIndex:
-         ld      31,-8(r1)
          mtlr    0
          blr
  
@@ -197,15 +134,11 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xp
  
          # Magic indicating no need for an executable stack
          .section .note.GNU-stack, "", @progbits ; .previous
-diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
+Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
---- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
+===================================================================
-+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
+--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
-@@ -69,17 +69,19 @@ invoke_copy_to_stack(uint64_t* gpregs,
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
-             else
+@@ -74,7 +74,9 @@ invoke_copy_to_stack(uint64_t* gpregs,
-                 *(double *)d = s->val.d;
-         }
-         else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
-             if (i < FPR_COUNT) {
                  fpregs[i]   = s->val.f; // if passed in registers, floats are promoted to doubles
              } else {
                  float *p = (float *)d;
@@ -215,20 +148,11 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp b/xpco
                  *p = s->val.f;
              }
          }
-         else {
+Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s
-             if (i < GPR_COUNT)
+===================================================================
-                 gpregs[i] = tempu64;
+--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s
-             else
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s
-                 *d = tempu64;
+@@ -17,6 +17,27 @@
-diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s
---- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s
-+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s
-@@ -12,28 +12,50 @@
- .set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
- .set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
- .set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
- .set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
- .set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
  .set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
  .set f30,30; .set f31,31
  
@@ -256,12 +180,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s b/xpc
          .section ".text"
          .align 2
          .globl SharedStub
-         .section ".opd","aw"
+@@ -29,6 +50,7 @@ SharedStub:
-         .align 3
- 
- SharedStub:
-         .quad   .SharedStub,.TOC.@tocbase
-         .previous
          .type   SharedStub,@function
  
  .SharedStub:
@@ -269,17 +188,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s b/xpc
          mflr    r0
  
          std     r4, -56(r1)                     # Save all GPRS
-         std     r5, -48(r1)
+@@ -55,7 +77,7 @@ SharedStub:
-         std     r6, -40(r1)
-         std     r7, -32(r1)
-         std     r8, -24(r1)
-         std     r9, -16(r1)
-@@ -50,17 +72,17 @@ SharedStub:
-         stfd    f5, -128(r1)
-         stfd    f4, -136(r1)
-         stfd    f3, -144(r1)
-         stfd    f2, -152(r1)
-         stfd    f1, -160(r1)
  
          subi    r6,r1,56                        # r6 --> gprData
          subi    r7,r1,160                       # r7 --> fprData
@@ -288,17 +197,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s b/xpc
  
          std     r0, 16(r1)
  	
-         stdu    r1,-288(r1)
+@@ -75,7 +97,11 @@ SharedStub:
-                                                 # r3 has the 'self' pointer
-                                                 # already
- 
-         mr      r4,r11                          # r4 is methodIndex selector,
-@@ -70,12 +92,16 @@ SharedStub:
-         bl      PrepareAndDispatch
-         nop
- 
-         ld      1,0(r1)                         # restore stack
-         ld      r0,16(r1)                       # restore LR
          mtlr    r0
          blr
  
@@ -310,15 +209,11 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s b/xpc
  
          # Magic indicating no need for an executable stack
          .section .note.GNU-stack, "", @progbits ; .previous
-diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
+Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
---- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
+===================================================================
-+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
+--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
-@@ -78,17 +78,19 @@ PrepareAndDispatch(nsXPTCStubBase* self,
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
-                 dp->val.d = fprData[i];
+@@ -83,7 +83,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
-             else
-                 dp->val.d = *(double*) ap;
-         } else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
-             if (i < FPR_COUNT)
                  dp->val.f = (float) fprData[i]; // in registers floats are passed as doubles
              else {
                  float *p = (float *)ap;
@@ -328,17 +223,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp b/xpcom
                  dp->val.f = *p;
              }
          } else { /* integer type or pointer */
-             if (i < GPR_COUNT)
+@@ -153,6 +155,43 @@ PrepareAndDispatch(nsXPTCStubBase* self,
-                 tempu64 = gprData[i];
-             else
-                 tempu64 = *ap;
- 
-@@ -148,16 +150,53 @@ PrepareAndDispatch(nsXPTCStubBase* self,
- // Create names would be like:
- // _ZN14nsXPTCStubBase5Stub1Ev
- // _ZN14nsXPTCStubBase6Stub12Ev
- // _ZN14nsXPTCStubBase7Stub123Ev
- // _ZN14nsXPTCStubBase8Stub1234Ev
  // etc.
  // Use assembler directives to get the names right...
  
@@ -382,17 +267,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp b/xpcom
  # define STUB_ENTRY(n)                                                  \
  __asm__ (                                                               \
          ".section \".toc\",\"aw\" \n\t"                                 \
-         ".section \".text\" \n\t"                                       \
+@@ -195,6 +234,7 @@ __asm__ (
-         ".align 2 \n\t"                                                 \
-         ".if "#n" < 10 \n\t"                                            \
-         ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t"                    \
-         ".section \".opd\",\"aw\" \n\t"                                 \
-@@ -190,16 +229,17 @@ PrepareAndDispatch(nsXPTCStubBase* self,
-                                                                         \
-         ".else  \n\t"                                                   \
-         ".err   \"stub number "#n" >= 1000 not yet supported\"\n"       \
-         ".endif \n\t"                                                   \
-                                                                         \
          "li     11,"#n" \n\t"                                           \
          "b      SharedStub \n"                                          \
  );
@@ -400,8 +275,3 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp b/xpcom
  
  #define SENTINEL_ENTRY(n)                                               \
  nsresult nsXPTCStubBase::Sentinel##n()                                  \
- {                                                                       \
-     NS_ERROR("nsXPTCStubBase::Sentinel called");                  \
-     return NS_ERROR_NOT_IMPLEMENTED;                                    \
- }
-