# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1453628206 -3600
# Node ID 91466ca5c8d9beaf88a61fca48694a4e075f22f9
# Parent  44a28160de40f5c251f87d17aff56a14fa697c23# Parent  4d8912c4a729a3828e9c43b7b098b22534ac9d74
latest merge from firefox43
final 44.0b9 preparation

diff -r 4d8912c4a729 -r 91466ca5c8d9 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Mon Jan 11 20:55:10 2016 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Sun Jan 24 10:36:46 2016 +0100
@@ -1,7 +1,11 @@
 -------------------------------------------------------------------
-Mon Jan 11 19:52:50 UTC 2016 - wr@rosenauer.org
-
+Sun Jan 24 09:33:15 UTC 2016 - wr@rosenauer.org
+
+- update to Firefox 44.0b9
+  * requires NSPR 4.11
+  * requires NSS 3.21
 - prepare mozilla-kde.patch for Gtk3 builds
+- rebased patches
 
 -------------------------------------------------------------------
 Mon Jan 11 08:04:24 UTC 2016 - astieger@suse.com
diff -r 4d8912c4a729 -r 91466ca5c8d9 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Mon Jan 11 20:55:10 2016 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Sun Jan 24 10:36:46 2016 +0100
@@ -19,9 +19,9 @@
 
 # changed with every update
 %define major 43
-%define mainver %major.0.4
-%define update_channel release
-%define releasedate 2016010600
+%define mainver %major.99
+%define update_channel beta
+%define releasedate 2016012300
 
 # general build definitions
 %if "%{update_channel}" != "aurora"
@@ -77,8 +77,8 @@
 BuildRequires:  libnotify-devel
 BuildRequires:  libproxy-devel
 BuildRequires:  makeinfo
-BuildRequires:  mozilla-nspr-devel >= 4.10.10
-BuildRequires:  mozilla-nss-devel >= 3.20.2
+BuildRequires:  mozilla-nspr-devel >= 4.11
+BuildRequires:  mozilla-nss-devel >= 3.21
 BuildRequires:  nss-shared-helper-devel
 BuildRequires:  python-devel
 BuildRequires:  startup-notification-devel
diff -r 4d8912c4a729 -r 91466ca5c8d9 MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Mon Jan 11 20:55:10 2016 +0100
+++ b/MozillaFirefox/create-tar.sh	Sun Jan 24 10:36:46 2016 +0100
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-CHANNEL="release"
+CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_43_0_4_RELEASE"
-VERSION="43.0.4"
+RELEASE_TAG="FIREFOX_44_0b9_RELEASE"
+VERSION="43.99"
 
 # mozilla
 if [ -d mozilla ]; then
diff -r 4d8912c4a729 -r 91466ca5c8d9 firefox-branded-icons.patch
--- a/firefox-branded-icons.patch	Mon Jan 11 20:55:10 2016 +0100
+++ b/firefox-branded-icons.patch	Sun Jan 24 10:36:46 2016 +0100
@@ -1,6 +1,6 @@
 # HG changeset patch
 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de
-# Parent  dbca8a673de340999f67eb321169b44cc4109faf
+# Parent  e10e9bf6ab3a74655998bd0286d248f5d17a601a
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
@@ -21,12 +21,12 @@
 +endif
  endif
  
