Accepting request 226811 from mozilla:Factory

- update to Firefox 28.0 (bnc#868603) * MFSA 2014-15/CVE-2014-1493/CVE-2014-1494 Miscellaneous memory safety hazards * MFSA 2014-17/CVE-2014-1497 (bmo#966311) Out of bounds read during WAV file decoding * MFSA 2014-18/CVE-2014-1498 (bmo#935618) crypto.generateCRMFRequest does not validate type of key * MFSA 2014-19/CVE-2014-1499 (bmo#961512) Spoofing attack on WebRTC permission prompt * MFSA 2014-20/CVE-2014-1500 (bmo#956524) onbeforeunload and Javascript navigation DOS * MFSA 2014-22/CVE-2014-1502 (bmo#972622) WebGL content injection from one domain to rendering in another * MFSA 2014-23/CVE-2014-1504 (bmo#911547) Content Security Policy for data: documents not preserved by session restore * MFSA 2014-26/CVE-2014-1508 (bmo#963198) Information disclosure through polygon rendering in MathML * MFSA 2014-27/CVE-2014-1509 (bmo#966021) Memory corruption in Cairo during PDF font rendering * MFSA 2014-28/CVE-2014-1505 (bmo#941887) SVG filters information disclosure through feDisplacementMap * MFSA 2014-29/CVE-2014-1510/CVE-2014-1511 (bmo#982906, bmo#982909) Privilege escalation using WebIDL-implemented APIs * MFSA 2014-30/CVE-2014-1512 (bmo#982957) Use-after-free in TypeObject * MFSA 2014-31/CVE-2014-1513 (bmo#982974) Out-of-bounds read/write through neutering ArrayBuffer objects * MFSA 2014-32/CVE-2014-1514 (bmo#983344) Out-of-bounds write through TypedArrayObject after neutering OBS-URL: https://build.opensuse.org/request/show/226811 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=188
2014-03-21 12:33:51 +00:00 · 2014-03-21 12:33:51 +00:00 · d93cab4865
commit d93cab4865
parent 7ab95461c2 bf382156d6
23 changed files with 5127 additions and 1919 deletions
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Sun Mar 16 13:39:15 UTC 2014 - wr@rosenauer.org
+
+- update to Firefox 28.0 (bnc#868603)
+  * MFSA 2014-15/CVE-2014-1493/CVE-2014-1494
+    Miscellaneous memory safety hazards
+  * MFSA 2014-17/CVE-2014-1497 (bmo#966311)
+    Out of bounds read during WAV file decoding
+  * MFSA 2014-18/CVE-2014-1498 (bmo#935618)
+    crypto.generateCRMFRequest does not validate type of key
+  * MFSA 2014-19/CVE-2014-1499 (bmo#961512)
+    Spoofing attack on WebRTC permission prompt
+  * MFSA 2014-20/CVE-2014-1500 (bmo#956524)
+    onbeforeunload and Javascript navigation DOS
+  * MFSA 2014-22/CVE-2014-1502 (bmo#972622)
+    WebGL content injection from one domain to rendering in another
+  * MFSA 2014-23/CVE-2014-1504 (bmo#911547)
+    Content Security Policy for data: documents not preserved by
+    session restore
+  * MFSA 2014-26/CVE-2014-1508 (bmo#963198)
+    Information disclosure through polygon rendering in MathML
+  * MFSA 2014-27/CVE-2014-1509 (bmo#966021)
+    Memory corruption in Cairo during PDF font rendering
+  * MFSA 2014-28/CVE-2014-1505 (bmo#941887)
+    SVG filters information disclosure through feDisplacementMap
+  * MFSA 2014-29/CVE-2014-1510/CVE-2014-1511 (bmo#982906, bmo#982909)
+    Privilege escalation using WebIDL-implemented APIs
+  * MFSA 2014-30/CVE-2014-1512 (bmo#982957)
+    Use-after-free in TypeObject
+  * MFSA 2014-31/CVE-2014-1513 (bmo#982974)
+    Out-of-bounds read/write through neutering ArrayBuffer objects
+  * MFSA 2014-32/CVE-2014-1514 (bmo#983344)
+    Out-of-bounds write through TypedArrayObject after neutering
+- requires NSPR 4.10.3 and NSS 3.15.5
+- new build dependency (and recommends):
+  * libpulse
+- update of PowerPC 64 patches (bmo#976648) (pcerny@suse.com)
+- rebased patches
+
 -------------------------------------------------------------------
 Mon Feb 17 11:59:28 UTC 2014 - wr@rosenauer.org

--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@ -17,8 +17,8 @@
 #


-%define major 27
-%define mainver %major.0.1
+%define major 28
+%define mainver %major.0
 %define update_channel release

 %if %suse_version > 1220
@ -50,9 +50,10 @@ BuildRequires:  libproxy-devel
 %else
 BuildRequires:  wireless-tools
 %endif
-BuildRequires:  mozilla-nspr-devel >= 4.10.2
-BuildRequires:  mozilla-nss-devel >= 3.15.4
+BuildRequires:  mozilla-nspr-devel >= 4.10.3
+BuildRequires:  mozilla-nss-devel >= 3.15.5
 BuildRequires:  nss-shared-helper-devel
+BuildRequires:  pkgconfig(libpulse)
 %if %suse_version > 1210
 BuildRequires:  pkgconfig(gstreamer-%gstreamer_ver)
 BuildRequires:  pkgconfig(gstreamer-app-%gstreamer_ver)
@ -63,7 +64,7 @@ Recommends:     gstreamer-0_10-plugins-ffmpeg
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2014021500
+%define         releasedate 2014031500
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@ -105,9 +106,12 @@ Patch10:        mozilla-sle11.patch
 Patch12:        mozilla-arm-disable-edsp.patch
 Patch13:        mozilla-ppc.patch
 Patch14:        mozilla-libproxy-compat.patch
-Patch15:        mozilla-ppc64le.patch
-Patch16:        mozilla-libffi-ppc64le.patch
-Patch17:        mozilla-xpcom-ppc64le.patch
+Patch15:        mozilla-ppc64le-build.patch
+Patch16:        mozilla-ppc64le-javascript.patch
+Patch17:        mozilla-ppc64le-libffi.patch
+Patch18:        mozilla-ppc64le-mfbt.patch
+Patch19:        mozilla-ppc64le-webrtc.patch
+Patch20:        mozilla-ppc64le-xpcom.patch
 # Firefox/browser
 Patch30:        firefox-browser-css.patch
 Patch31:        firefox-kde.patch
@ -122,6 +126,7 @@ Requires:       %{name}-branding > 20.0
 Requires:       mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr)
 Requires:       mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss)
 Recommends:     libcanberra0
+Recommends:     libpulse0
 # libproxy's mozjs pacrunner crashes FF (bnc#759123)
 %if %suse_version < 1220
 Obsoletes:      libproxy1-pacrunner-mozjs <= 0.4.7
@ -170,7 +175,6 @@ Requires:       perl(XML::Simple)
 Development files for Firefox to make packaging of addons easier.

 %if %localize
-
 %package translations-common
 Summary:        Common translations for Firefox
 Group:          System/Localization
@ -185,7 +189,7 @@ of Firefox.
 %package translations-other
 Summary:        Extra translations for Firefox
 Group:          System/Localization
-Provides:       locale(%{name}:ach;af;an;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lij;lt;lv;mai;mk;ml;mr;nn_NO;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;te;th;tr;uk;vi;xh;zu
+Provides:       locale(%{name}:ach;af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;vi;zu)
 Requires:       %{name} = %{version}
 Obsoletes:      %{name}-translations < %{version}-%{release}

@ -226,7 +230,11 @@ symbols meant for upload to Mozilla's crash collector database.
 %endif

 %prep
+%if %localize
 %setup -q -n mozilla -b 7 -b 10
+%else
+%setup -q -n mozilla
+%endif
 cd $RPM_BUILD_DIR/mozilla
 %patch1 -p1
 %patch2 -p1
@ -246,11 +254,12 @@ cd $RPM_BUILD_DIR/mozilla
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
 #
 %patch30 -p1
-%if %suse_version >= 1110
 %patch31 -p1
-%endif
 %if %suse_version >= 1140
 %patch32 -p1
 %endif
@ -302,7 +311,9 @@ ac_add_options --mandir=%{_mandir}
 ac_add_options --includedir=%{_includedir}
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
+%if %{localize}
 ac_add_options --with-l10n-base=$RPM_BUILD_DIR/l10n
+%endif
 #ac_add_options --with-system-jpeg    # libjpeg-turbo is used internally
 #ac_add_options --with-system-png     # doesn't work because of missing APNG support
 ac_add_options --with-system-zlib
@ -313,44 +324,30 @@ ac_add_options --disable-debug
 ac_add_options --enable-startup-notification
 #ac_add_options --enable-chrome-format=jar
 ac_add_options --enable-update-channel=%{update_channel}
-EOF
 %if %suse_version > 1130
-cat << EOF >> $MOZCONFIG
 ac_add_options --disable-gnomevfs
 ac_add_options --enable-gio
-EOF
 %endif
 %if %suse_version < 1220
-cat << EOF >> $MOZCONFIG
 ac_add_options --disable-gstreamer
-EOF
 %endif
 %if %branding
-cat << EOF >> $MOZCONFIG
 ac_add_options --enable-official-branding
-EOF
 %endif
 %if %suse_version > 1110
-cat << EOF >> $MOZCONFIG
 ac_add_options --enable-libproxy
-EOF
 %endif
 %if ! %crashreporter
-cat << EOF >> $MOZCONFIG
 ac_add_options --disable-crashreporter
-EOF
 %endif
 # Disable neon for arm as it does not build correctly
 %ifarch %arm
-cat << EOF >> $MOZCONFIG
 ac_add_options --disable-neon
-EOF
 %endif
 %ifnarch %ix86 x86_64
-cat << EOF >> $MOZCONFIG
 ac_add_options --disable-webrtc
-EOF
 %endif
+EOF
 make -f client.mk build

 %install
@ -368,10 +365,8 @@ mkdir -p $RPM_BUILD_ROOT%{progdir}/distribution/extensions
 mkdir -p $RPM_BUILD_ROOT%{progdir}/browser/searchplugins
 mkdir -p $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/
 # install kde.js
-%if %suse_version >= 1110
 install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/kde.js
 install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{progdir}/browser/defaults/preferences/firefox.js
-%endif
 # install add-plugins.sh
 sed "s:%%PROGDIR:%{progdir}:g" \
  %{SOURCE13} > $RPM_BUILD_ROOT%{progdir}/add-plugins.sh
--- a/compare-locales.tar.xz
+++ b/compare-locales.tar.xz
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fce50becd6e1179c7c5b5f230465ba32e94e5351dd8d7fbc1abf3b8e860360a9
-size 28504
+oid sha256:e314d25e2d99f393947616e6428585a652a0540cbbbaad7eab0e2bc1719c3edb
+size 28428
--- a/create-tar.sh
+++ b/create-tar.sh
@ -2,8 +2,8 @@

 CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_27_0_1_RELEASE"
-VERSION="27.0.1"
+RELEASE_TAG="FIREFOX_28_0_RELEASE"
+VERSION="28.0"

 # mozilla
 if [ -d mozilla ]; then
--- a/firefox-27.0.1-source.tar.xz
+++ b/firefox-27.0.1-source.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eebf7ed7703fe0ca6ad7a4a2b3fb5e2d09fb23c17415eb98b2302b099d024bb0
-size 109073252
--- a/firefox-28.0-source.tar.xz
+++ b/firefox-28.0-source.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:49c9d4f95133071a6b062f01b6478e5c757401637223f1b4925ce50970962108
+size 113703808
--- a/firefox-kde.patch
+++ b/firefox-kde.patch
@ -2,7 +2,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1184 @@
+@@ -0,0 +1,1177 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@ -30,19 +30,19 @@ new file mode 100644
 +        xmlns:html="http://www.w3.org/1999/xhtml"
 +        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 +        onload="gBrowserInit.onLoad()" onunload="gBrowserInit.onUnload()" onclose="return WindowIsClosing();"
-+        title="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
-+        title_normal="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
+        title="&mainWindow.title;"
+        title_normal="&mainWindow.title;"
 +#ifdef XP_MACOSX
-+        title_privatebrowsing="&mainWindow.title;@PRE_RELEASE_SUFFIX@&mainWindow.titlemodifiermenuseparator;&mainWindow.titlePrivateBrowsingSuffix;"
-+        titledefault="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
+        title_privatebrowsing="&mainWindow.title;&mainWindow.titlemodifiermenuseparator;&mainWindow.titlePrivateBrowsingSuffix;"
+        titledefault="&mainWindow.title;"
 +        titlemodifier=""
 +        titlemodifier_normal=""
 +        titlemodifier_privatebrowsing="&mainWindow.titlePrivateBrowsingSuffix;"
 +#else
-+        title_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;"
-+        titlemodifier="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@"
-+        titlemodifier_normal="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@"
-+        titlemodifier_privatebrowsing="&mainWindow.titlemodifier;@PRE_RELEASE_SUFFIX@ &mainWindow.titlePrivateBrowsingSuffix;"
+        title_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"
+        titlemodifier="&mainWindow.titlemodifier;"
+        titlemodifier_normal="&mainWindow.titlemodifier;"
+        titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;"
 +#endif
 +        titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
 +        lightweightthemes="true"
@ -143,7 +143,6 @@ new file mode 100644
 +           footertype="promobox"
 +           orient="vertical"
 +           ignorekeys="true"
-+           consumeoutsideclicks="true"
 +           hidden="true"
 +           onpopupshown="StarUI.panelShown(event);"
 +           aria-labelledby="editBookmarkPanelTitle">
@ -192,7 +191,6 @@ new file mode 100644
 +    <panel id="UITourTooltip"
 +           type="arrow"
 +           hidden="true"
-+           consumeoutsideclicks="false"
 +           noautofocus="true"
 +           align="start"
 +           orient="vertical"
@ -207,7 +205,6 @@ new file mode 100644
 +    <panel id="socialActivatedNotification"
 +           type="arrow"
 +           hidden="true"
-+           consumeoutsideclicks="true"
 +           align="start"
 +           orient="horizontal"
 +           role="alert">
@ -238,7 +235,6 @@ new file mode 100644
 +           orient="horizontal"
 +           onpopupshowing="SocialShare.onShowing()"
 +           onpopuphidden="SocialShare.onHidden()"
-+           consumeoutsideclicks="true"
 +           hidden="true">
 +      <vbox class="social-share-toolbar">
 +        <vbox id="social-share-provider-buttons" flex="1"/>
@ -259,7 +255,6 @@ new file mode 100644
 +           hidden="true"
 +           flip="slide"
 +           rolluponmousewheel="true"
-+           consumeoutsideclicks="false"
 +           noautofocus="true"
 +           position="topcenter topright"/>
 +
@ -317,7 +312,6 @@ new file mode 100644
 +           type="arrow"
 +           hidden="true"
 +           noautofocus="true"
-+           consumeoutsideclicks="true"
 +           onpopupshown="if (event.target == this)
 +                           gIdentityHandler.onPopupShown(event);"
 +           orient="vertical"
@ -1106,7 +1100,6 @@ new file mode 100644
 +  <vbox id="browser-bottombox" layer="true">
 +    <notificationbox id="global-notificationbox"/>
 +    <toolbar id="developer-toolbar"
-+             class="devtools-toolbar"
 +             hidden="true">
 +#ifdef XP_MACOSX
 +          <toolbarbutton id="developer-toolbar-closebutton"
@ -1324,13 +1317,13 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/pre
 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
-@@ -8,10 +8,12 @@ USE_STATIC_LIBS = 1
+@@ -2,10 +2,12 @@
+ # 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
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include $(topsrcdir)/config/rules.mk
 
- DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\" \
-   -DMOZ_APP_VERSION=\"$(MOZ_APP_VERSION)\"
- 
 CXXFLAGS += $(TK_CFLAGS)
 
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
@ -1340,7 +1333,7 @@ diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell
 diff --git a/browser/components/shell/src/moz.build b/browser/components/shell/src/moz.build
 --- a/browser/components/shell/src/moz.build
 +++ b/browser/components/shell/src/moz.build
-@@ -12,16 +12,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
+@@ -10,16 +10,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     SOURCES += [
@ -1349,12 +1342,12 @@ diff --git a/browser/components/shell/src/moz.build b/browser/components/shell/s
 elif CONFIG['MOZ_WIDGET_GTK']:
     SOURCES += [
         'nsGNOMEShellService.cpp',
-+        'nsKDEShellService.cpp',
-+        'nsUnixShellService.cpp'
+	'nsKDEShellService.cpp',
+	'nsUnixShellService.cpp',
     ]
 
 if SOURCES:
-     LIBRARY_NAME = 'shellservice_s'
+     FINAL_LIBRARY = 'browsercomps'
 
 EXTRA_COMPONENTS += [
     'nsSetDefaultBrowser.js',
@ -1772,7 +1765,7 @@ new file mode 100644
 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
-@@ -613,19 +613,21 @@
+@@ -640,19 +640,21 @@
 @BINPATH@/defaults/autoconfig/prefcalls.js
 @BINPATH@/browser/defaults/profile/prefs.js
 
--- a/firefox-multilocale-chrome.patch
+++ b/firefox-multilocale-chrome.patch
@ -1,12 +1,12 @@
 # HG changeset patch
-# Parent f144d934d339d048bf9b650fc776397029150dd6
+# Parent 4b6055d24a2bbc4a37490214df4acf08269f14ff
 # User Wolfgang Rosenauer <wr@rosenauer.org>
 Add searchplugins to chrome packaging for proper localization

 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -381,16 +381,20 @@ pref("browser.helperApps.deleteTempFileO
+@@ -368,16 +368,20 @@ pref("browser.helperApps.deleteTempFileO
 #endif
 
 // search engines URL
@ -30,9 +30,9 @@ diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
 --- a/browser/locales/Makefile.in
 +++ b/browser/locales/Makefile.in
-@@ -66,21 +66,23 @@ STUB_HOOK = $(NSINSTALL) -D "$(_ABS_DIST
-     cp ../installer/windows/l10ngen/stub.exe "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \
-     chmod 0755 "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \
+@@ -66,21 +66,23 @@ STUB_HOOK = $(NSINSTALL) -D '$(_ABS_DIST
+     cp ../installer/windows/l10ngen/stub.exe '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
+     chmod 0755 '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
     $(NULL)
 endif
 
@ -56,10 +56,10 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
 DIST_SUBDIRS = browser metro
 else
 DIST_SUBDIRS = $(DIST_SUBDIR)
-@@ -127,20 +129,44 @@ install:: $(addprefix generic/profile/,$
+@@ -118,16 +120,39 @@ libs:: $(addprefix generic/profile/,$(PR
 
- install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
- 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome
+ libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
+ 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome
 
 # metro build calls back here for search engine plugins
 searchplugins: $(addprefix $(FINAL_TARGET)/searchplugins/,$(SEARCHPLUGINS))
@ -72,17 +72,17 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
 +
 +searchplugins-jar:: $(SEARCHPLUGINS)
 +	for SEARCHPLUGIN in $^; do \
-+	 $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \
-+	 $$SEARCHPLUGIN > $$SEARCHPLUGIN-new ; \
-+	 mv $$SEARCHPLUGIN-new $$SEARCHPLUGIN ; \
+	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) \
+	$$SEARCHPLUGIN > $$SEARCHPLUGIN-new) ; \
+	mv $$SEARCHPLUGIN-new $$SEARCHPLUGIN ; \
 +	done
 +
 +searchplugins-jar:: tmp-search.jar.mn
 +	$(call py_action,jar_maker,\
-+	 $(QUIET) -j $(FINAL_TARGET)/chrome \
-+	 -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \
-+	 -s $(LOCALE_SRCDIR)/searchplugins \
-+	 $(MAKE_JARS_FLAGS) tmp-search.jar.mn)
+	$(QUIET) -j $(FINAL_TARGET)/chrome \
+	-s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \
+	-s $(LOCALE_SRCDIR)/searchplugins \
+	$(MAKE_JARS_FLAGS) tmp-search.jar.mn)
 +
 +libs:: searchplugins-jar
 +
@ -92,15 +92,10 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C ../../toolkit/locales libs-$*
 	@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$*
-+	@$(MAKE) -B searchplugins-jar AB_CD=$* XPI_NAME=locale-$*
 ifdef MOZ_WEBAPP_RUNTIME
 	@$(MAKE) -C ../../webapprt/locales AB_CD=$* XPI_NAME=locale-$*
 endif
 	@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
- 	@$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$*
- 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
- ifdef MOZ_METRO
- 	@$(MAKE) -C ../metro/locales AB_CD=$* XPI_NAME=locale-$*
 diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en-US/searchplugins/google.xml
 --- a/browser/locales/en-US/searchplugins/google.xml
 +++ b/browser/locales/en-US/searchplugins/google.xml
@ -133,7 +128,7 @@ diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en
 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
 --- a/browser/locales/jar.mn
 +++ b/browser/locales/jar.mn
-@@ -124,14 +124,15 @@
+@@ -123,14 +123,15 @@
     locale/browser/syncQuota.properties         (%chrome/browser/syncQuota.properties)
 #endif
 % locale browser-region @AB_CD@ %locale/browser-region/
--- a/firefox-no-default-ualocale.patch
+++ b/firefox-no-default-ualocale.patch
@ -1,14 +1,14 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent e5018e95de4fe5a06e43b5e416e0333fc628408f
+# Parent 5c1cb20bb3ad68c77841909461700cbb11707708
 Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value

 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -245,17 +245,17 @@ pref("lightweightThemes.update.enabled",
- // UI tour experience.
+@@ -246,17 +246,17 @@ pref("lightweightThemes.update.enabled",
 pref("browser.uitour.enabled", false);
+ pref("browser.uitour.requireSecure", true);
 pref("browser.uitour.themeOrigin", "https://addons.mozilla.org/%LOCALE%/firefox/themes/");
 pref("browser.uitour.pinnedTabUrl", "https://support.mozilla.org/%LOCALE%/kb/pinned-tabs-keep-favorite-websites-open");
 pref("browser.uitour.whitelist.add.260", "www.mozilla.org,support.mozilla.org");
--- a/l10n-27.0.1.tar.xz
+++ b/l10n-27.0.1.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:10917d32a8d3390de5e28ae85bb2b59e5345b18911b99363bfe0386071072b88
-size 39217108
--- a/l10n-28.0.tar.xz
+++ b/l10n-28.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4206aef3608207f00afb279ac1d7fe29cb01f66b1a6724ce11634e69fb994555
+size 39457348
--- a/mozilla-kde.patch
+++ b/mozilla-kde.patch
@ -7,19 +7,19 @@ 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
- # Optimizer bug with GCC 3.2.2 on OS/2
- ifeq ($(OS_ARCH), OS2)
- nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp
- 	$(REPORT_BUILD)
- 	@$(MAKE_DEPS_AUTO_CXX)
- 	$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS:-O2=-O1) $(_VPATH_SRCS)
+@@ -21,13 +21,15 @@ endif
+ ifdef MOZ_SERVICES_HEALTHREPORT
+ ifneq (android,$(MOZ_WIDGET_TOOLKIT))
+ grepref_files += $(topsrcdir)/services/healthreport/healthreport-prefs.js
+ else
+ grepref_files += $(topsrcdir)/mobile/android/chrome/content/healthreport-prefs.js
+ endif
 endif
 
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
- 
+
 greprefs.js: $(grepref_files)
- 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $^ > $@
+ 	$(call py_action,preprocessor,$(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $^ -o $@)
 
 libs:: greprefs.js
 	$(INSTALL) $^ $(DIST)/bin/
@ -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 
+@@ -1115,16 +1116,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(
+@@ -1140,17 +1159,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(
+@@ -1244,28 +1263,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)
@ -217,9 +217,9 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
 
 #ifdef MOZ_WIDGET_ANDROID
 #include "AndroidBridge.h"
+ using namespace mozilla::widget::android;
 #endif
- 
-@@ -2686,16 +2690,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2687,16 +2691,25 @@ nsDownload::SetState(DownloadState aStat
       nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
 
       // Master pref to control this function.
@ -245,15 +245,15 @@ 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
-               // retention policy, there's no reason to make the text clickable
+@@ -2724,19 +2737,20 @@ nsDownload::SetState(DownloadState aStat
               // because if it is, they'll click open the download manager and
               // the items they downloaded will have been removed.
               alerts->ShowAlertNotification(
                   NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
                   message, !removeWhenDone,
                   mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"),
-                   mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"), EmptyString());
+                   mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"),
+                   EmptyString(), nullptr);
 -            }
 +          }
         }
@ -2195,7 +2195,7 @@ 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
+@@ -45,17 +45,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
         'nsNativeAppSupportQt.cpp',
         'nsQAppInstance.cpp',
     ]
@ -2205,18 +2205,16 @@ diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
     ]
 elif CONFIG['MOZ_ENABLE_GTK']:
 +    EXPORTS += ['nsKDEUtils.h']
-     SOURCES += [
-        'nsNativeAppSupportUnix.cpp',
+     UNIFIED_SOURCES += [
 +        'nsKDEUtils.cpp',
-+        'nsNativeAppSupportUnix.cpp'
+         'nsNativeAppSupportUnix.cpp',
     ]
 else:
-     SOURCES += [
+     UNIFIED_SOURCES += [
         'nsNativeAppSupportDefault.cpp',
     ]
 
 if CONFIG['MOZ_X11']:
-     SOURCES += [
 diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp
 new file mode 100644
 --- /dev/null
@ -2617,7 +2615,7 @@ 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
+@@ -19,9 +19,10 @@ endif
 ifdef MOZ_ENABLE_DBUS
 LOCAL_INCLUDES   += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS)
 endif
@ -2631,22 +2629,22 @@ 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
-     ]
+@@ -81,17 +81,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
 else:
+     # These files can't be built in unified mode because they force NSPR logging.
     SOURCES += [
         osdir + '/nsOSHelperAppService.cpp',
     ]
 
 if CONFIG['MOZ_ENABLE_GTK']:
-     SOURCES += [
+     UNIFIED_SOURCES += [
 +        'unix/nsCommonRegistry.cpp',
         'unix/nsGNOMERegistry.cpp',
-+        'unix/nsKDERegistry.cpp',
+	'unix/nsKDERegistry.cpp',
         'unix/nsMIMEInfoUnix.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-     SOURCES += [
+     UNIFIED_SOURCES += [
         'android/nsAndroidHandlerApp.cpp',
         'android/nsExternalSharingAppService.cpp',
         'android/nsExternalURLHandlerService.cpp',
@ -3074,21 +3072,20 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
 diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in
 --- a/widget/gtk/Makefile.in
 +++ b/widget/gtk/Makefile.in
-@@ -26,11 +26,14 @@ DEFINES		+= -DCAIRO_GFX -DMOZ_APP_NAME='
+@@ -4,11 +4,13 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+ include $(topsrcdir)/config/rules.mk
+ 
+ CFLAGS          += $(MOZ_STARTUP_NOTIFICATION_CFLAGS)
+ CXXFLAGS        += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) \
+ 		               $(MOZ_STARTUP_NOTIFICATION_CFLAGS)
 
- INCLUDES	+= \
- 		-I$(srcdir)/../xpwidgets \
- 		-I$(srcdir)/../shared \
- 		-I$(topsrcdir)/layout/generic \
- 		-I$(topsrcdir)/layout/xul/base/src \
- 		-I$(topsrcdir)/other-licenses/atk-1.0 \
- 		$(NULL)
-+
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 +
- ifdef MOZ_X11
- INCLUDES   	+= -I$(srcdir)/../shared/x11
- endif
+ CFLAGS          += $(TK_CFLAGS)
+ CXXFLAGS        += $(TK_CFLAGS)
+ 
 diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
 --- a/widget/gtk/nsFilePicker.cpp
 +++ b/widget/gtk/nsFilePicker.cpp
@ -3098,7 +3095,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
- #include "mozilla/Util.h"
+ #include "mozilla/Types.h"
 
 #include <gtk/gtk.h>
 +#include <gdk/gdkx.h>
@ -3527,7 +3524,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
   bool isTablet = false;
   if (mozilla::AndroidBridge::Bridge()) {
     mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build$VERSION", "RELEASE", osVersion);
-     isTablet = mozilla::AndroidBridge::Bridge()->IsTablet();
+     isTablet = mozilla::widget::android::GeckoAppShell::IsTablet();
   }
 +  desktop = NS_LITERAL_STRING("android");
 #endif
@ -3586,14 +3583,13 @@ 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
- include $(topsrcdir)/config/rules.mk
+@@ -1,8 +1,8 @@
+ # 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
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
- ifeq ($(OS_ARCH),Linux)
- ifneq (,$(findstring lib64,$(libdir)))
- DEFINES     += -DHAVE_USR_LIB64_DIR
- endif
- endif
+ MOZILLA_INTERNAL_API = 1
+ include $(topsrcdir)/config/rules.mk
 
 -LOCAL_INCLUDES	+= -I..
 +LOCAL_INCLUDES	+= -I.. -I$(topsrcdir)/toolkit/xre
@ -3618,7 +3614,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
+@@ -1811,46 +1812,52 @@ nsLocalFile::SetPersistentDescriptor(con
     return InitWithNativePath(aPersistentDescriptor);
 #endif
 }
@ -3637,6 +3633,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
     if (NS_FAILED(IsDirectory(&isDirectory)))
         return NS_ERROR_FAILURE;
 
+    nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
     if (isDirectory) {
 -        if (giovfs)
 -            return giovfs->ShowURIForInput(mPath);
@ -3644,6 +3641,8 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 -            /* Fallback to GnomeVFS */
 -            return gnomevfs->ShowURIForInput(mPath);
 +        url = mPath;
+     } else if (giovfs && NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) {
+         return NS_OK;
     } else {
         nsCOMPtr<nsIFile> parentDir;
         nsAutoCString dirPath;
@ -3666,7 +3665,6 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 +      return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
 +    }
 +
-+    nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
 +    nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
 +    if (!giovfs && !gnomevfs)
 +      return NS_ERROR_FAILURE;
@ -3675,7 +3673,6 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 +      return giovfs->ShowURIForInput(url);
 +    else
 +      return gnomevfs->ShowURIForInput(url);
-+
 #elif defined(MOZ_WIDGET_COCOA)
     CFURLRef url;
     if (NS_SUCCEEDED(GetCFURL(&url))) {
@ -3684,7 +3681,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
       return rv;
     }
     return NS_ERROR_FAILURE;
-@@ -1773,16 +1781,23 @@ nsLocalFile::Reveal()
+@@ -1858,16 +1865,23 @@ nsLocalFile::Reveal()
     return NS_ERROR_FAILURE;
 #endif
 }
--- a/mozilla-ppc64le-build.patch
+++ b/mozilla-ppc64le-build.patch
--- a/mozilla-ppc64le-javascript.patch
+++ b/mozilla-ppc64le-javascript.patch
@ -0,0 +1,105 @@
+# HG changeset patch
+# Parent e6f9fc7c1611990ed9fdafd3ff19c79fd356a1d6
+# User Ulrich Weigand <uweigand@de.ibm.com>
+Bug 976648 - powerpc64le-linux support - JavaScript build/config
+
+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__) && ... */
--- a/mozilla-ppc64le-libffi.patch
+++ b/mozilla-ppc64le-libffi.patch
--- a/mozilla-ppc64le-mfbt.patch
+++ b/mozilla-ppc64le-mfbt.patch
@ -0,0 +1,47 @@
+# HG changeset patch
+# Parent 147a75fe8f8e4a43b66f9716659e1209d7f5a950
+# User Ulrich Weigand <uweigand@de.ibm.com>
+Bug 976648 - powerpc64le-linux support - mfbt endian config
+
+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__) || \
--- a/mozilla-ppc64le-webrtc.patch
+++ b/mozilla-ppc64le-webrtc.patch
@ -0,0 +1,42 @@
+# HG changeset patch
+# Parent acbe154db4c912f3ac853c0671cd3d5e52b1e716
+# User Ulrich Weigand <uweigand@de.ibm.com>
+Bug 976648 - powerpc64le-linux support - WebRTC endian config
+
+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
--- a/mozilla-ppc64le-xpcom.patch
+++ b/mozilla-ppc64le-xpcom.patch
@ -1,39 +1,17 @@
 # HG changeset patch
-# Parent 5f1384375f10a5f0ee7c8288adef9593822e4e68
+# Parent 571f8d1f1501d31bd7c0d0affdc7cdc8b21203a0
 # User Ulrich Weigand <uweigand@de.ibm.com>
-PPC64 LE support for XPCOM
+Bug 976648 - powerpc64le-linux support - xptcall port

-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':
+@@ -228,16 +228,23 @@ if CONFIG['OS_TEST'] == 'powerpc64':
     if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD'):
           SOURCES += [
+               'xptcinvoke_asm_ppc64_linux.s',
               'xptcinvoke_ppc64_linux.cpp',
+               'xptcstubs_asm_ppc64_linux.s',
               'xptcstubs_ppc64_linux.cpp',
           ]
 
@ -47,15 +25,15 @@ 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 += [
+             'xptcinvoke_asm_ppc_netbsd.s',
             'xptcinvoke_ppc_netbsd.cpp',
+             'xptcstubs_asm_ppc_netbsd.s',
             'xptcstubs_ppc_netbsd.cpp',
         ]
- 
- if CONFIG['OS_ARCH'] == 'OpenBSD' and CONFIG['OS_TEST'] == 'powerpc':
 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
 +++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s
-@@ -12,33 +12,51 @@
+@@ -12,90 +12,121 @@
 .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
@ -64,8 +42,17 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xp
 .set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
 .set f30,30; .set f31,31
 
+# The ABI defines a fixed stack frame area of 4 doublewords (ELFv2)
+# or 6 doublewords (ELFv1); the last of these doublewords is used
+# as TOC pointer save area.  The fixed area is followed by a parameter
+# save area of 8 doublewords (used for vararg routines), followed
+# by space for parameters passed on the stack.
+#
+# We set STACK_TOC to the offset of the TOC pointer save area, and
+# STACK_PARAMS to the offset of the first on-stack parameter.
+
 +#if _CALL_ELF == 2
-+#define STACK_TOC      28
+#define STACK_TOC      24
 +#define STACK_PARAMS   96
 +#else
 +#define STACK_TOC      40
@ -107,13 +94,21 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xp
         std     r31,-8(r1)
 
         mr      r29,r3                  # Save 'that' in r29
-@@ -51,51 +69,55 @@ NS_InvokeByIndex:
+         mr      r30,r4                  # Save 'methodIndex' in r30
+         mr      r31,r1                  # Save old frame
+ 
+         # Allocate stack frame with space for params. Since at least the
+         # first 7 parameters (not including 'that') will be in registers,
+         # we don't actually need stack space for those. We must ensure
         # 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)
+-        #  | ..128-byte stack frame.. |     | 7 GP | 13 FP | 3 NV |
+-        #  |               |(params)........| regs | regs  | regs |
+-        # (r1)...........(+112)....(+128)
+-        #                               (-23*8).(-16*8).(-3*8)..(r31)
+        #  | (fixed area + |                | 7 GP | 13 FP | 3 NV |
+        #  |  param. save) |(params)........| regs | regs  | regs |
+        # (r1)......(+STACK_PARAMS)...  (-23*8).(-16*8).(-3*8)..(r31)
 
         # +stack frame, -unused stack params, +regs storage, +1 for alignment
 -        addi    r7,r5,((112/8)-7+7+13+3+1)
@ -128,7 +123,9 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xp
         #                           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.
+-        # r7 (d) has to be r1+112 -- where parameters are passed on the stack.
+        # r7 (d) has to be r1+STACK_PARAMS
+        #        -- 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
@ -170,7 +167,7 @@ diff --git a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s b/xp
         ld      r7, -(20*8)(r31) 
         ld      r8, -(19*8)(r31) 
         ld      r9, -(18*8)(r31) 
-@@ -112,21 +134,25 @@ NS_InvokeByIndex:
+@@ -112,21 +143,25 @@ NS_InvokeByIndex:
         lfd     f9, -(8*8)(r31)
         lfd     f10, -(7*8)(r31)
         lfd     f11, -(6*8)(r31)
--- a/mozilla-ppc64le.patch
+++ b/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
--- a/mozilla-preferences.patch
+++ b/mozilla-preferences.patch
@ -5,18 +5,19 @@ confusion and therefore is currently the only setting we switch in the unbranded
 package unconditionally.

 # HG changeset patch
-# Parent 020571ebc3766a68f1e50780b910c51d1bb76087
+# Parent bf7f0353aa8e00b1deaa05b7cb84bb7ea4c9ce8f
+
 diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
 --- a/modules/libpref/src/init/all.js
 +++ b/modules/libpref/src/init/all.js
-@@ -1085,17 +1085,17 @@ pref("intl.charsetmenu.browser.unicode",
+@@ -1554,17 +1554,17 @@ pref("intl.charsetmenu.browser.more5",  
 pref("intl.charsetmenu.mailedit",           "chrome://global/locale/intl.properties");
 pref("intl.charsetmenu.browser.cache",      "");
 pref("intl.charsetmenu.mailview.cache",     "");
 pref("intl.charsetmenu.composer.cache",     "");
 pref("intl.charsetmenu.browser.cache.size", 5);
 pref("intl.charset.detector",               "chrome://global/locale/intl.properties");
- pref("intl.charset.default",                "chrome://global-platform/locale/intl.properties");
+ pref("intl.charset.fallback.override",      "");
 pref("intl.ellipsis",                       "chrome://global-platform/locale/intl.properties");
 -pref("intl.locale.matchOS",                 false);
 +pref("intl.locale.matchOS",                 true);
--- a/mozilla-repo.patch
+++ b/mozilla-repo.patch
@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent 8d013204e3f06811daf5156939452765fb3e10bb
+# Parent 9b45fd4b00c45014b17358158cdb51805c8ca327

 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
 --- a/toolkit/mozapps/installer/package-name.mk
@ -33,11 +33,11 @@ diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/install
 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
 --- a/toolkit/xre/Makefile.in
 +++ b/toolkit/xre/Makefile.in
-@@ -214,17 +214,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR
- endif
- endif
+@@ -39,17 +39,17 @@ TOOLKIT_EM_VERSION=$(shell $(PERL) $(top
+ # Valid if null: {warn,error}IfEmpty
+ DEFINES += -DTOOLKIT_EM_VERSION='"$(TOOLKIT_EM_VERSION)"'
 
- MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))
+ MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template='{node|short}\n' 2>/dev/null))
 ifdef MOZ_SOURCE_STAMP
 
   INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP)
--- a/mozilla-shared-nss-db.patch
+++ b/mozilla-shared-nss-db.patch
@ -7,13 +7,13 @@ References:
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -7999,16 +7999,31 @@ AC_SUBST(QCMS_LIBS)
- 
- dnl ========================================================
- dnl HarfBuzz
- dnl ========================================================
- MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)'
- AC_SUBST(MOZ_HARFBUZZ_LIBS)
+@@ -8042,16 +8042,31 @@ if test "$MOZ_ENABLE_SKIA"; then
+     MOZ_ENABLE_SKIA_GPU=1
+     AC_DEFINE(USE_SKIA_GPU)
+     AC_SUBST(MOZ_ENABLE_SKIA_GPU)
+   fi
+ fi
+ AC_SUBST(MOZ_ENABLE_SKIA)
 
 dnl ========================================================
 +dnl Check for nss-shared-helper
@ -31,26 +31,24 @@ diff --git a/configure.in b/configure.in
 +AC_SUBST(NSSHELPER_LIBS)
 +
 +dnl ========================================================
- dnl SIL Graphite
- dnl ========================================================
- MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)'
- AC_SUBST(MOZ_GRAPHITE_LIBS)
- 
- dnl ========================================================
- dnl OTS
+ dnl disable xul
 dnl ========================================================
+ MOZ_ARG_DISABLE_BOOL(xul,
+ [  --disable-xul           Disable XUL],
+     MOZ_XUL= )
+ if test "$MOZ_XUL"; then
+   AC_DEFINE(MOZ_XUL)
+ else
 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
--- a/security/manager/ssl/src/Makefile.in
+new file mode 100644
+--- /dev/null
 +++ b/security/manager/ssl/src/Makefile.in
-@@ -4,8 +4,11 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- DEFINES += \
-   -DNSS_ENABLE_ECC \
-   -DDLL_PREFIX=\"$(DLL_PREFIX)\" \
-   -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \
-   $(NULL)
+@@ -0,0 +1,8 @@
+#! gmake
+# 
+# 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
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 +
 +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS)
 +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS)
@ -81,7 +79,7 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsComponentManagerUtils.h"
 #include "nsDirectoryServiceDefs.h"
-@@ -1263,18 +1270,35 @@ nsNSSComponent::InitializeNSS(bool showW
+@@ -1207,18 +1214,35 @@ nsNSSComponent::InitializeNSS()
     ConfigureInternalPKCS11Token();
 
     // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@ -115,14 +113,14 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
     if (init_rv != SECSuccess) {
       PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get()));
 
-       if (suppressWarningPref) {
-         which_nss_problem = problem_none;
-       }
-       else {
+       // try to init r/o
+       init_flags |= NSS_INIT_READONLY;
+       init_rv = ::NSS_Initialize(profileStr.get(), "", "",
+                                  SECMOD_DB, init_flags);
 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
 --- a/toolkit/library/Makefile.in
 +++ b/toolkit/library/Makefile.in
-@@ -484,17 +484,17 @@ LOCAL_INCLUDES += -I$(topsrcdir)/intl/un
+@@ -245,17 +245,17 @@ endif
 ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 SDK_LIBRARY = $(IMPORT_LIBRARY)
 else
@ -140,4 +138,4 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
   -framework SystemConfiguration \
   -framework QTKit \
   -framework IOKit \
-   -F/System/Library/PrivateFrameworks -framework CoreUI \
+   -F$(MACOS_PRIVATE_FRAMEWORKS_DIR) -framework CoreUI \
--- a/source-stamp.txt
+++ b/source-stamp.txt
@ -1,2 +1,2 @@
-REV=0414e679f2ab
+REV=5f7c149b07ba
 REPO=http://hg.mozilla.org/releases/mozilla-release