diff options
7 files changed, 29 insertions, 640 deletions
diff --git a/data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch b/data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch deleted file mode 100644 index e8cc3a6..0000000 --- a/data/patches/0001-Bug-1133689-Make-D3DVsyncDisplay-destructor-private..patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3f33df4d9a338ae4af9ab438d050eb08a52eb029 Mon Sep 17 00:00:00 2001 -From: Jacek Caban <jacek@codeweavers.com> -Date: Mon, 23 Feb 2015 12:14:49 +0100 -Subject: [PATCH 1/3] Bug 1133689 - Make D3DVsyncDisplay destructor private. - r=jmuizelaar - - -diff --git a/gfx/thebes/gfxWindowsPlatform.cpp b/gfx/thebes/gfxWindowsPlatform.cpp -index b52a188..23507ce 100644 - -Index: gfx/thebes/gfxWindowsPlatform.cpp -=================================================================== ---- a/gfx/thebes/gfxWindowsPlatform.cpp -+++ b/gfx/thebes/gfxWindowsPlatform.cpp -@@ -1990,13 +1990,6 @@ public: - mSoftwareVsyncRate = TimeDuration::FromMilliseconds(rate); - } - -- virtual ~D3DVsyncDisplay() -- { -- MOZ_ASSERT(NS_IsMainThread()); -- DisableVsync(); -- delete mVsyncThread; -- } -- - virtual void EnableVsync() override - { - MOZ_ASSERT(NS_IsMainThread()); -@@ -2099,6 +2092,13 @@ public: - } - - private: -+ virtual ~D3DVsyncDisplay() -+ { -+ MOZ_ASSERT(NS_IsMainThread()); -+ DisableVsync(); -+ delete mVsyncThread; -+ } -+ - bool IsInVsyncThread() - { - return mVsyncThread->thread_id() == PlatformThread::CurrentId(); diff --git a/data/patches/0001-Don-t-package-things-we-don-t-build.patch b/data/patches/0001-Don-t-package-things-we-don-t-build.patch deleted file mode 100644 index 3398a7d..0000000 --- a/data/patches/0001-Don-t-package-things-we-don-t-build.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 486e4777f375f1ac036e06430059bcac5a45b5d6 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk@torproject.org> -Date: Wed, 27 May 2015 07:55:59 +0000 -Subject: [PATCH] Don't package things we don't build - -We are not building the uninstall helper.exe for Windows (#9387) and -omit ICU on Windows as well (#13419). We avoid packaging the respective -binaries then as not doing this breaks our builds. - -diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in -index 6b15f02..1d9ab5b 100644 - -Index: browser/installer/package-manifest.in -=================================================================== ---- a/browser/installer/package-manifest.in -+++ b/browser/installer/package-manifest.in -@@ -54,9 +54,9 @@ - @RESPATH@/hyphenation/* - @RESPATH@/browser/@PREF_DIR@/firefox-l10n.js - @RESPATH@/browser/searchplugins/* --#ifdef XP_WIN32 --@BINPATH@/uninstall/helper.exe --#endif -+;#ifdef XP_WIN32 -+;@BINPATH@/uninstall/helper.exe -+;#endif - #ifdef MOZ_UPDATER - @RESPATH@/update.locale - @RESPATH@/updater.ini -@@ -111,9 +111,9 @@ - #ifndef MOZ_NATIVE_ICU - #ifdef MOZ_SHARED_ICU - #ifdef XP_WIN --@BINPATH@/icudt@MOZ_ICU_DBG_SUFFIX@@MOZ_ICU_VERSION@.dll --@BINPATH@/icuin@MOZ_ICU_DBG_SUFFIX@@MOZ_ICU_VERSION@.dll --@BINPATH@/icuuc@MOZ_ICU_DBG_SUFFIX@@MOZ_ICU_VERSION@.dll -+;@BINPATH@/icudt@MOZ_ICU_DBG_SUFFIX@@MOZ_ICU_VERSION@.dll -+;@BINPATH@/icuin@MOZ_ICU_DBG_SUFFIX@@MOZ_ICU_VERSION@.dll -+;@BINPATH@/icuuc@MOZ_ICU_DBG_SUFFIX@@MOZ_ICU_VERSION@.dll - #elif defined(XP_MACOSX) - @BINPATH@/libicudata.@MOZ_ICU_VERSION@.dylib - @BINPATH@/libicui18n.@MOZ_ICU_VERSION@.dylib diff --git a/data/patches/0002-bug-1183967-fixup-correct-case-of-mfidl.h.patch b/data/patches/0002-bug-1183967-fixup-correct-case-of-mfidl.h.patch deleted file mode 100644 index 352c185..0000000 --- a/data/patches/0002-bug-1183967-fixup-correct-case-of-mfidl.h.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 7b6be41fce3486aa5b0deee676bd9d2242692476 Mon Sep 17 00:00:00 2001 -From: Trevor Saunders <tbsaunde@tbsaunde.org> -Date: Fri, 20 Mar 2015 15:18:26 -0400 -Subject: [PATCH 2/3] bug 1183967 - fixup correct case of mfidl.h - - -diff --git a/gfx/layers/IMFYCbCrImage.h b/gfx/layers/IMFYCbCrImage.h -index 5d863b4..6a5d392 100644 - -Index: gfx/layers/IMFYCbCrImage.h -=================================================================== ---- a/gfx/layers/IMFYCbCrImage.h -+++ b/gfx/layers/IMFYCbCrImage.h -@@ -8,7 +8,7 @@ - - #include "mozilla/RefPtr.h" - #include "ImageContainer.h" --#include "Mfidl.h" -+#include "mfidl.h" - - namespace mozilla { - namespace layers { diff --git a/data/patches/do-not-warn-of-preinstalled-unsigned-extensions.patch b/data/patches/do-not-warn-of-preinstalled-unsigned-extensions.patch new file mode 100644 index 0000000..c4f5c77 --- /dev/null +++ b/data/patches/do-not-warn-of-preinstalled-unsigned-extensions.patch @@ -0,0 +1,29 @@ +Only in firefox-45.3.0esr: do-not-warn-of-preinstalled-unsigned-extensions.patch +diff -ru firefox-45.3.0esr-orig/toolkit/mozapps/extensions/content/extensions.js firefox-45.3.0esr/toolkit/mozapps/extensions/content/extensions.js +--- firefox-45.3.0esr-orig/toolkit/mozapps/extensions/content/extensions.js 2016-05-12 13:10:05.000000000 -0400 ++++ firefox-45.3.0esr/toolkit/mozapps/extensions/content/extensions.js 2016-08-28 18:24:46.897231960 -0400 +@@ -3204,7 +3204,9 @@ + [this._addon.name, gStrings.brandShortName, gStrings.appVersion], 3 + ); + document.getElementById("detail-warning-link").hidden = true; +- } else if (!isCorrectlySigned(this._addon)) { ++ } else if (!isCorrectlySigned(this._addon && ["abouticecat@gnu.org", ++ "html5-video-everywhere@lejenome.me", "https-everywhere-eff@eff.org", ++ "jid1-KtlZuoiikVfFew@jetpack", "spyblock@gnu.org"].indexOf(this._addon.id) < 0)) { + this.node.setAttribute("notification", "warning"); + document.getElementById("detail-warning").textContent = gStrings.ext.formatStringFromName( + "details.notification.unsigned", [this._addon.name, gStrings.brandShortName], 2 +diff -ru firefox-45.3.0esr-orig/toolkit/mozapps/extensions/content/extensions.xml firefox-45.3.0esr/toolkit/mozapps/extensions/content/extensions.xml +--- firefox-45.3.0esr-orig/toolkit/mozapps/extensions/content/extensions.xml 2016-05-12 13:10:05.000000000 -0400 ++++ firefox-45.3.0esr/toolkit/mozapps/extensions/content/extensions.xml 2016-08-28 18:28:09.241231936 -0400 +@@ -1255,7 +1255,9 @@ + ); + this._warningLink.hidden = true; + this._warningBtn.hidden = true; +- } else if (!isUpgrade && !isCorrectlySigned(this.mAddon)) { ++ } else if (!isUpgrade && !isCorrectlySigned(this.mAddon) && ["abouticecat@gnu.org", ++ "html5-video-everywhere@lejenome.me", "https-everywhere-eff@eff.org", ++ "jid1-KtlZuoiikVfFew@jetpack", "spyblock@gnu.org"].indexOf(this.mAddon.id) < 0) { + this.setAttribute("notification", "warning"); + this._warning.textContent = gStrings.ext.formatStringFromName( + "notification.unsigned", [this.mAddon.name, gStrings.brandShortName], 2 diff --git a/data/patches/enable-js-options.patch b/data/patches/enable-js-options.patch deleted file mode 100644 index aa2869e..0000000 --- a/data/patches/enable-js-options.patch +++ /dev/null @@ -1,268 +0,0 @@ -# revert https://bug851702.bugzilla.mozilla.org/attachment.cgi?id=733785 - -# HG changeset patch -# User Gijs Kruitbosch <gijskruitbosch@gmail.com> -# Date 1365155574 -7200 -# Node ID 444b9baa31d6065d37edbd61a2dcb892c989e0e2 -# Parent 99121d529b47ec285d61f64988335e60ac120cf7 -Bug 851702 - Remove JS load and advanced preferences from the UI - ---- b/browser/components/preferences/content.xul -+++ a/browser/components/preferences/content.xul -@@ -25,8 +25,13 @@ - <!-- DRM content --> - <preference id="media.eme.enabled" name="media.eme.enabled" type="bool"/> - -- <!-- POPUPS --> -+ <!-- POPUPS, JAVASCRIPT --> - <preference id="dom.disable_open_during_load" name="dom.disable_open_during_load" type="bool"/> -+ <preference id="javascript.enabled" name="javascript.enabled" type="bool"/> -+ -+ <preference id="pref.advanced.javascript.disable_button.advanced" -+ name="pref.advanced.javascript.disable_button.advanced" -+ type="bool"/> - - <!-- FONTS --> - <preference id="font.language.group" -@@ -75,6 +80,20 @@ - accesskey="&popupExceptions.accesskey;"/> - </hbox> - </row> -+ <row id="enableJavaScriptRow"> -+ <vbox align="start"> -+ <checkbox id="enableJavaScript" preference="javascript.enabled" -+ label="&enableJavaScript.label;" accesskey="&enableJavaScript.accesskey;" -+ onsyncfrompreference="return gContentPane.updateButtons('advancedJSButton', -+ 'javascript.enabled');"/> -+ </vbox> -+ <vbox> -+ <button id="advancedJSButton" label="&advancedJS.label;" -+ accesskey="&advancedJS.accesskey;" -+ oncommand="gContentPane.showAdvancedJS();" -+ preference="pref.advanced.javascript.disable_button.advanced"/> -+ </vbox> -+ </row> - </rows> - </grid> - </groupbox> - ---- b/browser/components/preferences/in-content/content.xul -+++ a/browser/components/preferences/in-content/content.xul -@@ -11,10 +11,16 @@ - name="media.eme.enabled" - type="bool"/> - -- <!-- Popups --> -+ <!-- Popups and javascript --> - <preference id="dom.disable_open_during_load" - name="dom.disable_open_during_load" - type="bool"/> -+ <preference id="javascript.enabled" -+ name="javascript.enabled" -+ type="bool"/> -+ <preference id="pref.advanced.javascript.disable_button.advanced" -+ name="pref.advanced.javascript.disable_button.advanced" -+ type="bool"/> - - <!-- Fonts --> - <preference id="font.language.group" -@@ -80,6 +86,20 @@ - accesskey="&popupExceptions.accesskey;"/> - </hbox> - </row> -+ <row id="enableJavaScriptRow"> -+ <vbox align="start"> -+ <checkbox id="enableJavaScript" preference="javascript.enabled" -+ label="&enableJavaScript.label;" accesskey="&enableJavaScript.accesskey;" -+ onsyncfrompreference="return gContentPane.updateButtons('advancedJSButton', -+ 'javascript.enabled');"/> -+ </vbox> -+ <vbox> -+ <button id="advancedJSButton" label="&advancedJS.label;" -+ accesskey="&advancedJS.accesskey;" -+ oncommand="gContentPane.showAdvancedJS();" -+ preference="pref.advanced.javascript.disable_button.advanced"/> -+ </vbox> -+ </row> - </rows> - </grid> - </groupbox> - ---- b/browser/components/preferences/jar.mn -+++ a/browser/components/preferences/jar.mn -@@ -4,16 +4,17 @@ - - browser.jar: - content/browser/preferences/aboutPermissions.xul - content/browser/preferences/aboutPermissions.js - content/browser/preferences/aboutPermissions.css - content/browser/preferences/aboutPermissions.xml - * content/browser/preferences/advanced.xul - * content/browser/preferences/advanced.js -+ content/browser/preferences/advanced-scripts.xul - content/browser/preferences/applications.xul - * content/browser/preferences/applications.js - content/browser/preferences/applicationManager.xul - * content/browser/preferences/applicationManager.js - * content/browser/preferences/colors.xul - * content/browser/preferences/cookies.xul - content/browser/preferences/cookies.js - content/browser/preferences/content.xul ---- b/browser/locales/en-US/chrome/browser/preferences/content.dtd -+++ a/browser/locales/en-US/chrome/browser/preferences/content.dtd -@@ -2,16 +2,25 @@ - - 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/. --> - - <!ENTITY blockPopups.label "Block pop-up windows"> - <!ENTITY blockPopups.accesskey "B"> - <!ENTITY popupExceptions.label "Exceptions…"> - <!ENTITY popupExceptions.accesskey "E"> - -+<!ENTITY enableJavaScript.label "Enable JavaScript"> -+<!ENTITY enableJavaScript.accesskey "J"> -+<!ENTITY advancedJS.label "Advanced…"> -+<!ENTITY advancedJS.accesskey "v"> -+ -+<!ENTITY enableJava.label "Enable Java"> -+<!ENTITY enableJava.accesskey "n"> -+ -+ - <!ENTITY fontsAndColors.label "Fonts & Colors"> - - <!ENTITY defaultFont.label "Default font:"> - <!ENTITY defaultFont.accesskey "D"> - <!ENTITY defaultSize.label "Size:"> - <!ENTITY defaultSize.accesskey "S"> - - <!ENTITY advancedFonts.label "Advanced…"> ---- b/browser/locales/jar.mn -+++ a/browser/locales/jar.mn -@@ -81,16 +81,17 @@ - #endif - locale/browser/feeds/subscribe.dtd (%chrome/browser/feeds/subscribe.dtd) - locale/browser/feeds/subscribe.properties (%chrome/browser/feeds/subscribe.properties) - locale/browser/migration/migration.dtd (%chrome/browser/migration/migration.dtd) - locale/browser/migration/migration.properties (%chrome/browser/migration/migration.properties) - locale/browser/preferences/aboutPermissions.dtd (%chrome/browser/preferences/aboutPermissions.dtd) - locale/browser/preferences/aboutPermissions.properties (%chrome/browser/preferences/aboutPermissions.properties) - locale/browser/preferences/advanced.dtd (%chrome/browser/preferences/advanced.dtd) -+ locale/browser/preferences/advanced-scripts.dtd (%chrome/browser/preferences/advanced-scripts.dtd) - locale/browser/preferences/applicationManager.dtd (%chrome/browser/preferences/applicationManager.dtd) - locale/browser/preferences/applicationManager.properties (%chrome/browser/preferences/applicationManager.properties) - locale/browser/preferences/colors.dtd (%chrome/browser/preferences/colors.dtd) - locale/browser/preferences/cookies.dtd (%chrome/browser/preferences/cookies.dtd) - locale/browser/preferences/content.dtd (%chrome/browser/preferences/content.dtd) - locale/browser/preferences/connection.dtd (%chrome/browser/preferences/connection.dtd) - locale/browser/preferences/applications.dtd (%chrome/browser/preferences/applications.dtd) - locale/browser/preferences/fonts.dtd (%chrome/browser/preferences/fonts.dtd) ---- b/browser/components/preferences/content.js 2014-05-07 17:02:34.000000000 +0200 -+++ a/browser/components/preferences/content.js 2014-04-28 01:52:01.000000000 +0200 -@@ -57,7 +57,18 @@ - "chrome://browser/content/preferences/permissions.xul", - "", params); - }, -+ -+ // JAVASCRIPT - -+ /** -+ * Displays the advanced JavaScript preferences for enabling or disabling -+ * various annoying behaviors. -+ */ -+ showAdvancedJS: function () -+ { -+ openDialog("chrome://browser/content/preferences/advanced-scripts.xul", -+ "Browser:AdvancedScripts", null); -+ }, - - // FONTS - ---- b/browser/components/preferences/in-content/content.js 2014-04-28 01:52:01.000000000 +0200 -+++ a/browser/components/preferences/in-content/content.js 2014-05-07 17:01:48.000000000 +0200 -@@ -58,6 +58,18 @@ - "Browser:Permissions", "resizable=yes", params); - }, - -+ // JAVASCRIPT -+ -+ /** -+ * Displays the advanced JavaScript preferences for enabling or disabling -+ * various annoying behaviors. -+ */ -+ showAdvancedJS: function () -+ { -+ openDialog("chrome://browser/content/preferences/advanced-scripts.xul", -+ "Browser:AdvancedScripts", null); -+ }, -+ - // FONTS - - /** -diff --git a/browser/components/preferences/advanced-scripts.xul b/browser/components/preferences/advanced-scripts.xul ---- /dev/null -+++ a/browser/components/preferences/advanced-scripts.xul -@@ -0,0 +1,46 @@ -+<?xml version="1.0"?> -+ -+<!-- -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- --> -+<!-- 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/. --> -+ -+<!DOCTYPE prefwindow SYSTEM "chrome://browser/locale/preferences/advanced-scripts.dtd"> -+ -+<?xml-stylesheet href="chrome://global/skin/"?> -+ -+<prefwindow id="AdvancedJSDialog" type="child" -+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" -+ title="&advancedJSDialog.title;" -+ dlgbuttons="accept,cancel,help" -+ ondialoghelp="openPrefsHelp()"> -+ -+ <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/> -+ -+ <prefpane id="AdvancedJSDialogPane" -+ helpTopic="prefs-advanced-javascript"> -+ -+ <preferences> -+ <preference id="dom.event.contextmenu.enabled" name="dom.event.contextmenu.enabled" type="bool"/> -+ <preference id="dom.disable_window_move_resize" name="dom.disable_window_move_resize" type="bool" inverted="true"/> -+ <preference id="dom.disable_window_flip" name="dom.disable_window_flip" type="bool" inverted="true"/> -+ </preferences> -+ -+ <script type="application/javascript" src="chrome://browser/content/preferences/advanced-scripts.js"/> -+ -+ <stringbundle id="preferencesBundle" src="chrome://browser/locale/preferences/preferences.properties"/> -+ -+ <description value="&allowScripts.label;"/> -+ -+ <checkbox id="moveResizePopupWindows" label="&moveResizePopupWindows.label;" -+ accesskey="&moveResizePopupWindows.accesskey;" -+ preference="dom.disable_window_move_resize"/> -+ <checkbox id="raiseLowerWindows" label="&raiseLowerWindows.label;" -+ accesskey="&raiseLowerWindows.accesskey;" -+ preference="dom.disable_window_flip"/> -+ <checkbox id="disableContextMenus" label="&disableContextMenus.label;" -+ accesskey="&disableContextMenus.accesskey;" -+ preference="dom.event.contextmenu.enabled"/> -+ -+ </prefpane> -+</prefwindow> ---- /dev/null -+++ a/browser/locales/en-US/chrome/browser/preferences/advanced-scripts.dtd -@@ -0,0 +1,15 @@ -+<!-- 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/. --> -+ -+<!ENTITY advancedJSDialog.title "Advanced JavaScript Settings"> -+<!ENTITY window.width "37em"> -+ -+<!ENTITY allowScripts.label "Allow scripts to:"> -+ -+<!ENTITY moveResizePopupWindows.label "Move or resize popup windows"> -+<!ENTITY moveResizePopupWindows.accesskey "M"> -+<!ENTITY raiseLowerWindows.label "Raise or lower windows"> -+<!ENTITY raiseLowerWindows.accesskey "R"> -+<!ENTITY disableContextMenus.label "Disable or replace context menus"> -+<!ENTITY disableContextMenus.accesskey "D"> diff --git a/data/patches/gnuzilla-bug-1172632-1.patch b/data/patches/gnuzilla-bug-1172632-1.patch deleted file mode 100644 index 326dc34..0000000 --- a/data/patches/gnuzilla-bug-1172632-1.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 24f14fc16f5ef9046987d45019d98523c27c506c Mon Sep 17 00:00:00 2001 -From: Mike Hommey <mh+mozilla@glandium.org> -Date: Tue, 9 Jun 2015 09:54:24 +0900 -Subject: [PATCH] Bug 1172632 - Don't guess malloc_usable_size type of argument - based on ANDROID_VERSION in mozjemalloc, but use the result of the configure - test instead - ---- - memory/mozjemalloc/jemalloc.c | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c -index f8e36e1..9113d26 100644 ---- a/memory/mozjemalloc/jemalloc.c -+++ b/memory/mozjemalloc/jemalloc.c -@@ -6509,23 +6509,18 @@ malloc_good_size_impl(size_t size) - * malloc_good_size(n). - */ - size = PAGE_CEILING(size); - } - return size; - } - - --#if defined(MOZ_MEMORY_ANDROID) && (ANDROID_VERSION < 19) - MOZ_MEMORY_API size_t --malloc_usable_size_impl(void *ptr) --#else --MOZ_MEMORY_API size_t --malloc_usable_size_impl(const void *ptr) --#endif -+malloc_usable_size_impl(MALLOC_USABLE_SIZE_CONST_PTR void *ptr) - { - DARWIN_ONLY(return (szone->size)(szone, ptr)); - - #ifdef MALLOC_VALIDATE - return (isalloc_validate(ptr)); - #else - assert(ptr != NULL); - --- -2.4.0.2.g36460d1.dirty - diff --git a/data/patches/gnuzilla-bug-1172632-2.patch b/data/patches/gnuzilla-bug-1172632-2.patch deleted file mode 100644 index a3ff76f..0000000 --- a/data/patches/gnuzilla-bug-1172632-2.patch +++ /dev/null @@ -1,223 +0,0 @@ -From 23da4b840c9bf0713971f07e659394b6f26b7f9e Mon Sep 17 00:00:00 2001 -From: Mike Hommey <mh+mozilla@glandium.org> -Date: Wed, 10 Jun 2015 09:58:50 +0900 -Subject: [PATCH] bug 1172632 - Move some allocator related configure checks in - a common location for both top-level and js/src to use - ---- - aclocal.m4 | 1 + - build/autoconf/alloc.m4 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ - configure.in | 46 +----------------------------------------- - js/src/aclocal.m4 | 1 + - js/src/configure.in | 13 ++---------- - 5 files changed, 58 insertions(+), 56 deletions(-) - create mode 100644 build/autoconf/alloc.m4 - -diff --git a/aclocal.m4 b/aclocal.m4 -index 90356f9..5f30651 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -28,16 +28,17 @@ builtin(include, build/autoconf/arch.m4)dnl - builtin(include, build/autoconf/android.m4)dnl - builtin(include, build/autoconf/zlib.m4)dnl - builtin(include, build/autoconf/linux.m4)dnl - builtin(include, build/autoconf/python-virtualenv.m4)dnl - builtin(include, build/autoconf/winsdk.m4)dnl - builtin(include, build/autoconf/icu.m4)dnl - builtin(include, build/autoconf/ffi.m4)dnl - builtin(include, build/autoconf/clang-plugin.m4)dnl -+builtin(include, build/autoconf/alloc.m4)dnl - - MOZ_PROG_CHECKMSYS() - - # Read the user's .mozconfig script. We can't do this in - # configure.in: autoconf puts the argument parsing code above anything - # expanded from configure.in, and we need to get the configure options - # from .mozconfig in place before that argument parsing code. - MOZ_READ_MOZCONFIG(.) -diff --git a/build/autoconf/alloc.m4 b/build/autoconf/alloc.m4 -new file mode 100644 -index 0000000..8234a60 ---- /dev/null -+++ b/build/autoconf/alloc.m4 -@@ -0,0 +1,53 @@ -+dnl This Source Code Form is subject to the terms of the Mozilla Public -+dnl License, v. 2.0. If a copy of the MPL was not distributed with this -+dnl file, You can obtain one at http://mozilla.org/MPL/2.0/. -+ -+dnl Check for the existence of various allocation headers/functions -+AC_DEFUN([MOZ_CHECK_ALLOCATOR],[ -+ -+MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" -+MALLOC_H= -+ -+for file in $MALLOC_HEADERS; do -+ MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) -+ if test "$MALLOC_H" != ""; then -+ AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) -+ break -+ fi -+done -+ -+MOZ_CHECK_HEADERS(alloca.h) -+ -+AC_CHECK_FUNCS(strndup posix_memalign memalign) -+ -+AC_CHECK_FUNCS(malloc_usable_size) -+MALLOC_USABLE_SIZE_CONST_PTR=const -+MOZ_CHECK_HEADERS([malloc.h], [ -+ AC_MSG_CHECKING([whether malloc_usable_size definition can use const argument]) -+ AC_TRY_COMPILE([#include <malloc.h> -+ #include <stddef.h> -+ size_t malloc_usable_size(const void *ptr);], -+ [return malloc_usable_size(0);], -+ AC_MSG_RESULT([yes]), -+ AC_MSG_RESULT([no]) -+ MALLOC_USABLE_SIZE_CONST_PTR=) -+]) -+AC_DEFINE_UNQUOTED([MALLOC_USABLE_SIZE_CONST_PTR],[$MALLOC_USABLE_SIZE_CONST_PTR]) -+ -+ -+dnl In newer bionic headers, valloc is built but not defined, -+dnl so we check more carefully here. -+AC_MSG_CHECKING([for valloc in malloc.h]) -+AC_EGREP_HEADER(valloc, malloc.h, -+ AC_DEFINE(HAVE_VALLOC) -+ AC_MSG_RESULT([yes]), -+ AC_MSG_RESULT([no])) -+ -+AC_MSG_CHECKING([for valloc in unistd.h]) -+AC_EGREP_HEADER(valloc, unistd.h, -+ AC_DEFINE(HAVE_VALLOC) -+ AC_MSG_RESULT([yes]), -+ AC_MSG_RESULT([no])) -+ -+ -+]) -diff --git a/configure.in b/configure.in -index 0d54167..988797d 100644 ---- a/configure.in -+++ b/configure.in -@@ -3394,61 +3394,17 @@ if test -n "$MOZ_LINKER" -a "$OS_TARGET" = "Android"; then - dnl we need to use LDFLAGS because nspr doesn't inherit DSO_LDOPTS. - dnl Using LDFLAGS in nspr is safe, since we only really build - dnl libraries there. - DSO_LDOPTS="$DSO_LDOPTS -nostartfiles" - NSPR_LDFLAGS="$NSPR_LDFLAGS -nostartfiles" - fi - fi - --dnl Check for the existence of various allocation headers/functions -- --MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" --MALLOC_H= -- --for file in $MALLOC_HEADERS; do -- MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) -- if test "$MALLOC_H" != ""; then -- AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) -- break -- fi --done -- --MOZ_CHECK_HEADERS(alloca.h) -- --AC_CHECK_FUNCS(strndup posix_memalign memalign) -- --AC_CHECK_FUNCS(malloc_usable_size) --MALLOC_USABLE_SIZE_CONST_PTR=const --MOZ_CHECK_HEADERS([malloc.h], [ -- AC_MSG_CHECKING([whether malloc_usable_size definition can use const argument]) -- AC_TRY_COMPILE([#include <malloc.h> -- #include <stddef.h> -- size_t malloc_usable_size(const void *ptr);], -- [return malloc_usable_size(0);], -- AC_MSG_RESULT([yes]), -- AC_MSG_RESULT([no]) -- MALLOC_USABLE_SIZE_CONST_PTR=) --]) --AC_DEFINE_UNQUOTED([MALLOC_USABLE_SIZE_CONST_PTR],[$MALLOC_USABLE_SIZE_CONST_PTR]) -- -- --dnl In newer bionic headers, valloc is built but not defined, --dnl so we check more carefully here. --AC_MSG_CHECKING([for valloc in malloc.h]) --AC_EGREP_HEADER(valloc, malloc.h, -- AC_DEFINE(HAVE_VALLOC) -- AC_MSG_RESULT([yes]), -- AC_MSG_RESULT([no])) -- --AC_MSG_CHECKING([for valloc in unistd.h]) --AC_EGREP_HEADER(valloc, unistd.h, -- AC_DEFINE(HAVE_VALLOC) -- AC_MSG_RESULT([yes]), -- AC_MSG_RESULT([no])) -+MOZ_CHECK_ALLOCATOR - - dnl See if compiler supports some gcc-style attributes - - AC_CACHE_CHECK(for __attribute__((always_inline)), - ac_cv_attribute_always_inline, - [AC_TRY_COMPILE([inline void f(void) __attribute__((always_inline));], - [], - ac_cv_attribute_always_inline=yes, -diff --git a/js/src/aclocal.m4 b/js/src/aclocal.m4 -index 99c73ac..fc36340 100644 ---- a/js/src/aclocal.m4 -+++ b/js/src/aclocal.m4 -@@ -27,16 +27,17 @@ builtin(include, ../../build/autoconf/arch.m4)dnl - builtin(include, ../../build/autoconf/android.m4)dnl - builtin(include, ../../build/autoconf/zlib.m4)dnl - builtin(include, ../../build/autoconf/linux.m4)dnl - builtin(include, ../../build/autoconf/python-virtualenv.m4)dnl - builtin(include, ../../build/autoconf/winsdk.m4)dnl - builtin(include, ../../build/autoconf/icu.m4)dnl - builtin(include, ../../build/autoconf/ffi.m4)dnl - builtin(include, ../../build/autoconf/clang-plugin.m4)dnl -+builtin(include, ../../build/autoconf/alloc.m4)dnl - - define([__MOZ_AC_INIT_PREPARE], defn([AC_INIT_PREPARE])) - define([AC_INIT_PREPARE], - [if test -z "$srcdir"; then - srcdir=`dirname "[$]0"` - fi - srcdir="$srcdir/../.." - __MOZ_AC_INIT_PREPARE($1) -diff --git a/js/src/configure.in b/js/src/configure.in -index 9c21772..4f72dc3 100644 ---- a/js/src/configure.in -+++ b/js/src/configure.in -@@ -3842,28 +3842,19 @@ _INTL_API=yes - MOZ_CONFIG_ICU() - - MOZ_SUBCONFIGURE_ICU() - - dnl ======================================================== - dnl JavaScript shell - dnl ======================================================== - --MALLOC_HEADERS="malloc.h malloc_np.h malloc/malloc.h sys/malloc.h" --MALLOC_H= -- --for file in $MALLOC_HEADERS; do -- MOZ_CHECK_HEADER($file, [MALLOC_H=$file]) -- if test "$MALLOC_H" != ""; then -- AC_DEFINE_UNQUOTED(MALLOC_H, <$MALLOC_H>) -- break -- fi --done -+MOZ_CHECK_ALLOCATOR - --AC_CHECK_FUNCS(setlocale localeconv malloc_size malloc_usable_size) -+AC_CHECK_FUNCS(setlocale localeconv) - - AC_SUBST(MOZILLA_VERSION) - - AC_SUBST(ac_configure_args) - - AC_SUBST(TOOLCHAIN_PREFIX) - - if test -n "$JS_STANDALONE"; then --- -2.4.0.2.g36460d1.dirty - |