- ifndef LIBXUL_SDK
  # channel-prefs.js is handled separate from other prefs due to bug 756325
  libs:: $(srcdir)/profile/channel-prefs.js
  	$(NSINSTALL) -D $(DIST)/bin/defaults/pref
  	$(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
- endif
+ 
+ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild
 --- a/browser/branding/branding-common.mozbuild
 +++ b/browser/branding/branding-common.mozbuild
@@ -49,7 +49,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
-@@ -669,18 +669,21 @@
+@@ -670,18 +670,21 @@
  @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
  @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
  @RESPATH@/chrome/toolkit@JAREXT@
@@ -70,4 +70,4 @@
  @RESPATH@/browser/chrome/webide.manifest
  @RESPATH@/browser/@PREF_DIR@/webide-prefs.js
  
- ; shell icons
+ ; DevTools
diff -r 4d8912c4a729 -r 91466ca5c8d9 firefox-kde.patch
--- a/firefox-kde.patch	Mon Jan 11 20:55:10 2016 +0100
+++ b/firefox-kde.patch	Sun Jan 24 10:36:46 2016 +0100
@@ -1,11 +1,11 @@
 # HG changeset patch
-# Parent  3fedb882f767b2e4ff72ef972a9cce4c5d1af4af
+# Parent  77c3bdc27160dfa96aa4b3288c7f12a72f273967
 
 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1222 @@
+@@ -0,0 +1,1250 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -16,7 +16,7 @@
 +
 +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
-+<?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?>
++<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUIOverlay.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
@@ -170,6 +170,7 @@
 +         popuponly menulist to be its immediate parent. -->
 +    <menulist popuponly="true" id="ContentSelectDropdown" hidden="true">
 +      <menupopup rolluponmousewheel="true"
++                 activateontab="true"
 +#ifdef XP_WIN
 +                 consumeoutsideclicks="false" ignorekeys="handled"
 +#endif
@@ -683,7 +684,7 @@
 +
 +      <hbox id="nav-bar-customization-target" flex="1">
 +        <toolbaritem id="urlbar-container" flex="400" persist="width"
-+                     title="&locationItem.title;" removable="false"
++                     removable="false"
 +                     class="chromeclass-location" overflows="false">
 +          <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
 +                         label="&backCmd.label;"
@@ -718,28 +719,50 @@
 +                     onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
 +                     onblur="setTimeout(() => { document.getElementById('identity-box').style.MozUserFocus = ''; }, 0);">
 +              <box id="notification-popup-box" hidden="true" align="center">
-+                <image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
++                <image id="default-notification-icon" class="notification-anchor-icon" role="button"
++                       aria-label="&urlbar.defaultNotificationAnchor.label;"/>
++                <!-- NB: the identity-notification-icon is used for persona-based auth and preffed
++                     off by default. It hasn't been updated for some time and liable to being
++                     removed.-->
 +                <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="push-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="login-fill-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="webRTC-sharingScreen-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="translate-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="translated-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="eme-notification-icon" class="notification-anchor-icon" role="button"/>
++                <image id="geo-notification-icon" class="notification-anchor-icon" role="button"
++                       aria-label="&urlbar.geolocationNotificationAnchor.label;"/>
++                <image id="addons-notification-icon" class="notification-anchor-icon" role="button"
++                       aria-label="&urlbar.addonsNotificationAnchor.label;"/>
++                <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"
++                       aria-label="&urlbar.indexedDBNotificationAnchor.label;"/>
++                <image id="login-fill-notification-icon" class="notification-anchor-icon" role="button"
++                       aria-label="&urlbar.loginFillNotificationAnchor.label;"/>
++                <image id="password-notification-icon" class="notification-anchor-icon" role="button"
++                       aria-label="&urlbar.passwordNotificationAnchor.label;"/>
++                <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"
++                       aria-label="&urlbar.webappsNotificationAnchor.label;"/>
++                <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"
++                       aria-label="&urlbar.pluginsNotificationAnchor.label;"/>
++                <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"
++                       aria-label="&urlbar.webNotsNotificationAnchor.label;"/>
++                <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"
++                       aria-label="&urlbar.webRTCShareDevicesNotificationAnchor.label;"/>
++                <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"
++                       aria-label="&urlbar.webRTCSharingDevicesNotificationAnchor.label;"/>
++                <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon" role="button"
++                       aria-label="&urlbar.webRTCShareMicrophoneNotificationAnchor.label;"/>
++                <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon" role="button"
++                       aria-label="&urlbar.webRTCSharingMicrophoneNotificationAnchor.label;"/>
++                <image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon" role="button"
++                       aria-label="&urlbar.webRTCShareScreenNotificationAnchor.label;"/>
++                <image id="webRTC-sharingScreen-notification-icon" class="notification-anchor-icon" role="button"
++                       aria-label="&urlbar.webRTCSharingScreenNotificationAnchor.label;"/>
++                <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"
++                       aria-label="&urlbar.pointerLockNotificationAnchor.label;"/>
++                <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"
++                       aria-label="&urlbar.servicesNotificationAnchor.label;"/>
++                <image id="translate-notification-icon" class="notification-anchor-icon" role="button"
++                       aria-label="&urlbar.translateNotificationAnchor.label;"/>
++                <image id="translated-notification-icon" class="notification-anchor-icon" role="button"
++                       aria-label="&urlbar.translatedNotificationAnchor.label;"/>
++                <image id="eme-notification-icon" class="notification-anchor-icon" role="button"
++                       aria-label="&urlbar.emeNotificationAnchor.label;"/>
 +              </box>
 +              <!-- Use onclick instead of normal popup= syntax since the popup
 +                   code fires onmousedown, and hence eats our favicon drag events.
@@ -747,6 +770,7 @@
 +                   has focus, otherwise pressing F6 focuses it instead of the location bar -->
 +              <box id="identity-box" role="button"
 +                   align="center"
++                   aria-label="&urlbar.viewSiteInfo.label;"
 +                   onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
 +                   onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
 +                   ondragstart="gIdentityHandler.onDragStart(event);">
@@ -776,6 +800,10 @@
 +                       hidden="true"
 +                       onclick="ReaderParent.buttonClick(event);"/>
 +              </hbox>
++              <hbox id="userContext-icons">
++                <label id="userContext-label"/>
++                <image id="userContext-indicator"/>
++              </hbox>
 +              <toolbarbutton id="urlbar-go-button"
 +                             class="chromeclass-toolbar-additional"
 +                             onclick="gURLBar.handleCommand(event);"
@@ -1096,7 +1124,7 @@
 +
 +      <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
 +      <vbox id="appcontent" flex="1">
-+        <notificationbox id="high-priority-global-notificationbox"/>
++        <notificationbox id="high-priority-global-notificationbox" notificationside="top"/>
 +        <tabbrowser id="content"
 +                    flex="1" contenttooltip="aHTMLTooltip"
 +                    tabcontainer="tabbrowser-tabs"
@@ -1179,7 +1207,7 @@
 +  </html:div>
 +
 +  <vbox id="browser-bottombox" layer="true">
-+    <notificationbox id="global-notificationbox"/>
++    <notificationbox id="global-notificationbox" notificationside="bottom"/>
 +    <toolbar id="developer-toolbar"
 +             hidden="true">
 +#ifdef XP_MACOSX
@@ -1336,7 +1364,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.
-@@ -709,16 +715,27 @@ var gMainPane = {
+@@ -711,16 +717,27 @@ var gMainPane = {
     */
    setDefaultBrowser: function()
    {
@@ -1767,21 +1795,16 @@
 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
-@@ -699,19 +699,21 @@
+@@ -709,16 +709,17 @@
+ @RESPATH@/defaults/autoconfig/prefcalls.js
  @RESPATH@/browser/defaults/profile/prefs.js
  @RESPATH@/browser/defaults/permissions
  
- #ifndef LIBXUL_SDK
  ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
  ; Technically this is an app pref file, but we are keeping it in the original
  ; gre location for now.
  @RESPATH@/defaults/pref/channel-prefs.js
 +@BINPATH@/defaults/pref/kde.js
- #else
- ; For Fx-on-xr, channel-prefs lives with the app preferences. (Bug 762588)
- @RESPATH@/@PREF_DIR@/channel-prefs.js
-+@BINPATH@/@PREF_DIR@/kde.js
- #endif
  
  ; Services (gre) prefs
  #ifdef MOZ_SERVICES_NOTIFICATIONS
@@ -1789,3 +1812,4 @@
  #endif
  #ifdef MOZ_SERVICES_SYNC
  @RESPATH@/defaults/pref/services-sync.js
+ #endif
diff -r 4d8912c4a729 -r 91466ca5c8d9 mozilla-kde.patch
--- a/mozilla-kde.patch	Mon Jan 11 20:55:10 2016 +0100
+++ b/mozilla-kde.patch	Sun Jan 24 10:36:46 2016 +0100
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  fc87d8519207c57c22fb5a01243722be530679fa
+# Parent  efd9bcb9a96668b78749748e76c7982149c1bc40
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
@@ -21,7 +21,7 @@
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 +
  greprefs.js: $(grepref_files)
- 	$(call py_action,preprocessor,$(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $^ -o $@)
+ 	$(call py_action,preprocessor,$(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(MOZ_DEBUG_DEFINES) $^ -o $@)
  
  libs:: greprefs.js
  	$(INSTALL) $^ $(DIST)/bin/
@@ -137,7 +137,7 @@
  
    // Load jar:$app/omni.jar!/defaults/preferences/*.js
    // or jar:$gre/omni.jar!/defaults/preferences/*.js.
-   nsRefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP);
+   RefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP);
    // GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which
 diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py
 --- a/python/mozbuild/mozpack/chrome/flags.py
@@ -273,7 +273,7 @@
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 --- a/toolkit/content/jar.mn
 +++ b/toolkit/content/jar.mn
-@@ -63,29 +63,33 @@ toolkit.jar:
+@@ -64,29 +64,33 @@ toolkit.jar:
     content/global/viewZoomOverlay.js
  *+ content/global/bindings/autocomplete.xml    (widgets/autocomplete.xml)
     content/global/bindings/browser.xml         (widgets/browser.xml)
@@ -2697,7 +2697,7 @@
 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
 --- a/uriloader/exthandler/moz.build
 +++ b/uriloader/exthandler/moz.build
-@@ -68,17 +68,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
+@@ -72,17 +72,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'ui
  else:
      # These files can't be built in unified mode because they redefine LOG.
      SOURCES += [
@@ -2717,7 +2717,7 @@
          'android/nsExternalSharingAppService.cpp',
          'android/nsExternalURLHandlerService.cpp',
          'android/nsMIMEInfoAndroid.cpp',
-@@ -121,16 +123,17 @@ include('/ipc/chromium/chromium-config.m
+@@ -125,16 +127,17 @@ include('/ipc/chromium/chromium-config.m
  
  FINAL_LIBRARY = 'xul'
  
@@ -3011,8 +3011,8 @@
 -    *_retval = nsGNOMERegistry::HandlerExists(mSchemeOrType.get());
 +    *_retval = nsCommonRegistry::HandlerExists(mSchemeOrType.get());
    } else {
--    nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType);
-+    nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromType(mSchemeOrType);
+-    RefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType);
++    RefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromType(mSchemeOrType);
      if (!mimeInfo) {
        nsAutoCString ext;
        nsresult rv = GetPrimaryExtension(ext);
@@ -3120,7 +3120,7 @@
  
  #ifdef MOZ_WIDGET_GTK
      LOG(("Looking in GNOME registry\n"));
-     nsRefPtr<nsMIMEInfoBase> gnomeInfo =
+     RefPtr<nsMIMEInfoBase> gnomeInfo =
 -      nsGNOMERegistry::GetFromExtension(aFileExt);
 +      nsCommonRegistry::GetFromExtension(aFileExt);
      if (gnomeInfo) {
@@ -3140,8 +3140,8 @@
  
  #ifdef MOZ_WIDGET_GTK
    if (handler.IsEmpty()) {
--    nsRefPtr<nsMIMEInfoBase> gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType);
-+    nsRefPtr<nsMIMEInfoBase> gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType);
+-    RefPtr<nsMIMEInfoBase> gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType);
++    RefPtr<nsMIMEInfoBase> gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType);
      if (gnomeInfo) {
        LOG(("Got MIMEInfo from GNOME registry without extensions; setting them "
             "to %s\n", NS_LossyConvertUTF16toASCII(extensions).get()));
@@ -3153,7 +3153,7 @@
 diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
 --- a/widget/gtk/moz.build
 +++ b/widget/gtk/moz.build
-@@ -81,16 +81,17 @@ else:
+@@ -86,16 +86,17 @@ else:
  include('/ipc/chromium/chromium-config.mozbuild')
  
  FINAL_LIBRARY = 'xul'
@@ -3586,7 +3586,7 @@
  #elif defined(MOZ_WIDGET_COCOA)
    SInt32 majorVersion = nsCocoaFeatures::OSXVersionMajor();
    SInt32 minorVersion = nsCocoaFeatures::OSXVersionMinor();
-   nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(),
+   nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"),
                              majorVersion,
                              minorVersion);
 +  desktop = NS_LITERAL_STRING("macosx");
diff -r 4d8912c4a729 -r 91466ca5c8d9 mozilla-language.patch
--- a/mozilla-language.patch	Mon Jan 11 20:55:10 2016 +0100
+++ b/mozilla-language.patch	Sun Jan 24 10:36:46 2016 +0100
@@ -1,14 +1,14 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
 # Parent 5a29924228527f8882c83cf62d470963ea1ce62e
-# Parent  228ea0669fa8cc78532b71d7bdc4bad5477f246e
+# Parent  55b6ae7fd3ebf28f960031801f1948dfc1bd80d2
 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE
 
 diff --git a/intl/locale/nsLocaleService.cpp b/intl/locale/nsLocaleService.cpp
 --- a/intl/locale/nsLocaleService.cpp
 +++ b/intl/locale/nsLocaleService.cpp
 @@ -122,16 +122,17 @@ nsLocaleService::nsLocaleService(void)
-     nsRefPtr<nsLocale> resultLocale(new nsLocale());
+     RefPtr<nsLocale> resultLocale(new nsLocale());
      NS_ENSURE_TRUE_VOID(resultLocale);
  
  #ifdef MOZ_WIDGET_QT
diff -r 4d8912c4a729 -r 91466ca5c8d9 mozilla-no-stdcxx-check.patch
--- a/mozilla-no-stdcxx-check.patch	Mon Jan 11 20:55:10 2016 +0100
+++ b/mozilla-no-stdcxx-check.patch	Sun Jan 24 10:36:46 2016 +0100
@@ -1,30 +1,11 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent  af8fd72bd18717e6fc46340f467c7fa4f6d8c2ab
+# Parent  e96e9b3997ea31024687aaa1e9aa5ccf78bc0ee9
 
 diff --git a/config/config.mk b/config/config.mk
 --- a/config/config.mk
 +++ b/config/config.mk
-@@ -626,34 +626,33 @@ EXPAND_LD = $(EXPAND_LIBS_EXEC) --uselis
- EXPAND_MKSHLIB_ARGS = --uselist
- ifdef SYMBOL_ORDER
- EXPAND_MKSHLIB_ARGS += --symbol-order $(SYMBOL_ORDER)
- endif
- EXPAND_MKSHLIB = $(EXPAND_LIBS_EXEC) $(EXPAND_MKSHLIB_ARGS) -- $(MKSHLIB)
- 
- ifneq (,$(MOZ_LIBSTDCXX_TARGET_VERSION)$(MOZ_LIBSTDCXX_HOST_VERSION))
- ifneq ($(OS_ARCH),Darwin)
--CHECK_STDCXX = @$(TOOLCHAIN_PREFIX)objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(1[1-9]\|[2-9][0-9]\)' > /dev/null && echo 'TEST-UNEXPECTED-FAIL | check_stdcxx | We do not want these libstdc++ symbols to be used:' && $(TOOLCHAIN_PREFIX)objdump -T $(1) | grep -e 'GLIBCXX_3\.4\.\(1[1-9]\|[2-9][0-9]\)' && exit 1 || true
-+#CHECK_STDCXX = @$(TOOLCHAIN_PREFIX)objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(1[1-9]\|[2-9][0-9]\)' > /dev/null && echo 'TEST-UNEXPECTED-FAIL | check_stdcxx | We do not want these libstdc++ symbols to be used:' && $(TOOLCHAIN_PREFIX)objdump -T $(1) | grep -e 'GLIBCXX_3\.4\.\(1[1-9]\|[2-9][0-9]\)' && exit 1 || true
- endif
- endif
- 
- ifeq (,$(filter $(OS_TARGET),WINNT Darwin))
- CHECK_TEXTREL = @$(TOOLCHAIN_PREFIX)readelf -d $(1) | grep TEXTREL > /dev/null && echo 'TEST-UNEXPECTED-FAIL | check_textrel | We do not want text relocations in libraries and programs' || true
- endif
- 
- ifeq ($(MOZ_WIDGET_TOOLKIT),android)
- # While this is very unlikely (libc being added by the compiler at the end
+@@ -653,17 +653,16 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),android)
  # of the linker command line), if libmozglue.so ends up after libc.so, all
  # hell breaks loose, so better safe than sorry, and check it's actually the
  # case.
@@ -32,6 +13,7 @@
  endif
  
  define CHECK_BINARY
+ $(call CHECK_GLIBC,$(1))
 -$(call CHECK_STDCXX,$(1))
  $(call CHECK_TEXTREL,$(1))
  $(call LOCAL_CHECKS,$(1))