--- a/MozillaFirefox/MozillaFirefox.changes Sat Oct 05 22:39:27 2013 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes Thu Oct 24 20:13:14 2013 +0200
@@ -1,7 +1,8 @@
-------------------------------------------------------------------
-Sat Oct 5 20:37:57 UTC 2013 - wr@rosenauer.org
-
-- update to Firefox 25.0b4
+Mon Oct 14 22:03:34 UTC 2013 - wr@rosenauer.org
+
+- update to Firefox 25.0b5
+ * rebased patches
-------------------------------------------------------------------
Tue Sep 24 07:31:30 UTC 2013 - wr@rosenauer.org
--- a/MozillaFirefox/MozillaFirefox.spec Sat Oct 05 22:39:27 2013 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec Thu Oct 24 20:13:14 2013 +0200
@@ -18,7 +18,7 @@
%define major 24
-%define mainver %major.0.99
+%define mainver %major.99
%define update_channel beta
%if %suse_version > 1220
@@ -63,7 +63,7 @@
%endif
Version: %{mainver}
Release: 0
-%define releasedate 2013100400
+%define releasedate 2013101400
Provides: firefox = %{mainver}
Provides: firefox = %{version}-%{release}
Provides: web_browser
--- a/MozillaFirefox/create-tar.sh Sat Oct 05 22:39:27 2013 +0200
+++ b/MozillaFirefox/create-tar.sh Thu Oct 24 20:13:14 2013 +0200
@@ -2,7 +2,7 @@
CHANNEL="beta"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_25_04_RELEASE"
+RELEASE_TAG="FIREFOX_25_0b7_RELEASE"
VERSION="24.99"
# mozilla
--- a/firefox-browser-css.patch Sat Oct 05 22:39:27 2013 +0200
+++ b/firefox-browser-css.patch Thu Oct 24 20:13:14 2013 +0200
@@ -9,15 +9,15 @@
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 {
-
- #urlbar-display {
+@@ -980,16 +980,30 @@ toolbar[iconsize="small"] #webrtc-status
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 @@
+ 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);
+ }
+
--- a/firefox-kde.patch Sat Oct 05 22:39:27 2013 +0200
+++ b/firefox-kde.patch Thu Oct 24 20:13:14 2013 +0200
@@ -2,7 +2,7 @@
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 @@
+
+ <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 @@
+ 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 @@
+ <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 @@
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 @@
// 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/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 @@
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
--- a/firefox-no-default-ualocale.patch Sat Oct 05 22:39:27 2013 +0200
+++ b/firefox-no-default-ualocale.patch Thu Oct 24 20:13:14 2013 +0200
@@ -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);
--- a/mozilla-arm-disable-edsp.patch Sat Oct 05 22:39:27 2013 +0200
+++ b/mozilla-arm-disable-edsp.patch Thu Oct 24 20:13:14 2013 +0200
@@ -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
---- a/xpcom/glue/arm.h
-+++ b/xpcom/glue/arm.h
-@@ -143,17 +143,17 @@ namespace mozilla {
- extern bool NS_COM_GLUE neon_enabled;
+diff --git a/mozglue/build/arm.h b/mozglue/build/arm.h
+--- a/mozglue/build/arm.h
++++ b/mozglue/build/arm.h
+@@ -116,17 +116,17 @@ namespace mozilla {
+ extern bool MFBT_DATA neon_enabled;
#endif
#endif
}
--- a/mozilla-kde.patch Sat Oct 05 22:39:27 2013 +0200
+++ b/mozilla-kde.patch Thu Oct 24 20:13:14 2013 +0200
@@ -26,7 +26,7 @@
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 @@
#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 @@
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 @@
{
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/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
- DISABLED_EXTRA_COMPONENTS = \
- nsDownloadManagerUI.js \
- nsDownloadManagerUI.manifest \
- $(NULL)
- endif
+@@ -11,13 +11,15 @@ VPATH = @srcdir@
+ include $(DEPTH)/config/autoconf.mk
+
+ LIBRARY_NAME = download_s
+ LIBXUL_LIBRARY = 1
+ 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 @@
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 = \
- # we don't want the shared lib, but we want to force the creation of a static lib.
- FORCE_STATIC_LIB = 1
+@@ -77,9 +77,10 @@ endif
+ endif
+
include $(topsrcdir)/config/config.mk
+ include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
- include $(topsrcdir)/config/rules.mk
ifneq (,$(filter qt gtk2 gtk3, $(MOZ_WIDGET_TOOLKIT)))
CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
@@ -3083,7 +3087,7 @@
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/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 @@
#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+ #include "nsGtkUtils.h"
#include "nsIFileURL.h"
#include "nsIURI.h"
#include "nsIWidget.h"
@@ -3135,7 +3140,7 @@
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 @@
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 @@
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/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 = \
- FORCE_STATIC_LIB = 1
+@@ -23,9 +23,10 @@ LOCAL_INCLUDES = \
+ -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/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
- DEFINES += -D_IMPL_NS_COM
+@@ -26,17 +26,17 @@ include $(topsrcdir)/config/rules.mk
+ include $(topsrcdir)/ipc/chromium/chromium-config.mk
ifeq ($(OS_ARCH),Linux)
ifneq (,$(findstring lib64,$(libdir)))
--- a/mozilla-ppc.patch Sat Oct 05 22:39:27 2013 +0200
+++ b/mozilla-ppc.patch Thu Oct 24 20:13:14 2013 +0200
@@ -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 @@
/*
* 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
--- a/mozilla-shared-nss-db.patch Sat Oct 05 22:39:27 2013 +0200
+++ b/mozilla-shared-nss-db.patch Thu Oct 24 20:13:14 2013 +0200
@@ -7,7 +7,7 @@
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 @@
#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/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)
--- a/mozilla-sle11.patch Sat Oct 05 22:39:27 2013 +0200
+++ b/mozilla-sle11.patch Thu Oct 24 20:13:14 2013 +0200
@@ -2,9 +2,9 @@
References:
https://bugzilla.mozilla.org/show_bug.cgi?id=513422
-diff --git a/xpcom/glue/SSE.cpp b/xpcom/glue/SSE.cpp
---- a/xpcom/glue/SSE.cpp
-+++ b/xpcom/glue/SSE.cpp
+diff --git a/mozglue/build/SSE.cpp b/mozglue/build/SSE.cpp
+--- a/mozglue/build/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