- update to Firefox 25.0 (bnc#847708)

* rebased patches
  * requires NSS 3.15.2 or above
  * MFSA 2013-93/CVE-2013-5590/CVE-2013-5591/CVE-2013-5592
    Miscellaneous memory safety hazards
  * MFSA 2013-94/CVE-2013-5593 (bmo#868327)
    Spoofing addressbar through SELECT element
  * MFSA 2013-95/CVE-2013-5604 (bmo#914017)
    Access violation with XSLT and uninitialized data
  * MFSA 2013-96/CVE-2013-5595 (bmo#916580)
    Improperly initialized memory and overflows in some JavaScript
    functions
  * MFSA 2013-97/CVE-2013-5596 (bmo#910881)
    Writing to cycle collected object during image decoding
  * MFSA 2013-98/CVE-2013-5597 (bmo#918864)
    Use-after-free when updating offline cache
  * MFSA 2013-99/CVE-2013-5598 (bmo#920515)
    Security bypass of PDF.js checks using iframes
  * MFSA 2013-100/CVE-2013-5599/CVE-2013-5600/CVE-2013-5601
    (bmo#915210, bmo#915576, bmo#916685)
    Miscellaneous use-after-free issues found through ASAN fuzzing
  * MFSA 2013-101/CVE-2013-5602 (bmo#897678)
    Memory corruption in workers
  * MFSA 2013-102/CVE-2013-5603 (bmo#916404)
    Use-after-free in HTML document templates

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

MozillaFirefox.changes

@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Thu Oct 24 18:16:19 UTC 2013 - wr@rosenauer.org
+
+- update to Firefox 25.0 (bnc#847708)
+  * rebased patches
+  * requires NSS 3.15.2 or above
+  * MFSA 2013-93/CVE-2013-5590/CVE-2013-5591/CVE-2013-5592
+    Miscellaneous memory safety hazards
+  * MFSA 2013-94/CVE-2013-5593 (bmo#868327)
+    Spoofing addressbar through SELECT element
+  * MFSA 2013-95/CVE-2013-5604 (bmo#914017)
+    Access violation with XSLT and uninitialized data
+  * MFSA 2013-96/CVE-2013-5595 (bmo#916580)
+    Improperly initialized memory and overflows in some JavaScript
+    functions
+  * MFSA 2013-97/CVE-2013-5596 (bmo#910881)
+    Writing to cycle collected object during image decoding
+  * MFSA 2013-98/CVE-2013-5597 (bmo#918864)
+    Use-after-free when updating offline cache
+  * MFSA 2013-99/CVE-2013-5598 (bmo#920515)
+    Security bypass of PDF.js checks using iframes
+  * MFSA 2013-100/CVE-2013-5599/CVE-2013-5600/CVE-2013-5601
+    (bmo#915210, bmo#915576, bmo#916685)
+    Miscellaneous use-after-free issues found through ASAN fuzzing
+  * MFSA 2013-101/CVE-2013-5602 (bmo#897678)
+    Memory corruption in workers
+  * MFSA 2013-102/CVE-2013-5603 (bmo#916404)
+    Use-after-free in HTML document templates
+
 -------------------------------------------------------------------
 Tue Sep 24 07:31:30 UTC 2013 - wr@rosenauer.org
 

MozillaFirefox.spec

@@ -17,7 +17,7 @@
 #
 
 
-%define major 24
+%define major 25
 %define mainver %major.0
 %define update_channel release
 
@@ -50,8 +50,8 @@ BuildRequires:  libproxy-devel
 %else
 BuildRequires:  wireless-tools
 %endif
-BuildRequires:  mozilla-nspr-devel >= 4.10
+BuildRequires:  mozilla-nspr-devel >= 4.10.1
-BuildRequires:  mozilla-nss-devel >= 3.15.1
+BuildRequires:  mozilla-nss-devel >= 3.15.2
 BuildRequires:  nss-shared-helper-devel
 %if %suse_version > 1210
 BuildRequires:  pkgconfig(gstreamer-%gstreamer_ver)
@@ -63,7 +63,7 @@ Recommends:     gstreamer-0_10-plugins-ffmpeg
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2013091200
+%define         releasedate 2013102400
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser

_constraints

@@ -5,7 +5,7 @@
       <size unit="G">9</size>
     </disk>
     <memory>
-      <size unit="M">3500</size>
+      <size unit="M">3800</size>
     </memory>
   </hardware>
 </constraints>

compare-locales.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c8e6c204cd5aed68fc6a290f26f44980c5d9cece37eba8f5c0f8ce971f10068
+oid sha256:a2dc72bf30a7defc9046866286cce2ca2f5d255248d3625d6c6a23bfc91420ca
-size 29932
+size 29959

create-tar.sh

@@ -2,8 +2,8 @@
 
 CHANNEL="release"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_24_0_RELEASE"
+RELEASE_TAG="FIREFOX_25_0_RELEASE"
-VERSION="24.0"
+VERSION="25.0"
 
 # mozilla
 if [ -d mozilla ]; then

firefox-24.0-source.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a174f14e75774211548510c9e91f40b74c25ca3a013cd64e62138fef96688a15
-size 121150373

firefox-25.0-source.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3debc8f5e6f92abb2d38644ad0b302c91d518827729e49340ef64053180d24b7
+size 128652118

firefox-browser-css.patch

@@ -9,15 +9,15 @@ https://bugzilla.novell.com/show_bug.cgi?id=561027
 diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
 --- a/browser/themes/linux/browser.css
 +++ b/browser/themes/linux/browser.css
-@@ -1026,16 +1026,30 @@ toolbar[iconsize="small"] #feed-button {
+@@ -980,16 +980,30 @@ toolbar[iconsize="small"] #webrtc-status
- 
- #urlbar-display {
    margin-top: 0;
    margin-bottom: 0;
    -moz-margin-start: 0;
    color: GrayText;
  }
  
+ %include ../shared/identity-block.inc.css
+ 
 +#PopupAutoCompleteRichResult .autocomplete-richlistitem {
 +  background-color: -moz-Field !important;
 +}
@@ -32,11 +32,11 @@ diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
 +  color: -moz-Fieldtext !important;
 +}
 +
- /* Favicon */
  #page-proxy-favicon {
-   width: 16px;
-   height: 16px;
    margin-top: 2px;
    margin-bottom: 2px;
    -moz-margin-start: 4px;
    -moz-margin-end: 3px;
+   -moz-image-region: rect(0, 16px, 16px, 0);
+ }
+ 

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,1097 @@
+@@ -0,0 +1,1161 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -292,6 +292,63 @@ new file mode 100644
 +
 +    <menupopup id="placesContext"/>
 +
++    <!-- Popup for site identity information -->
++    <panel id="identity-popup"
++           type="arrow"
++           hidden="true"
++           noautofocus="true"
++           consumeoutsideclicks="true"
++           onpopupshown="if (event.target == this)
++                           gIdentityHandler.onPopupShown(event);"
++           orient="vertical"
++           level="top">
++      <hbox id="identity-popup-container" align="top">
++        <image id="identity-popup-icon"/>
++        <vbox id="identity-popup-content-box">
++          <label id="identity-popup-brandName"
++                 class="identity-popup-label"
++                 value="&brandFullName;"/>
++          <label id="identity-popup-chromeLabel"
++                 class="identity-popup-label"/>
++          <label id="identity-popup-connectedToLabel"
++                 class="identity-popup-label"
++                 value="&identity.connectedTo;"/>
++          <label id="identity-popup-connectedToLabel2"
++                 class="identity-popup-label"
++                 value="&identity.unverifiedsite2;"/>
++          <description id="identity-popup-content-host"
++                       class="identity-popup-description"/>
++          <label id="identity-popup-runByLabel"
++                 class="identity-popup-label"
++                 value="&identity.runBy;"/>
++          <description id="identity-popup-content-owner"
++                       class="identity-popup-description"/>
++          <description id="identity-popup-content-supplemental"
++                       class="identity-popup-description"/>
++          <description id="identity-popup-content-verifier"
++                       class="identity-popup-description"/>
++          <hbox id="identity-popup-encryption" flex="1">
++            <vbox>
++              <image id="identity-popup-encryption-icon"/>
++            </vbox>
++            <description id="identity-popup-encryption-label" flex="1"
++                         class="identity-popup-description"/>
++          </hbox>
++          <vbox id="identity-popup-permissions">
++            <separator class="thin"/>
++            <label class="identity-popup-label header"
++                   value="&identity.permissions;"/>
++            <vbox id="identity-popup-permission-list" class="indent"/>
++          </vbox>
++        </vbox>
++      </hbox>
++      <!-- Footer button to open security page info -->
++      <hbox id="identity-popup-button-container" pack="end">
++        <button id="identity-popup-more-info-button"
++                label="&identity.moreInfoLinkText;"
++                oncommand="gIdentityHandler.handleMoreInfoClick(event);"/>
++      </hbox>
++    </panel>
 +
 +    <panel id="ctrlTab-panel" class="KUI-panel" hidden="true" norestorefocus="true" level="top">
 +      <hbox>
@@ -974,7 +1031,6 @@ new file mode 100644
 +                  contentcontextmenu="contentAreaContextMenu"
 +                  autocompletepopup="PopupAutoComplete"/>
 +      <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/>
-+      <statuspanel id="statusbar-display" inactive="true"/>
 +    </vbox>
 +    <splitter id="social-sidebar-splitter"
 +              class="chromeclass-extrachrome sidebar-splitter"
@@ -999,16 +1055,24 @@ new file mode 100644
 +    <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
 +      <vbox id="full-screen-warning-message" align="center">
 +        <description id="full-screen-domain-text"/>
-+        <description class="full-screen-description" value="&fullscreenExitHint.value;"/>
++        <description class="full-screen-description" value="&fullscreenExitHint2.value;"/>
 +        <vbox id="full-screen-approval-pane" align="center">
-+          <description class="full-screen-description" value="&fullscreenApproval.value;"/>
 +          <hbox>
++#ifndef XP_UNIX
++            <button label="&fullscreenExitButton.label;"
++                    oncommand="FullScreen.setFullscreenAllowed(false);"
++                    class="full-screen-approval-button"/>
++            <button label="&fullscreenAllowButton.label;"
++                    oncommand="FullScreen.setFullscreenAllowed(true);"
++                    class="full-screen-approval-button"/>
++#else
 +            <button label="&fullscreenAllowButton.label;"
 +                    oncommand="FullScreen.setFullscreenAllowed(true);"
 +                    class="full-screen-approval-button"/>
 +            <button label="&fullscreenExitButton.label;"
 +                    oncommand="FullScreen.setFullscreenAllowed(false);"
 +                    class="full-screen-approval-button"/>
++#endif
 +          </hbox>
 +          <checkbox id="full-screen-remember-decision"/>
 +        </vbox>
@@ -1103,7 +1167,7 @@ new file mode 100644
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -53,16 +53,18 @@ browser.jar:
+@@ -52,16 +52,18 @@ browser.jar:
          content/browser/abouthealthreport/abouthealth.css     (content/abouthealthreport/abouthealth.css)
  #endif
          content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
@@ -1208,7 +1272,7 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/pre
      // when the user will select the default.  We refresh here periodically
      // in case the default changes.  On other Windows OS's defaults can also
      // be set while the prefs are open.
-@@ -857,14 +863,25 @@ var gAdvancedPane = {
+@@ -860,14 +866,25 @@ var gAdvancedPane = {
     * Set browser as the operating system default browser.
     */
    setDefaultBrowser: function()
@@ -1237,7 +1301,7 @@ 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
-@@ -17,10 +17,12 @@ DISABLED_EXTRA_COMPONENTS = nsSetDefault
+@@ -16,10 +16,12 @@ USE_STATIC_LIBS = 1
  
  include $(topsrcdir)/config/rules.mk
  
@@ -1686,7 +1750,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
-@@ -601,19 +601,21 @@
+@@ -606,19 +606,21 @@
  @BINPATH@/defaults/autoconfig/prefcalls.js
  @BINPATH@/browser/defaults/profile/prefs.js
  

firefox-no-default-ualocale.patch

@@ -1,14 +1,14 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent fd73fd56ea00523bcdca2ad4be06d3640888fd58
+# Parent 4ecbbda17c2a7a8f62beb568ab838b45beaaf36a
 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
-@@ -207,17 +207,17 @@ pref("extensions.{972ce4c6-7e08-4474-a28
+@@ -215,17 +215,17 @@ pref("extensions.{972ce4c6-7e08-4474-a28
+ 
  pref("xpinstall.whitelist.add", "addons.mozilla.org");
- pref("xpinstall.whitelist.add.36", "getpersonas.com");
  pref("xpinstall.whitelist.add.180", "marketplace.firefox.com");
  
  pref("lightweightThemes.update.enabled", true);

l10n-24.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:24fc998614aaf84100408227edb318398d367bafc36ac3cb92ef364e6e4a2faa
-size 54632958

l10n-25.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:98627eaa30aabc79aecdbbba9ef72222ef0352176908e07e9ca28f6c6ca8d479
+size 54788025

mozilla-arm-disable-edsp.patch

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

mozilla-kde.patch

@@ -26,7 +26,7 @@ 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
-@@ -23,16 +23,17 @@
+@@ -24,16 +24,17 @@
  #include "nsIStringEnumerator.h"
  #include "nsIZipReader.h"
  #include "nsPrefBranch.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"
  
-@@ -972,16 +973,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 
+@@ -973,16 +974,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;
-@@ -997,17 +1016,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -998,17 +1017,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);
-@@ -1101,28 +1120,40 @@ static nsresult pref_InitInitialObjects(
+@@ -1102,28 +1121,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,18 +184,22 @@ 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
-@@ -23,9 +23,11 @@ ifndef MOZ_SUITE
+@@ -11,13 +11,15 @@ VPATH = @srcdir@
- DISABLED_EXTRA_COMPONENTS = \
+ include $(DEPTH)/config/autoconf.mk
-   nsDownloadManagerUI.js \
+ 
-   nsDownloadManagerUI.manifest \
+ LIBRARY_NAME = download_s
-   $(NULL)
+ LIBXUL_LIBRARY = 1
- endif
+ FAIL_ON_WARNINGS = 1
  
  include $(topsrcdir)/config/rules.mk
  
-+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 +
- CXXFLAGS += $(TK_CFLAGS)
+ CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI
+ 
+ LOCAL_INCLUDES += \
+   -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
@@ -2624,12 +2628,12 @@ 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
-@@ -86,9 +86,10 @@ EXTRA_COMPONENTS = \
+@@ -77,9 +77,10 @@ endif
- # we don't want the shared lib, but we want to force the creation of a static lib.
+ endif
- FORCE_STATIC_LIB = 1
+ 
  include $(topsrcdir)/config/config.mk
- include $(topsrcdir)/ipc/chromium/chromium-config.mk
  include $(topsrcdir)/config/rules.mk
+ include $(topsrcdir)/ipc/chromium/chromium-config.mk
  
  ifneq (,$(filter qt gtk2 gtk3, $(MOZ_WIDGET_TOOLKIT)))
  CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
@@ -3083,7 +3087,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
 diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
 --- a/widget/gtk2/Makefile.in
 +++ b/widget/gtk2/Makefile.in
-@@ -67,11 +67,14 @@ DEFINES		+= -DCAIRO_GFX -DMOZ_APP_NAME='
+@@ -68,11 +68,14 @@ DEFINES		+= -DCAIRO_GFX -DMOZ_APP_NAME='
  
  INCLUDES	+= \
  		-I$(srcdir)/../xpwidgets \
@@ -3101,7 +3105,7 @@ diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
 diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
 --- a/widget/gtk2/nsFilePicker.cpp
 +++ b/widget/gtk2/nsFilePicker.cpp
-@@ -1,31 +1,33 @@
+@@ -1,32 +1,34 @@
  /* -*- 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
@@ -3112,6 +3116,7 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
  #include <gtk/gtk.h>
 +#include <gdk/gdkx.h>
  
+ #include "nsGtkUtils.h"
  #include "nsIFileURL.h"
  #include "nsIURI.h"
  #include "nsIWidget.h"
@@ -3135,7 +3140,7 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
  using namespace mozilla;
  
  #define MAX_PREVIEW_SIZE 180
-@@ -242,17 +244,19 @@ nsFilePicker::AppendFilters(int32_t aFil
+@@ -232,17 +234,19 @@ nsFilePicker::AppendFilters(int32_t aFil
    return nsBaseFilePicker::AppendFilters(aFilterMask);
  }
  
@@ -3156,7 +3161,7 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
  
    mFilters.AppendElement(filter);
    mFilterNames.AppendElement(name);
-@@ -366,16 +370,32 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -356,16 +360,32 @@ nsFilePicker::Show(int16_t *aReturn)
  
  NS_IMETHODIMP
  nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
@@ -3189,7 +3194,7 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
  
    GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
    const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-@@ -567,8 +587,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -553,8 +573,235 @@ nsFilePicker::Done(GtkWidget* file_choos
    if (mCallback) {
      mCallback->Done(result);
      mCallback = nullptr;
@@ -3449,13 +3454,13 @@ diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h
 diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
 --- a/xpcom/components/Makefile.in
 +++ b/xpcom/components/Makefile.in
-@@ -28,9 +28,10 @@ LOCAL_INCLUDES	= \
+@@ -23,9 +23,10 @@ LOCAL_INCLUDES	= \
- FORCE_STATIC_LIB = 1
+ 	-I$(topsrcdir)/chrome/src \
+ 	-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
@@ -3594,8 +3599,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
-@@ -43,17 +43,17 @@ include $(topsrcdir)/ipc/chromium/chromi
+@@ -26,17 +26,17 @@ include $(topsrcdir)/config/rules.mk
- DEFINES		+= -D_IMPL_NS_COM
+ include $(topsrcdir)/ipc/chromium/chromium-config.mk
  
  ifeq ($(OS_ARCH),Linux)
  ifneq (,$(findstring lib64,$(libdir)))

mozilla-ppc.patch

@@ -2,7 +2,6 @@
 # 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
@@ -89,25 +88,3 @@ 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-shared-nss-db.patch

@@ -7,7 +7,7 @@ References:
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8330,16 +8330,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8289,16 +8289,31 @@ AC_SUBST(QCMS_LIBS)
  
  dnl ========================================================
  dnl HarfBuzz
@@ -83,7 +83,7 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
  #include "nsComponentManagerUtils.h"
  #include "nsDirectoryServiceDefs.h"
  #include "nsICertOverrideService.h"
-@@ -1132,18 +1139,34 @@ nsNSSComponent::InitializeNSS(bool showW
+@@ -1144,18 +1151,34 @@ nsNSSComponent::InitializeNSS(bool showW
      ConfigureInternalPKCS11Token();
  
      // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@@ -123,15 +123,15 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
 --- a/toolkit/library/Makefile.in
 +++ b/toolkit/library/Makefile.in
-@@ -490,17 +490,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
+@@ -490,17 +490,17 @@ ifneq (,$(or $(filter 1400,$(_MSC_VER)),
+ ifdef MOZ_DEBUG
+ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
  endif
  endif
  endif
  
  EXTRA_DSO_LDOPTS += $(LIBS_DIR)
  
- DEFINES += -DIMPL_XREAPI
- 
 -EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB)
 +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS)
  

mozilla-sle11.patch

@@ -2,9 +2,9 @@ Subject: Patches needed to build on SLE11/11.1
 References:
 https://bugzilla.mozilla.org/show_bug.cgi?id=513422
 
-diff --git a/xpcom/glue/SSE.cpp b/xpcom/glue/SSE.cpp
+diff --git a/mozglue/build/SSE.cpp b/mozglue/build/SSE.cpp
---- a/xpcom/glue/SSE.cpp
+--- a/mozglue/build/SSE.cpp
-+++ b/xpcom/glue/SSE.cpp
++++ b/mozglue/build/SSE.cpp
 @@ -12,26 +12,77 @@ namespace {
  // SSE.h has parallel #ifs which declare MOZILLA_SSE_HAVE_CPUID_DETECTION.
  // We can't declare these functions in the header file, however, because

source-stamp.txt

@@ -1,2 +1,2 @@
-REV=7c3b0732e765
+REV=de08ee190ca3
 REPO=http://hg.mozilla.org/releases/mozilla-release