minor build fixes

frg/work-js/mozilla-release/patches/1579545-71a1.patch

@@ -0,0 +1,54 @@
+# HG changeset patch
+# User Nathan Froyd <froydnj@mozilla.com>
+# Date 1567805723 0
+# Node ID 07f0801f694047accad5ce116e61d515dca834d8
+# Parent  3b86403b2b3763348ce1f7d105bfe2aa90b98cf8
+Bug 1579545 - remove unused `NO_PW_GECOS` defines; r=nalexander
+
+They aren't used in our codebase and they aren't used in the NDK.
+
+Differential Revision: https://phabricator.services.mozilla.com/D45085
+
+diff --git a/js/src/old-configure.in b/js/src/old-configure.in
+--- a/js/src/old-configure.in
++++ b/js/src/old-configure.in
+@@ -515,17 +515,16 @@ case "$target" in
+         fi
+ 
+         LDFLAGS=$_SAVE_LDFLAGS
+     fi
+     MOZ_FIX_LINK_PATHS="-Wl,-executable_path,${DIST}/bin"
+     ;;
+ 
+ *-android*|*-linuxandroid*)
+-    AC_DEFINE(NO_PW_GECOS)
+     MOZ_GFX_OPTIMIZE_MOBILE=1
+     MOZ_OPTIMIZE_FLAGS="-O3"
+     if test -z "$CLANG_CC"; then
+        MOZ_OPTIMIZE_FLAGS="-freorder-blocks -fno-reorder-functions $MOZ_OPTIMIZE_FLAGS"
+     fi
+     ;;
+ 
+ *-*linux*)
+diff --git a/old-configure.in b/old-configure.in
+--- a/old-configure.in
++++ b/old-configure.in
+@@ -604,18 +604,16 @@ case "$target" in
+ 
+         LDFLAGS=$_SAVE_LDFLAGS
+     fi
+ 
+     MOZ_FIX_LINK_PATHS="-Wl,-executable_path,${DIST}/bin"
+     ;;
+ 
+ *-android*|*-linuxandroid*)
+-    AC_DEFINE(NO_PW_GECOS)
+-
+     if test "$COMPILE_ENVIRONMENT"; then
+         MOZ_LINKER=1
+     fi
+ 
+     MOZ_GFX_OPTIMIZE_MOBILE=1
+     if test -z "$CLANG_CC"; then
+         MOZ_OPTIMIZE_FLAGS="-freorder-blocks -fno-reorder-functions -Os"
+     else

frg/work-js/mozilla-release/patches/1623593-76a1.patch

@@ -0,0 +1,410 @@
+# HG changeset patch
+# User Andrea Marchesini <amarchesini@mozilla.com>
+# Date 1585067403 0
+# Node ID 23646088066c9a96c48af7f108f55b6de8b0eb40
+# Parent  3e589048cd1e2ba70583f269c9dad885a30d21d2
+Bug 1623593 - Get rid of NECKO_COOKIES compilation flag, r=mayhemer
+
+Differential Revision: https://phabricator.services.mozilla.com/D67451
+
+diff --git a/Makefile.in b/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -29,17 +29,17 @@ GARBAGE_DIRS += _javagen _profile static
+ # RUST*TARGET to GARBAGE_DIRS for those directories building Rust libraries.
+ # But the directories building Rust libraries don't actually have
+ # subdirectories to remove.  So we add to GARBAGE_DIRS once here, globally,
+ # for it to have the desired effect.
+ GARBAGE_DIRS += $(RUST_TARGET)
+ DIST_GARBAGE = config.cache config.log config.status* config-defs.h \
+    config/autoconf.mk \
+    mozilla-config.h \
+-   netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \
++   xpcom/xpcom-config.h xpcom/xpcom-private.h \
+    .mozconfig.mk
+ 
+ ifndef MOZ_PROFILE_USE
+ $(MDDEPDIR)/buildid.h.stub $(MDDEPDIR)/source-repo.h.stub: FORCE
+ source-repo.h: $(MDDEPDIR)/source-repo.h.stub
+ buildid.h: $(MDDEPDIR)/buildid.h.stub
+ endif
+ 
+diff --git a/netwerk/build/moz.build b/netwerk/build/moz.build
+--- a/netwerk/build/moz.build
++++ b/netwerk/build/moz.build
+@@ -14,16 +14,17 @@ SOURCES += [
+ 
+ include('/ipc/chromium/chromium-config.mozbuild')
+ 
+ FINAL_LIBRARY = 'xul'
+ 
+ LOCAL_INCLUDES += [
+     '/netwerk/base',
+     '/netwerk/cache',
++    '/netwerk/cookie',
+     '/netwerk/dns',
+     '/netwerk/mime',
+     '/netwerk/protocol/about',
+     '/netwerk/protocol/data',
+     '/netwerk/protocol/file',
+     '/netwerk/protocol/ftp',
+     '/netwerk/protocol/http',
+     '/netwerk/protocol/res',
+@@ -55,21 +56,16 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
+         '/netwerk/system/android',
+     ]
+ 
+ elif CONFIG['OS_ARCH'] == 'Linux':
+     LOCAL_INCLUDES += [
+         '/netwerk/system/linux',
+     ]
+ 
+-if CONFIG['NECKO_COOKIES']:
+-    LOCAL_INCLUDES += [
+-        '/netwerk/cookie',
+-    ]
+-
+ if CONFIG['NECKO_WIFI']:
+     LOCAL_INCLUDES += [
+         '/netwerk/wifi',
+     ]
+ 
+ LOCAL_INCLUDES += [
+     '!/netwerk/dns',
+     '/modules/brotli/dec',
+diff --git a/netwerk/build/nsNetModule.cpp b/netwerk/build/nsNetModule.cpp
+--- a/netwerk/build/nsNetModule.cpp
++++ b/netwerk/build/nsNetModule.cpp
+@@ -1,16 +1,14 @@
+ /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+ /* vim: set sw=4 ts=8 et tw=80 : */
+ /* This Source Code Form is subject to the terms of the Mozilla Public
+  * License, v. 2.0. If a copy of the MPL was not distributed with this
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
+-#include "necko-config.h"
+-
+ #define ALLOW_LATE_HTTPLOG_H_INCLUDE 1
+ #include "base/basictypes.h"
+ 
+ #include "nsCOMPtr.h"
+ #include "nsIClassInfoImpl.h"
+ #include "mozilla/ModuleUtils.h"
+ #include "nsIComponentManager.h"
+ #include "nsIServiceManager.h"
+@@ -192,21 +190,19 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDirInde
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+ #include "nsStreamListenerTee.h"
+ typedef mozilla::net::nsStreamListenerTee nsStreamListenerTee;
+ NS_GENERIC_FACTORY_CONSTRUCTOR(nsStreamListenerTee)
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+ 
+-#ifdef NECKO_COOKIES
+ #include "nsCookieService.h"
+ NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsICookieService,
+   nsCookieService::GetXPCOMSingleton)
+-#endif
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+ #ifdef NECKO_WIFI
+ 
+ #include "nsWifiMonitor.h"
+ #undef LOG
+ #undef LOG_ENABLED
+ NS_GENERIC_FACTORY_CONSTRUCTOR(nsWifiMonitor)
+@@ -740,20 +736,18 @@ NS_DEFINE_NAMED_CID(NS_ABOUT_CACHE_MODUL
+ NS_DEFINE_NAMED_CID(NS_ABOUT_CACHE_ENTRY_MODULE_CID);
+ NS_DEFINE_NAMED_CID(NS_SOCKSSOCKETPROVIDER_CID);
+ NS_DEFINE_NAMED_CID(NS_SOCKS4SOCKETPROVIDER_CID);
+ NS_DEFINE_NAMED_CID(NS_UDPSOCKETPROVIDER_CID);
+ NS_DEFINE_NAMED_CID(NS_CACHESERVICE_CID);
+ NS_DEFINE_NAMED_CID(NS_APPLICATIONCACHESERVICE_CID);
+ NS_DEFINE_NAMED_CID(NS_APPLICATIONCACHENAMESPACE_CID);
+ NS_DEFINE_NAMED_CID(NS_APPLICATIONCACHE_CID);
+-#ifdef NECKO_COOKIES
+ NS_DEFINE_NAMED_CID(NS_COOKIEMANAGER_CID);
+ NS_DEFINE_NAMED_CID(NS_COOKIESERVICE_CID);
+-#endif
+ #ifdef NECKO_WIFI
+ NS_DEFINE_NAMED_CID(NS_WIFI_MONITOR_COMPONENT_CID);
+ #endif
+ NS_DEFINE_NAMED_CID(NS_DATAPROTOCOLHANDLER_CID);
+ NS_DEFINE_NAMED_CID(NS_VIEWSOURCEHANDLER_CID);
+ NS_DEFINE_NAMED_CID(NS_WYCIWYGPROTOCOLHANDLER_CID);
+ NS_DEFINE_NAMED_CID(NS_WEBSOCKETPROTOCOLHANDLER_CID);
+ NS_DEFINE_NAMED_CID(NS_WEBSOCKETSSLPROTOCOLHANDLER_CID);
+@@ -861,20 +855,18 @@ static const mozilla::Module::CIDEntry k
+     { &kNS_ABOUT_CACHE_ENTRY_MODULE_CID, false, nullptr, nsAboutCacheEntryConstructor },
+     { &kNS_SOCKSSOCKETPROVIDER_CID, false, nullptr, nsSOCKSSocketProvider::CreateV5 },
+     { &kNS_SOCKS4SOCKETPROVIDER_CID, false, nullptr, nsSOCKSSocketProvider::CreateV4 },
+     { &kNS_UDPSOCKETPROVIDER_CID, false, nullptr, nsUDPSocketProviderConstructor },
+     { &kNS_CACHESERVICE_CID, false, nullptr, nsCacheService::Create },
+     { &kNS_APPLICATIONCACHESERVICE_CID, false, nullptr, nsApplicationCacheServiceConstructor },
+     { &kNS_APPLICATIONCACHENAMESPACE_CID, false, nullptr, nsApplicationCacheNamespaceConstructor },
+     { &kNS_APPLICATIONCACHE_CID, false, nullptr, nsApplicationCacheConstructor },
+-#ifdef NECKO_COOKIES
+     { &kNS_COOKIEMANAGER_CID, false, nullptr, nsICookieServiceConstructor },
+     { &kNS_COOKIESERVICE_CID, false, nullptr, nsICookieServiceConstructor },
+-#endif
+ #ifdef NECKO_WIFI
+     { &kNS_WIFI_MONITOR_COMPONENT_CID, false, nullptr, nsWifiMonitorConstructor },
+ #endif
+     { &kNS_DATAPROTOCOLHANDLER_CID, false, nullptr, nsDataHandler::Create },
+     { &kNS_VIEWSOURCEHANDLER_CID, false, nullptr, nsViewSourceHandlerConstructor },
+     { &kNS_WYCIWYGPROTOCOLHANDLER_CID, false, nullptr, nsWyciwygProtocolHandlerConstructor },
+     { &kNS_WEBSOCKETPROTOCOLHANDLER_CID, false, nullptr,
+       mozilla::net::WebSocketChannelConstructor },
+@@ -990,20 +982,18 @@ static const mozilla::Module::ContractID
+     { NS_ABOUT_MODULE_CONTRACTID_PREFIX "cache-entry", &kNS_ABOUT_CACHE_ENTRY_MODULE_CID },
+     { NS_NETWORK_SOCKET_CONTRACTID_PREFIX "socks", &kNS_SOCKSSOCKETPROVIDER_CID },
+     { NS_NETWORK_SOCKET_CONTRACTID_PREFIX "socks4", &kNS_SOCKS4SOCKETPROVIDER_CID },
+     { NS_NETWORK_SOCKET_CONTRACTID_PREFIX "udp", &kNS_UDPSOCKETPROVIDER_CID },
+     { NS_CACHESERVICE_CONTRACTID, &kNS_CACHESERVICE_CID },
+     { NS_APPLICATIONCACHESERVICE_CONTRACTID, &kNS_APPLICATIONCACHESERVICE_CID },
+     { NS_APPLICATIONCACHENAMESPACE_CONTRACTID, &kNS_APPLICATIONCACHENAMESPACE_CID },
+     { NS_APPLICATIONCACHE_CONTRACTID, &kNS_APPLICATIONCACHE_CID },
+-#ifdef NECKO_COOKIES
+     { NS_COOKIEMANAGER_CONTRACTID, &kNS_COOKIEMANAGER_CID },
+     { NS_COOKIESERVICE_CONTRACTID, &kNS_COOKIESERVICE_CID },
+-#endif
+ #ifdef NECKO_WIFI
+     { NS_WIFI_MONITOR_CONTRACTID, &kNS_WIFI_MONITOR_COMPONENT_CID },
+ #endif
+     { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "data", &kNS_DATAPROTOCOLHANDLER_CID },
+     { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "view-source", &kNS_VIEWSOURCEHANDLER_CID },
+     { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "wyciwyg", &kNS_WYCIWYGPROTOCOLHANDLER_CID },
+     { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "ws", &kNS_WEBSOCKETPROTOCOLHANDLER_CID },
+     { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "wss", &kNS_WEBSOCKETSSLPROTOCOLHANDLER_CID },
+diff --git a/netwerk/cache/nsCacheService.cpp b/netwerk/cache/nsCacheService.cpp
+--- a/netwerk/cache/nsCacheService.cpp
++++ b/netwerk/cache/nsCacheService.cpp
+@@ -4,18 +4,16 @@
+  * License, v. 2.0. If a copy of the MPL was not distributed with this
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
+ #include "mozilla/ArrayUtils.h"
+ #include "mozilla/Attributes.h"
+ #include "mozilla/Assertions.h"
+ #include "mozilla/DebugOnly.h"
+ 
+-#include "necko-config.h"
+-
+ #include "nsCache.h"
+ #include "nsCacheService.h"
+ #include "nsCacheRequest.h"
+ #include "nsCacheEntry.h"
+ #include "nsCacheEntryDescriptor.h"
+ #include "nsCacheDevice.h"
+ #include "nsMemoryCacheDevice.h"
+ #include "nsICacheVisitor.h"
+diff --git a/netwerk/cookie/moz.build b/netwerk/cookie/moz.build
+--- a/netwerk/cookie/moz.build
++++ b/netwerk/cookie/moz.build
+@@ -2,57 +2,57 @@
+ # vim: set filetype=python:
+ # 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/.
+ 
+ with Files('**'):
+     BUG_COMPONENT = ('Core', 'Networking: Cookies')
+ 
+-# export required interfaces, even if --disable-cookies has been given
++# export required interfaces
+ XPIDL_SOURCES += [
+     'nsICookie.idl',
+     'nsICookie2.idl',
+     'nsICookieManager.idl',
+     'nsICookieManager2.idl',
+     'nsICookiePermission.idl',
+     'nsICookieService.idl',
+ ]
+ 
+ XPIDL_MODULE = 'necko_cookie'
+ 
+-if CONFIG['NECKO_COOKIES']:
+-    EXPORTS.mozilla.net = [
+-        'CookieServiceChild.h',
+-        'CookieServiceParent.h',
+-        'nsCookieKey.h',
+-    ]
+-    UNIFIED_SOURCES += [
+-        'CookieServiceChild.cpp',
+-        'CookieServiceParent.cpp',
+-        'nsCookie.cpp',
+-    ]
+-    # nsCookieService.cpp can't be unified because of symbol conflicts
+-    SOURCES += [
+-        'nsCookieService.cpp',
+-    ]
+-    LOCAL_INCLUDES += [
+-        '/intl/uconv',
+-    ]
++EXPORTS.mozilla.net = [
++    'CookieServiceChild.h',
++    'CookieServiceParent.h',
++    'nsCookieKey.h',
++]
++UNIFIED_SOURCES += [
++    'CookieServiceChild.cpp',
++    'CookieServiceParent.cpp',
++    'nsCookie.cpp',
++]
++# nsCookieService.cpp can't be unified because of symbol conflicts
++SOURCES += [
++    'nsCookieService.cpp',
++]
+ 
+-    XPCSHELL_TESTS_MANIFESTS += [
+-        'test/unit/xpcshell.ini',
+-    ]
++XPCSHELL_TESTS_MANIFESTS += [
++    'test/unit/xpcshell.ini',
++]
+ 
+-    BROWSER_CHROME_MANIFESTS += [
+-        'test/browser/browser.ini',
+-    ]
++BROWSER_CHROME_MANIFESTS += [
++    'test/browser/browser.ini',
++]
+ 
+ IPDL_SOURCES = [
+     'PCookieService.ipdl',
+ ]
+ 
++LOCAL_INCLUDES += [
++    '/intl/uconv',
++]
++
+ include('/ipc/chromium/chromium-config.mozbuild')
+ 
+ FINAL_LIBRARY = 'xul'
+ 
+ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
+     CXXFLAGS += ['-Wno-error=shadow']
+diff --git a/netwerk/ipc/NeckoChild.cpp b/netwerk/ipc/NeckoChild.cpp
+--- a/netwerk/ipc/NeckoChild.cpp
++++ b/netwerk/ipc/NeckoChild.cpp
+@@ -1,16 +1,15 @@
+ 
+ /* vim: set sw=2 ts=8 et tw=80 : */
+ 
+ /* This Source Code Form is subject to the terms of the Mozilla Public
+  * License, v. 2.0. If a copy of the MPL was not distributed with this
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
+-#include "necko-config.h"
+ #include "nsHttp.h"
+ #include "mozilla/net/NeckoChild.h"
+ #include "mozilla/dom/ContentChild.h"
+ #include "mozilla/dom/TabChild.h"
+ #include "mozilla/net/HttpChannelChild.h"
+ #include "mozilla/net/CookieServiceChild.h"
+ #include "mozilla/net/WyciwygChannelChild.h"
+ #include "mozilla/net/FTPChannelChild.h"
+diff --git a/netwerk/ipc/NeckoParent.cpp b/netwerk/ipc/NeckoParent.cpp
+--- a/netwerk/ipc/NeckoParent.cpp
++++ b/netwerk/ipc/NeckoParent.cpp
+@@ -1,16 +1,15 @@
+ /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+ /* vim: set sw=2 ts=8 et tw=80 : */
+ 
+ /* This Source Code Form is subject to the terms of the Mozilla Public
+  * License, v. 2.0. If a copy of the MPL was not distributed with this
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
+-#include "necko-config.h"
+ #include "nsHttp.h"
+ #include "mozilla/BasePrincipal.h"
+ #include "mozilla/ipc/IPCStreamUtils.h"
+ #include "mozilla/net/ExtensionProtocolHandler.h"
+ #include "mozilla/net/NeckoParent.h"
+ #include "mozilla/net/HttpChannelParent.h"
+ #include "mozilla/net/CookieServiceParent.h"
+ #include "mozilla/net/WyciwygChannelParent.h"
+diff --git a/netwerk/moz.build b/netwerk/moz.build
+--- a/netwerk/moz.build
++++ b/netwerk/moz.build
+@@ -29,11 +29,8 @@ if CONFIG['MOZ_SCTP']:
+ 
+ if CONFIG['NECKO_WIFI']:
+     DIRS += ['wifi']
+ 
+ DIRS += ['locales']
+ 
+ DIRS += ['build']
+ TEST_DIRS += ['test']
+-
+-CONFIGURE_DEFINE_FILES += ['necko-config.h']
+-EXPORTS += ['!necko-config.h']
+diff --git a/netwerk/necko-config.h.in b/netwerk/necko-config.h.in
+deleted file mode 100644
+--- a/netwerk/necko-config.h.in
++++ /dev/null
+@@ -1,12 +0,0 @@
+-/* 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/. */
+-
+-#ifndef _NECKO_CONFIG_H_
+-#define _NECKO_CONFIG_H_
+-
+-#undef NECKO_COOKIES
+-
+-#undef NECKO_WIFI
+-
+-#endif
+diff --git a/old-configure.in b/old-configure.in
+--- a/old-configure.in
++++ b/old-configure.in
+@@ -1641,17 +1641,16 @@ MOZ_FEEDS=1
+ MOZ_AUTH_EXTENSION=1
+ MOZ_PREF_EXTENSIONS=1
+ MOZ_SPELLCHECK=1
+ MOZ_TOOLKIT_SEARCH=1
+ MOZ_UNIVERSALCHARDET=1
+ MOZ_XUL=1
+ MOZ_ZIPWRITER=1
+ MOZ_NO_SMART_CARDS=
+-NECKO_COOKIES=1
+ MOZ_USE_NATIVE_POPUP_WINDOWS=
+ MOZ_EXCLUDE_HYPHENATION_DICTIONARIES=
+ MOZ_CONTENT_SANDBOX=
+ MOZ_GMP_SANDBOX=
+ MOZ_SANDBOX=1
+ MOZ_BINARY_EXTENSIONS=
+ MOZ_DEVTOOLS=server
+ 
+@@ -2834,29 +2833,16 @@ if test "$NECKO_WIFI"; then
+     AC_MSG_ERROR([Necko WiFi scanning needs DBus on your platform, remove --disable-dbus or use --disable-necko-wifi])
+   fi
+   AC_DEFINE(NECKO_WIFI)
+   _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_WIFI"
+ fi
+ AC_SUBST(NECKO_WIFI)
+ AC_SUBST(NECKO_WIFI_DBUS)
+ 
+-dnl
+-dnl option to disable cookies
+-dnl
+-MOZ_ARG_DISABLE_BOOL(cookies,
+-[  --disable-cookies       Disable cookie support],
+-    NECKO_COOKIES=,
+-    NECKO_COOKIES=1)
+-AC_SUBST(NECKO_COOKIES)
+-if test "$NECKO_COOKIES"; then
+-    AC_DEFINE(NECKO_COOKIES)
+-    _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES"
+-fi
+-
+ dnl ========================================================
+ dnl =
+ dnl = Maintainer debug option (no --enable equivalent)
+ dnl =
+ dnl ========================================================
+ 
+ AC_SUBST(NM)
+ AC_SUBST_LIST(ASFLAGS)

frg/work-js/mozilla-release/patches/1635764-78a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1590787792 0
 # Node ID 23f9231f76bf57f5b8a1928c575f3ed1c503f44e
-# Parent  0bc958b7a41a1092e5f852ebece3cd734ed9417e
+# Parent  1b18ff0e2c71e7bf3415461ce4c050b7f154174f
 Bug 1635764 - Move --with-system-icu and --with-intl-api to python configure. r=firefox-build-system-reviewers,rstewart
 
 At the same time, because it's now simpler to do so, set the right data
@@ -142,15 +142,15 @@ deleted file mode 100644
 diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
 --- a/build/moz.configure/old.configure
 +++ b/build/moz.configure/old.configure
-@@ -261,29 +261,27 @@ def old_configure_options(*options):
+@@ -250,28 +250,26 @@ def old_configure_options(*options):
+     '--with-android-max-sdk',
+     '--with-android-min-sdk',
+     '--with-app-basename',
      '--with-app-name',
      '--with-branding',
      '--with-cross-lib',
      '--with-debug-label',
      '--with-distribution-id',
-     '--with-doc-include-dirs',
-     '--with-doc-input-dirs',
-     '--with-doc-output-dir',
 -    '--with-intl-api',
      '--with-jitreport-granularity',
      '--with-macbundlename-prefix',
@@ -162,16 +162,15 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
      '--with-nss-prefix',
      '--with-qemu-exe',
      '--with-sixgill',
-     '--with-system-bz2',
 -    '--with-system-icu',
      '--with-system-libevent',
      '--with-system-nspr',
      '--with-system-nss',
      '--with-system-png',
      '--with-system-zlib',
-     '--with-unify-dist',
      '--with-user-appdir',
      '--x-includes',
+     '--x-libraries',
 diff --git a/js/app.mozbuild b/js/app.mozbuild
 --- a/js/app.mozbuild
 +++ b/js/app.mozbuild
@@ -197,7 +196,7 @@ diff --git a/js/app.mozbuild b/js/app.mozbuild
 diff --git a/js/moz.configure b/js/moz.configure
 --- a/js/moz.configure
 +++ b/js/moz.configure
-@@ -429,20 +429,82 @@ js_option('--enable-pipeline-operator', 
+@@ -444,20 +444,82 @@ js_option('--enable-pipeline-operator', 
  @depends('--enable-pipeline-operator')
  def enable_pipeline_operator(value):
      if value:
@@ -304,7 +303,7 @@ diff --git a/js/src/aclocal.m4 b/js/src/aclocal.m4
 diff --git a/js/src/old-configure.in b/js/src/old-configure.in
 --- a/js/src/old-configure.in
 +++ b/js/src/old-configure.in
-@@ -1549,25 +1549,16 @@ AC_SUBST_LIST(MOZ_FIX_LINK_PATHS)
+@@ -1550,25 +1550,16 @@ AC_SUBST_LIST(MOZ_FIX_LINK_PATHS)
  AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
  
  AC_SUBST(MOZ_APP_NAME)
@@ -356,7 +355,7 @@ diff --git a/js/sub.configure b/js/sub.configure
 diff --git a/old-configure.in b/old-configure.in
 --- a/old-configure.in
 +++ b/old-configure.in
-@@ -3074,28 +3074,16 @@ if test -n "$MOZ_TELEMETRY_REPORTING" ||
+@@ -3060,28 +3060,16 @@ if test -n "$MOZ_TELEMETRY_REPORTING" ||
    AC_DEFINE(MOZ_DATA_REPORTING)
    AC_SUBST(MOZ_DATA_REPORTING)
  fi

frg/work-js/mozilla-release/patches/1638195-PARTIAL-78a1.patch

@@ -0,0 +1,114 @@
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1589514976 0
+# Node ID 2c4692d0b6cbdcfef0ae02bf1c0abb20d96d898d
+# Parent  04b1499da5193fdb01211536e76aea495a350059
+Bug 1638195 - Remove python configure knowledge of old configure arguments that were removed. r=nalexander
+
+--enable-cookies, removed in bug 1623593.
+  --enable-directshow, removed in bug 1370192.
+  --enable-gconf, removed in bug 1433685.
+  --enable-libjpeg-turbo, removed in bug 1515852.
+  --enable-llvm-hacks, removed in bug 1484872.
+  --enable-nfc, removed in bug 1310859.
+  --enable-startup-notification, removed in bug 726479.
+  --enable-synth-pico, removed in bug 1331696.
+  --with-doc-include-dirs, --with-doc-input-dirs, --with-doc-output-dir,
+  removed in bug 1435424
+  --with-system-bz2, removed in bug 1418425.
+  --with-unify-dist, removed in bug 1339182.
+
+Differential Revision: https://phabricator.services.mozilla.com/D75464
+
+diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
+--- a/build/moz.configure/old.configure
++++ b/build/moz.configure/old.configure
+@@ -206,49 +206,41 @@ def old_configure_options(*options):
+ 
+     return depends(host_for_sub_configure, target_for_sub_configure, all_options, *options)
+ 
+ 
+ @old_configure_options(
+     '--cache-file',
+     '--datadir',
+     '--enable-content-sandbox',
+-    '--enable-cookies',
+     '--enable-cpp-rtti',
+     '--enable-crashreporter',
+     '--enable-dbus',
+     '--enable-debug-js-modules',
+-    '--enable-directshow',
+     '--enable-dtrace',
+     '--enable-dump-painting',
+     '--enable-extensions',
+     '--enable-feeds',
+-    '--enable-gconf',
+     '--enable-icf',
+     '--enable-install-strip',
+-    '--enable-libjpeg-turbo',
+     '--enable-libproxy',
+-    '--enable-llvm-hacks',
+     '--enable-logrefcnt',
+     '--enable-mobile-optimize',
+     '--enable-necko-wifi',
+     '--enable-negotiateauth',
+-    '--enable-nfc',
+     '--enable-nspr-build',
+     '--enable-official-branding',
+     '--enable-parental-controls',
+     '--enable-posix-nspr-emulation',
+     '--enable-pref-extensions',
+     '--enable-readline',
+     '--enable-sandbox',
+     '--enable-signmar',
+-    '--enable-startup-notification',
+     '--enable-startupcache',
+     '--enable-strip',
+-    '--enable-synth-pico',
+     '--enable-system-cairo',
+     '--enable-system-extension-dirs',
+     '--enable-system-pixman',
+     '--enable-universalchardet',
+     '--enable-updater',
+     '--enable-xul',
+     '--enable-zipwriter',
+     '--includedir',
+@@ -258,38 +250,33 @@ def old_configure_options(*options):
+     '--with-android-max-sdk',
+     '--with-android-min-sdk',
+     '--with-app-basename',
+     '--with-app-name',
+     '--with-branding',
+     '--with-cross-lib',
+     '--with-debug-label',
+     '--with-distribution-id',
+-    '--with-doc-include-dirs',
+-    '--with-doc-input-dirs',
+-    '--with-doc-output-dir',
+     '--with-intl-api',
+     '--with-jitreport-granularity',
+     '--with-macbundlename-prefix',
+     '--with-nspr-cflags',
+     '--with-nspr-exec-prefix',
+     '--with-nspr-libs',
+     '--with-nspr-prefix',
+     '--with-nss-exec-prefix',
+     '--with-nss-prefix',
+     '--with-qemu-exe',
+     '--with-sixgill',
+-    '--with-system-bz2',
+     '--with-system-icu',
+     '--with-system-libevent',
+     '--with-system-nspr',
+     '--with-system-nss',
+     '--with-system-png',
+     '--with-system-zlib',
+-    '--with-unify-dist',
+     '--with-user-appdir',
+     '--x-includes',
+     '--x-libraries',
+ )
+ def prepare_configure_options(host, target, all_options, *options):
+     # old-configure only supports the options listed in @old_configure_options
+     # so we don't need to pass it every single option we've been passed. Only
+     # the ones that are not supported by python configure need to.

frg/work-js/mozilla-release/patches/1639815-1-78a1.patch

@@ -3,7 +3,7 @@
 # Date 1590100726 0
 #      Thu May 21 22:38:46 2020 +0000
 # Node ID a98fde98a836ac69aa7b1fedf3616ab969c3b8a0
-# Parent  5758d4b24dfbb26e830f1e9a469385d14e4fefd7
+# Parent  5c18ddefd7d4265fee14950c107566f435c2918d
 Bug 1639815 - Move --with-qemu-exe and --with-cross-lib to python configure. r=froydnj
 
 Differential Revision: https://phabricator.services.mozilla.com/D76285
@@ -11,7 +11,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D76285
 diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
 --- a/build/moz.configure/old.configure
 +++ b/build/moz.configure/old.configure
-@@ -254,31 +254,29 @@ def old_configure_options(*options):
+@@ -247,28 +247,26 @@ def old_configure_options(*options):
      '--libdir',
      '--prefix',
      '--with-android-distribution-directory',
@@ -23,9 +23,6 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
 -    '--with-cross-lib',
      '--with-debug-label',
      '--with-distribution-id',
-     '--with-doc-include-dirs',
-     '--with-doc-input-dirs',
-     '--with-doc-output-dir',
      '--with-jitreport-granularity',
      '--with-macbundlename-prefix',
      '--with-nspr-cflags',
@@ -36,17 +33,17 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
      '--with-nss-prefix',
 -    '--with-qemu-exe',
      '--with-sixgill',
-     '--with-system-bz2',
      '--with-system-libevent',
      '--with-system-nspr',
      '--with-system-nss',
      '--with-system-png',
      '--with-system-zlib',
-     '--with-unify-dist',
+     '--with-user-appdir',
+     '--x-includes',
 diff --git a/js/moz.configure b/js/moz.configure
 --- a/js/moz.configure
 +++ b/js/moz.configure
-@@ -444,16 +444,26 @@ js_option('--enable-new-regexp', default
+@@ -459,16 +459,26 @@ js_option('--enable-new-regexp', default
  def enable_new_regexp(value):
      if value:
          return True
@@ -76,7 +73,7 @@ diff --git a/js/moz.configure b/js/moz.configure
 diff --git a/js/src/old-configure.in b/js/src/old-configure.in
 --- a/js/src/old-configure.in
 +++ b/js/src/old-configure.in
-@@ -1503,31 +1503,16 @@ dnl ====================================
+@@ -1506,31 +1506,16 @@ dnl ====================================
  dnl =
  dnl = Standalone module options
  dnl =

frg/work-js/mozilla-release/patches/1639815-2-78a1.patch

@@ -3,7 +3,7 @@
 # Date 1590100726 0
 #      Thu May 21 22:38:46 2020 +0000
 # Node ID b719a4f5a39f8d0dd8a0c4bf9870ad641aee7afe
-# Parent  793a1e1539f9702bc34ec3858f24c2b373d69876
+# Parent  a9a42356252466a569264a1027d6b1d6d60129d0
 Bug 1639815 - Move --with-sixgill to python configure. r=froydnj
 
 Differential Revision: https://phabricator.services.mozilla.com/D76286
@@ -11,7 +11,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D76286
 diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
 --- a/build/moz.configure/old.configure
 +++ b/build/moz.configure/old.configure
-@@ -267,17 +267,16 @@ def old_configure_options(*options):
+@@ -257,17 +257,16 @@ def old_configure_options(*options):
      '--with-jitreport-granularity',
      '--with-macbundlename-prefix',
      '--with-nspr-cflags',
@@ -21,18 +21,18 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
      '--with-nss-exec-prefix',
      '--with-nss-prefix',
 -    '--with-sixgill',
-     '--with-system-bz2',
      '--with-system-libevent',
      '--with-system-nspr',
      '--with-system-nss',
      '--with-system-png',
      '--with-system-zlib',
-     '--with-unify-dist',
      '--with-user-appdir',
+     '--x-includes',
+     '--x-libraries',
 diff --git a/js/moz.configure b/js/moz.configure
 --- a/js/moz.configure
 +++ b/js/moz.configure
-@@ -439,16 +439,31 @@ set_define('ENABLE_PIPELINE_OPERATOR', e
+@@ -468,16 +468,31 @@ set_define('ENABLE_NEW_REGEXP', enable_n
  # ============================================
  js_option('--with-qemu-exe', nargs=1, help='Use path as an arm emulator on host platforms')
  set_config('QEMU_EXE', depends_if('--with-qemu-exe')(lambda x: x))
@@ -67,7 +67,7 @@ diff --git a/js/moz.configure b/js/moz.configure
 diff --git a/js/src/old-configure.in b/js/src/old-configure.in
 --- a/js/src/old-configure.in
 +++ b/js/src/old-configure.in
-@@ -1344,33 +1344,16 @@ dnl ====================================
+@@ -1346,33 +1346,16 @@ dnl ====================================
  dnl = Enable using the clang plugin to build
  dnl ========================================================
  

frg/work-js/mozilla-release/patches/1639815-3-78a1.patch

@@ -3,7 +3,7 @@
 # Date 1590100726 0
 #      Thu May 21 22:38:46 2020 +0000
 # Node ID bd8867b35eeeea17a8607f2519d186f1692f9fed
-# Parent  1b884de9cb47a4f86bb9fa39b5624fea9fd3f4e3
+# Parent  d1f3e887ddb3e76b818581b2012aea3cfcba8591
 Bug 1639815 - Move --enable-readline to python configure. r=froydnj
 
 Differential Revision: https://phabricator.services.mozilla.com/D76287
@@ -11,10 +11,10 @@ Differential Revision: https://phabricator.services.mozilla.com/D76287
 diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
 --- a/build/moz.configure/old.configure
 +++ b/build/moz.configure/old.configure
-@@ -231,17 +231,16 @@ def old_configure_options(*options):
+@@ -226,17 +226,16 @@ def old_configure_options(*options):
+     '--enable-mobile-optimize',
      '--enable-necko-wifi',
      '--enable-negotiateauth',
-     '--enable-nfc',
      '--enable-nspr-build',
      '--enable-official-branding',
      '--enable-parental-controls',
@@ -23,16 +23,16 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
 -    '--enable-readline',
      '--enable-sandbox',
      '--enable-signmar',
-     '--enable-startup-notification',
      '--enable-startupcache',
      '--enable-strip',
-     '--enable-synth-pico',
      '--enable-system-cairo',
      '--enable-system-extension-dirs',
+     '--enable-system-pixman',
+     '--enable-universalchardet',
 diff --git a/js/moz.configure b/js/moz.configure
 --- a/js/moz.configure
 +++ b/js/moz.configure
-@@ -455,16 +455,39 @@ def sixgill(value):
+@@ -484,16 +484,39 @@ def sixgill(value):
      for f in ('bin/xdbfind', 'gcc/xgill.so', 'scripts/wrap_gcc/g++'):
          if not os.path.exists(os.path.join(value[0], f)):
              die('The sixgill plugin and binaries are not at the specified path')
@@ -75,7 +75,7 @@ diff --git a/js/moz.configure b/js/moz.configure
 diff --git a/js/src/old-configure.in b/js/src/old-configure.in
 --- a/js/src/old-configure.in
 +++ b/js/src/old-configure.in
-@@ -1443,51 +1443,16 @@ fi
+@@ -1446,51 +1446,16 @@ fi
  fi # ! SKIP_COMPILER_CHECKS
  
  AC_DEFINE(CPP_THROW_NEW, [throw()])

frg/work-js/mozilla-release/patches/1639815-4-78a1.patch

@@ -3,7 +3,7 @@
 # Date 1590100726 0
 #      Thu May 21 22:38:46 2020 +0000
 # Node ID 650751e6df05ecf9d48c720cc48993a4b0a89014
-# Parent  33f6d05e95c64733629905fe3744550e56a12eb6
+# Parent  15971859085ad3d10393b6ed5b7d0886d6762cf0
 Bug 1639815 - Move --enable-cpp-rtti to python configure. r=froydnj
 
 This only moves the option, but still leaves it to the old-configure code to
@@ -39,7 +39,8 @@ diff --git a/build/autoconf/compiler-opts.m4 b/build/autoconf/compiler-opts.m4
 diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
 --- a/build/moz.configure/old.configure
 +++ b/build/moz.configure/old.configure
-@@ -207,17 +207,16 @@ def old_configure_options(*options):
+@@ -206,17 +206,16 @@ def old_configure_options(*options):
+ 
      return depends(host_for_sub_configure, target_for_sub_configure, all_options, *options)
  
  
@@ -47,16 +48,15 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
      '--cache-file',
      '--datadir',
      '--enable-content-sandbox',
-     '--enable-cookies',
 -    '--enable-cpp-rtti',
      '--enable-crashreporter',
      '--enable-dbus',
      '--enable-debug-js-modules',
-     '--enable-directshow',
      '--enable-dtrace',
      '--enable-dump-painting',
      '--enable-extensions',
      '--enable-feeds',
+     '--enable-icf',
 diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
 --- a/build/moz.configure/toolchain.configure
 +++ b/build/moz.configure/toolchain.configure

frg/work-js/mozilla-release/patches/1639815-5-78a1.patch

@@ -3,7 +3,7 @@
 # Date 1590100727 0
 #      Thu May 21 22:38:47 2020 +0000
 # Node ID b33846644c52a8965fbcf6ae74308d597430c28f
-# Parent  1024f829c038e4a6a31bb470b38c57de85bdfe2f
+# Parent  69eb439fba8e86ff98634290d864ab7d9338de6e
 Bug 1639815 - Move --enable-dtrace to python configure. r=froydnj
 
 Differential Revision: https://phabricator.services.mozilla.com/D76289
@@ -11,24 +11,24 @@ Differential Revision: https://phabricator.services.mozilla.com/D76289
 diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
 --- a/build/moz.configure/old.configure
 +++ b/build/moz.configure/old.configure
-@@ -211,17 +211,16 @@ def old_configure_options(*options):
+@@ -209,17 +209,16 @@ def old_configure_options(*options):
+ 
+ @old_configure_options(
      '--cache-file',
      '--datadir',
      '--enable-content-sandbox',
-     '--enable-cookies',
      '--enable-crashreporter',
      '--enable-dbus',
      '--enable-debug-js-modules',
-     '--enable-directshow',
 -    '--enable-dtrace',
      '--enable-dump-painting',
      '--enable-extensions',
      '--enable-feeds',
-     '--enable-gconf',
      '--enable-icf',
      '--enable-install-strip',
-     '--enable-libjpeg-turbo',
      '--enable-libproxy',
+     '--enable-logrefcnt',
+     '--enable-mobile-optimize',
 diff --git a/js/src/old-configure.in b/js/src/old-configure.in
 --- a/js/src/old-configure.in
 +++ b/js/src/old-configure.in

frg/work-js/mozilla-release/patches/1639815-6-78a1.patch

@@ -3,7 +3,7 @@
 # Date 1590100727 0
 #      Thu May 21 22:38:47 2020 +0000
 # Node ID dc731fd750fc03ba51f96ea5061ba352304bdc04
-# Parent  535de643b955b136c8eb75edcc2a2ebbbd531e0f
+# Parent  defde1adc89ca3cf6f87efcdc1670b2ca3e4d60b
 Bug 1639815 - Move --disable-icf to python configure. r=froydnj
 
 Differential Revision: https://phabricator.services.mozilla.com/D76290
@@ -36,24 +36,24 @@ diff --git a/build/autoconf/compiler-opts.m4 b/build/autoconf/compiler-opts.m4
 diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
 --- a/build/moz.configure/old.configure
 +++ b/build/moz.configure/old.configure
-@@ -215,17 +215,16 @@ def old_configure_options(*options):
+@@ -212,17 +212,16 @@ def old_configure_options(*options):
+     '--datadir',
+     '--enable-content-sandbox',
      '--enable-crashreporter',
      '--enable-dbus',
      '--enable-debug-js-modules',
-     '--enable-directshow',
      '--enable-dump-painting',
      '--enable-extensions',
      '--enable-feeds',
-     '--enable-gconf',
 -    '--enable-icf',
      '--enable-install-strip',
-     '--enable-libjpeg-turbo',
      '--enable-libproxy',
-     '--enable-llvm-hacks',
      '--enable-logrefcnt',
      '--enable-mobile-optimize',
      '--enable-necko-wifi',
      '--enable-negotiateauth',
+     '--enable-nspr-build',
+     '--enable-official-branding',
 diff --git a/moz.configure b/moz.configure
 --- a/moz.configure
 +++ b/moz.configure

frg/work-js/mozilla-release/patches/1639815-7-78a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1590105118 0
 # Node ID 943fe621074459d34144ab7c0af07d7443ba5aed
-# Parent  20756d2567a9b6873f8fa2f516751047d9dc756c
+# Parent  dc3dd57ecba083d4629ff93d9237fbdf0d4df070
 Bug 1639815 - Move --enable-strip and --enable-install-strip to python configure. r=nalexander
 
 Differential Revision: https://phabricator.services.mozilla.com/D76291
@@ -10,35 +10,30 @@ Differential Revision: https://phabricator.services.mozilla.com/D76291
 diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
 --- a/build/moz.configure/old.configure
 +++ b/build/moz.configure/old.configure
-@@ -215,17 +215,16 @@ def old_configure_options(*options):
+@@ -212,31 +212,29 @@ def old_configure_options(*options):
+     '--datadir',
+     '--enable-content-sandbox',
      '--enable-crashreporter',
      '--enable-dbus',
      '--enable-debug-js-modules',
-     '--enable-directshow',
      '--enable-dump-painting',
      '--enable-extensions',
      '--enable-feeds',
-     '--enable-gconf',
 -    '--enable-install-strip',
-     '--enable-libjpeg-turbo',
      '--enable-libproxy',
-     '--enable-llvm-hacks',
      '--enable-logrefcnt',
      '--enable-mobile-optimize',
      '--enable-necko-wifi',
      '--enable-negotiateauth',
-     '--enable-nfc',
-@@ -233,17 +232,16 @@ def old_configure_options(*options):
+     '--enable-nspr-build',
      '--enable-official-branding',
      '--enable-parental-controls',
      '--enable-posix-nspr-emulation',
      '--enable-pref-extensions',
      '--enable-sandbox',
      '--enable-signmar',
-     '--enable-startup-notification',
      '--enable-startupcache',
 -    '--enable-strip',
-     '--enable-synth-pico',
      '--enable-system-cairo',
      '--enable-system-extension-dirs',
      '--enable-system-pixman',
@@ -46,6 +41,7 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
      '--enable-updater',
      '--enable-xul',
      '--enable-zipwriter',
+     '--includedir',
 diff --git a/js/src/old-configure.in b/js/src/old-configure.in
 --- a/js/src/old-configure.in
 +++ b/js/src/old-configure.in
@@ -100,7 +96,7 @@ diff --git a/js/src/old-configure.in b/js/src/old-configure.in
  
  dnl ========================================================
  dnl = Support for demangling undefined symbols
-@@ -1455,18 +1438,16 @@ AC_SUBST(RCFLAGS)
+@@ -1456,18 +1439,16 @@ AC_SUBST(RCFLAGS)
  AC_SUBST(WINDRES)
  AC_SUBST(IMPLIB)
  AC_SUBST(FILTER)
@@ -199,7 +195,7 @@ diff --git a/old-configure.in b/old-configure.in
  if test -z "$SKIP_COMPILER_CHECKS"; then
  dnl Checks for typedefs, structures, and compiler characteristics.
  dnl ========================================================
-@@ -2416,32 +2414,16 @@ dnl ====================================
+@@ -2415,32 +2413,16 @@ dnl ====================================
  dnl = Enable using the clang plugin to build
  dnl ========================================================
  
@@ -232,7 +228,7 @@ diff --git a/old-configure.in b/old-configure.in
     DEBUG_JS_MODULES=1,
     DEBUG_JS_MODULES=)
  
-@@ -2866,18 +2848,16 @@ AC_SUBST(MOZ_CRASHREPORTER)
+@@ -2852,18 +2834,16 @@ AC_SUBST(MOZ_CRASHREPORTER)
  AC_SUBST(MOZ_CRASHREPORTER_INJECTOR)
  AC_SUBST(MOZ_STUB_INSTALLER)
  AC_SUBST(MOZ_ENABLE_SIGNMAR)

frg/work-js/mozilla-release/patches/1639815-8-78a1.patch

@@ -3,7 +3,7 @@
 # Date 1590106996 -10800
 #      Fri May 22 03:23:16 2020 +0300
 # Node ID c413912c4f0e15c7ab69283d3a7cdcd2b7a7cb3d
-# Parent  d23bbc40b0cebc62da4105ba165346c22ac5d72e
+# Parent  2aab2a19cf23f61e4b4536c7ef58545a6de30ee1
 Bug 1639815 - Fix for win asan build bustages. r=glandium
 
 CLOSED TREE

frg/work-js/mozilla-release/patches/1656044-PARTIAL-81a1.patch

@@ -0,0 +1,108 @@
+# HG changeset patch
+# User Ricky Stewart <rstewart@mozilla.com>
+# Date 1596461819 0
+# Node ID e4b490d63e4882297234d519e4ea436dbe854ee0
+# Parent  4d93100d2e681b5a25153df0a2d93f648c1d5d17
+Bug 1656044 - Move `--enable-mobile-optimize`, `MOZ_GFX_OPTIMIZE_MOBILE` from `old-configure` r=geckoview-reviewers,mhentges,froydnj,glandium,esawin
+
+Differential Revision: https://phabricator.services.mozilla.com/D85321
+
+diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
+--- a/build/moz.configure/old.configure
++++ b/build/moz.configure/old.configure
+@@ -214,17 +214,16 @@ def old_configure_options(*options):
+     '--enable-crashreporter',
+     '--enable-dbus',
+     '--enable-debug-js-modules',
+     '--enable-dump-painting',
+     '--enable-extensions',
+     '--enable-feeds',
+     '--enable-libproxy',
+     '--enable-logrefcnt',
+-    '--enable-mobile-optimize',
+     '--enable-necko-wifi',
+     '--enable-negotiateauth',
+     '--enable-nspr-build',
+     '--enable-official-branding',
+     '--enable-parental-controls',
+     '--enable-posix-nspr-emulation',
+     '--enable-pref-extensions',
+     '--enable-sandbox',
+diff --git a/js/src/old-configure.in b/js/src/old-configure.in
+--- a/js/src/old-configure.in
++++ b/js/src/old-configure.in
+@@ -513,17 +513,16 @@ case "$target" in
+         fi
+ 
+         LDFLAGS=$_SAVE_LDFLAGS
+     fi
+     MOZ_FIX_LINK_PATHS="-Wl,-executable_path,${DIST}/bin"
+     ;;
+ 
+ *-android*|*-linuxandroid*)
+-    MOZ_GFX_OPTIMIZE_MOBILE=1
+     MOZ_OPTIMIZE_FLAGS="-O3"
+     if test -z "$CLANG_CC"; then
+        MOZ_OPTIMIZE_FLAGS="-freorder-blocks -fno-reorder-functions $MOZ_OPTIMIZE_FLAGS"
+     fi
+     ;;
+ 
+ *-*linux*)
+     if test "$GNU_CC" -o "$GNU_CXX"; then
+diff --git a/old-configure.in b/old-configure.in
+--- a/old-configure.in
++++ b/old-configure.in
+@@ -605,17 +605,16 @@ case "$target" in
+     MOZ_FIX_LINK_PATHS="-Wl,-executable_path,${DIST}/bin"
+     ;;
+ 
+ *-android*|*-linuxandroid*)
+     if test "$COMPILE_ENVIRONMENT"; then
+         MOZ_LINKER=1
+     fi
+ 
+-    MOZ_GFX_OPTIMIZE_MOBILE=1
+     if test -z "$CLANG_CC"; then
+         MOZ_OPTIMIZE_FLAGS="-freorder-blocks -fno-reorder-functions -Os"
+     else
+         # From https://github.com/android-ndk/ndk/issues/133#issuecomment-308549264
+         # -Oz is smaller than -Os on clang.
+         MOZ_OPTIMIZE_FLAGS="-Oz"
+     fi
+     ;;
+@@ -2277,35 +2276,16 @@ dnl MOZ_ARG_HEADER(Features that require
+ dnl ========================================================
+ dnl =
+ dnl = Runtime debugging and Optimization Options
+ dnl =
+ dnl ========================================================
+ MOZ_ARG_HEADER(Runtime debugging and Optimizations)
+ 
+ dnl ========================================================
+-dnl enable mobile optimizations
+-dnl ========================================================
+-MOZ_ARG_ENABLE_BOOL(mobile-optimize,
+-[  --enable-mobile-optimize
+-                          Enable mobile optimizations],
+-    MOZ_GFX_OPTIMIZE_MOBILE=1)
+-
+-AC_SUBST(MOZ_GFX_OPTIMIZE_MOBILE)
+-
+-if test "$MOZ_GFX_OPTIMIZE_MOBILE"; then
+-    # We ignore paint will resample on mobile for performance.
+-    # We may want to revisit this later.
+-    MOZ_IGNORE_PAINT_WILL_RESAMPLE=1
+-
+-    AC_DEFINE(MOZ_GFX_OPTIMIZE_MOBILE)
+-    AC_DEFINE(MOZ_IGNORE_PAINT_WILL_RESAMPLE)
+-fi
+-
+-dnl ========================================================
+ dnl = Enable code optimization. ON by default.
+ dnl ========================================================
+ 
+ # Use value from moz.configure if one is defined. Else use our computed
+ # value.
+ if test -n "${MOZ_CONFIGURE_OPTIMIZE_FLAGS}"; then
+     MOZ_OPTIMIZE_FLAGS=${MOZ_CONFIGURE_OPTIMIZE_FLAGS}
+ fi

frg/work-js/mozilla-release/patches/1743538-96a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1638404548 0
 # Node ID 7bed7be5677efbd93bd9d1ecf6d546542ec9e534
-# Parent  7af79a49bf5f7d22deb1e81b5ffd7d45034b4bd2
+# Parent  47f35542d3b52e2cb73901e266d2a18a944308da
 Bug 1743538 - Clear MOZ_FIX_LINK_PATHS on macOS. r=firefox-build-system-reviewers,andi
 
 -executable-path is not a supported option in lld, and doesn't appear to
@@ -13,7 +13,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D132550
 diff --git a/js/src/old-configure.in b/js/src/old-configure.in
 --- a/js/src/old-configure.in
 +++ b/js/src/old-configure.in
-@@ -504,17 +504,17 @@ case "$target" in
+@@ -508,17 +508,17 @@ case "$target" in
              AC_MSG_RESULT([yes])
              MOZ_OPTIMIZE_LDFLAGS="-Wl,-dead_strip"
          else
@@ -27,15 +27,15 @@ diff --git a/js/src/old-configure.in b/js/src/old-configure.in
      ;;
  
  *-android*|*-linuxandroid*)
-     AC_DEFINE(NO_PW_GECOS)
-     MOZ_GFX_OPTIMIZE_MOBILE=1
      MOZ_OPTIMIZE_FLAGS="-O3"
      if test -z "$CLANG_CC"; then
         MOZ_OPTIMIZE_FLAGS="-freorder-blocks -fno-reorder-functions $MOZ_OPTIMIZE_FLAGS"
+     fi
+     ;;
 diff --git a/old-configure.in b/old-configure.in
 --- a/old-configure.in
 +++ b/old-configure.in
-@@ -592,17 +592,17 @@ case "$target" in
+@@ -595,17 +595,17 @@ case "$target" in
              MOZ_OPTIMIZE_LDFLAGS="-Wl,-dead_strip"
          else
              AC_MSG_RESULT([no])
@@ -49,8 +49,8 @@ diff --git a/old-configure.in b/old-configure.in
      ;;
  
  *-android*|*-linuxandroid*)
-     AC_DEFINE(NO_PW_GECOS)
- 
      if test "$COMPILE_ENVIRONMENT"; then
          MOZ_LINKER=1
      fi
+ 
+     if test -z "$CLANG_CC"; then

frg/work-js/mozilla-release/patches/1746299-97a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1639787554 0
 # Node ID efef2e68769eeadbd5568eebee8c023f10bba7f0
-# Parent  628ee89ff04844e34204363b94a924ed3747f78a
+# Parent  f120ed04c401c2eb1b518d00b87a8a920fa5df08
 Bug 1746299 - Remove broken support for --enable-project=extensions and --enable-extensions. r=Gijs,firefox-build-system-reviewers,mhentges
 
 The former is broken because of a lack of a app.mozbuild file and has
@@ -43,24 +43,24 @@ diff --git a/browser/app.mozbuild b/browser/app.mozbuild
 diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
 --- a/build/moz.configure/old.configure
 +++ b/build/moz.configure/old.configure
-@@ -212,17 +212,16 @@ def old_configure_options(*options):
+@@ -155,17 +155,16 @@ def old_configure_options(*options):
+ @old_configure_options(
+     '--cache-file',
      '--datadir',
      '--enable-content-sandbox',
-     '--enable-cookies',
      '--enable-crashreporter',
      '--enable-dbus',
      '--enable-debug-js-modules',
-     '--enable-directshow',
      '--enable-dump-painting',
 -    '--enable-extensions',
      '--enable-feeds',
-     '--enable-gconf',
-     '--enable-libjpeg-turbo',
      '--enable-libproxy',
-     '--enable-llvm-hacks',
      '--enable-logrefcnt',
-     '--enable-mobile-optimize',
      '--enable-necko-wifi',
+     '--enable-negotiateauth',
+     '--enable-nspr-build',
+     '--enable-official-branding',
+     '--enable-parental-controls',
 diff --git a/extensions/build.mk b/extensions/build.mk
 deleted file mode 100644
 --- a/extensions/build.mk
@@ -125,7 +125,7 @@ deleted file mode 100644
 diff --git a/old-configure.in b/old-configure.in
 --- a/old-configure.in
 +++ b/old-configure.in
-@@ -1997,46 +1997,16 @@ if test -n "$MOZ_CRASHREPORTER"; then
+@@ -1995,46 +1995,16 @@ if test -n "$MOZ_CRASHREPORTER"; then
    if test "$OS_ARCH" = "WINNT"; then
      if test -z "$HAVE_64BIT_BUILD" -a -n "$COMPILE_ENVIRONMENT"; then
        MOZ_CRASHREPORTER_INJECTOR=1
@@ -172,7 +172,7 @@ diff --git a/old-configure.in b/old-configure.in
  # "cairo-ft-font.c" includes <dlfcn.h>, which only exists on posix platforms
  if test -n "$MOZ_TREE_FREETYPE" -a "$OS_TARGET" != WINNT; then
     MOZ_ENABLE_CAIRO_FT=1
-@@ -2675,19 +2645,16 @@ AC_SUBST_TOML_LIST(BINDGEN_SYSTEM_FLAGS)
+@@ -2654,19 +2624,16 @@ AC_SUBST_TOML_LIST(BINDGEN_SYSTEM_FLAGS)
  dnl ========================================================
  dnl disable xul
  dnl ========================================================

frg/work-js/mozilla-release/patches/1747754-PARTIAL-97a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1640816331 0
 # Node ID 34308b58e329edae3ade1265ebf7e3882d73b0ea
-# Parent  d5dace02f506cc9dc2de5c3cf6aa4ea17c1de96f
+# Parent  ffb0c3b2ae328086163b6a5d0ef704cf3b979a38
 Bug 1747754 - Move --with-android-min-sdk to python configure. r=firefox-build-system-reviewers,geckoview-reviewers,mhentges,calu
 
 And remove --with-android-max-sdk, which hasn't been used since the
@@ -58,7 +58,7 @@ diff --git a/build/autoconf/android.m4 b/build/autoconf/android.m4
 diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
 --- a/build/moz.configure/old.configure
 +++ b/build/moz.configure/old.configure
-@@ -242,18 +242,16 @@ def old_configure_options(*options):
+@@ -179,18 +179,16 @@ def old_configure_options(*options):
      '--enable-system-pixman',
      '--enable-universalchardet',
      '--enable-updater',
@@ -74,13 +74,13 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
      '--with-branding',
      '--with-debug-label',
      '--with-distribution-id',
-     '--with-doc-include-dirs',
-     '--with-doc-input-dirs',
-     '--with-doc-output-dir',
+     '--with-jitreport-granularity',
+     '--with-macbundlename-prefix',
+     '--with-nspr-cflags',
 diff --git a/old-configure.in b/old-configure.in
 --- a/old-configure.in
 +++ b/old-configure.in
-@@ -1692,27 +1692,16 @@ MOZ_ARG_WITH_STRING(app-basename,
+@@ -1690,27 +1690,16 @@ MOZ_ARG_WITH_STRING(app-basename,
  WITH_APP_BASENAME=$withval,
  )
  

frg/work-js/mozilla-release/patches/NOBUG-nukemozlinker-25319.patch

@@ -1,7 +1,7 @@
 # HG changeset patch
 # User Frank-Rainer Grahl <frgrahl@gmx.net>
 # Date 1705411363 -3600
-# Parent  c5b743a51a813ebe620be9d753854636b3592b01
+# Parent  cb7b34ca1c53d8b38b476907ea38950e8f28816e
 No Bug - Nuke custom linker. r=me a=me
 
 It was only needed for Android.
@@ -48,7 +48,7 @@ diff --git a/js/src/js-config.mozbuild b/js/src/js-config.mozbuild
 diff --git a/js/src/old-configure.in b/js/src/old-configure.in
 --- a/js/src/old-configure.in
 +++ b/js/src/old-configure.in
-@@ -1511,17 +1511,16 @@ AC_SUBST(TARGET_XPCOM_ABI)
+@@ -1509,17 +1509,16 @@ AC_SUBST(TARGET_XPCOM_ABI)
  
  dnl === -AC_SUBST(GCC_USE_GNU_LD) Bug 1478499 part 5 ===
  
@@ -6332,20 +6332,19 @@ diff --git a/mozglue/moz.build b/mozglue/moz.build
 diff --git a/old-configure.in b/old-configure.in
 --- a/old-configure.in
 +++ b/old-configure.in
-@@ -601,20 +601,16 @@ case "$target" in
+@@ -599,20 +599,16 @@ case "$target" in
+ 
+         LDFLAGS=$_SAVE_LDFLAGS
      fi
  
      MOZ_FIX_LINK_PATHS=
      ;;
  
  *-android*|*-linuxandroid*)
-     AC_DEFINE(NO_PW_GECOS)
- 
 -    if test "$COMPILE_ENVIRONMENT"; then
 -        MOZ_LINKER=1
 -    fi
 -
-     MOZ_GFX_OPTIMIZE_MOBILE=1
      if test -z "$CLANG_CC"; then
          MOZ_OPTIMIZE_FLAGS="-freorder-blocks -fno-reorder-functions -Os"
      else
@@ -6353,7 +6352,8 @@ diff --git a/old-configure.in b/old-configure.in
          # -Oz is smaller than -Os on clang.
          MOZ_OPTIMIZE_FLAGS="-Oz"
      fi
-@@ -933,23 +929,16 @@ if test -z "$MOZ_OPTIMIZE_FLAGS"; then
+     ;;
+@@ -930,23 +926,16 @@ if test -z "$MOZ_OPTIMIZE_FLAGS"; then
      MOZ_OPTIMIZE_FLAGS="-O"
  fi
  
@@ -6377,7 +6377,7 @@ diff --git a/old-configure.in b/old-configure.in
      MOZ_COMPILER_OPTS
  fi # COMPILE_ENVIRONMENT
  
-@@ -1391,17 +1380,17 @@ AC_CACHE_CHECK(for __thread keyword for 
+@@ -1388,17 +1377,17 @@ AC_CACHE_CHECK(for __thread keyword for 
                 ac_cv_thread_keyword,
                 [AC_TRY_LINK([__thread bool tlsIsMainThread = false;],
                              [return tlsIsMainThread;],
@@ -6396,7 +6396,7 @@ diff --git a/old-configure.in b/old-configure.in
        :
        ;;
      *-android*|*-linuxandroid*)
-@@ -1412,33 +1401,16 @@ if test "$ac_cv_thread_keyword" = yes -a
+@@ -1409,33 +1398,16 @@ if test "$ac_cv_thread_keyword" = yes -a
        ;;
      *)
        AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
@@ -6430,7 +6430,7 @@ diff --git a/old-configure.in b/old-configure.in
  dnl ========================================================
  dnl
  dnl Internationalization and Locale support is different
-@@ -2483,17 +2455,17 @@ fi # COMPILE_ENVIRONMENT
+@@ -2460,17 +2432,17 @@ fi # COMPILE_ENVIRONMENT
  dnl ========================================================
  dnl =
  dnl = Static Build Options
@@ -6449,7 +6449,7 @@ diff --git a/old-configure.in b/old-configure.in
  AC_SUBST(ZLIB_IN_MOZGLUE)
  
  dnl ========================================================
-@@ -2742,17 +2714,16 @@ AC_SUBST(MOZ_ANDROID_APPLICATION_CLASS)
+@@ -2706,17 +2678,16 @@ AC_SUBST(MOZ_ANDROID_APPLICATION_CLASS)
  AC_SUBST(MOZ_ANDROID_BROWSER_INTENT_CLASS)
  AC_SUBST(MOZ_EXCLUDE_HYPHENATION_DICTIONARIES)
  AC_SUBST(STRIP_FLAGS)

frg/work-js/mozilla-release/patches/series

@@ -6482,6 +6482,7 @@ NOBUG-20190207-crashreporter-67a1.patch
 1578531-71a1.patch
 1577411-71a1.patch
 1579546-71a1.patch
+1579545-71a1.patch
 1577799-71a1.patch
 1581921-71a1.patch
 1582078-71a1.patch
@@ -6857,6 +6858,7 @@ NOBUG-20190207-crashreporter-67a1.patch
 1624015-2-76a1.patch
 1624015-3-76a1.patch
 1624015-4-76a1.patch
+1623593-76a1.patch
 1626007-76a1.patch
 1594545-01-76a1.patch
 1594545-02-76a1.patch
@@ -6983,6 +6985,7 @@ NOBUG-20190207-crashreporter-67a1.patch
 1637474-1-78a1.patch
 1637474-2-78a1.patch
 1638036-78a1.patch
+1638195-PARTIAL-78a1.patch
 1639813-78a1.patch
 1638060-78a1.patch
 1624857-78a1.patch
@@ -7107,6 +7110,7 @@ NOBUG-20190207-crashreporter-67a1.patch
 1662381-78.patch
 1661485-81a1.patch
 1665675-78.patch
+1656044-PARTIAL-81a1.patch
 1659265-PARTIAL-81a1.patch
 1722225-1-killtelemetry-bhr-2539.patch
 1722225-2-killtelemetry-bhr-2539.patch
@@ -7729,7 +7733,6 @@ TOP-NOBUG-REGEXP-47-fixes-25319.patch
 
 
 
-
 dynamic-imports-ioptionsl-start
 1485615-1-63a1.patch
 1485615-2-63a1.patch
@@ -7756,9 +7759,6 @@ mozilla-esr78-push_446334.patch
 mozilla-esr78-push_446335.patch
 
 #important
-1340588
-1472402
-1384557
 
 
 ssssssssssssss
@@ -7822,16 +7822,6 @@ mozilla-central_400806.patch
 
 
 
-
-
-
-
-
-
-
-
-
-
 L-servo-20499-61a1.patch
 mozilla-esr78-push_464424.patch
 mozilla-esr78-push_464426.patch
@@ -7850,17 +7840,11 @@ mozilla-esr78-push_468727.patch
 mozilla-esr78-push_468728.patch
 
 1.patch
-L-1428718-2-72a1.patch
 L-1428718-3-72a1.patch
-
+L-1428718-2-72a1.patch
 2.patch
 
 
-
-
-
-
-
 mozilla-esr78-push_441446.patch
 mozilla-esr78-push_441447.patch
 
@@ -7873,8 +7857,6 @@ L-1513042-66a1.patch
 L-1635764-78a1.patch
 
 
-
-
 L-1663863-82a1.patch
 L-1641775-78a1.patch
 L-1641790-78a1.patch
@@ -7891,9 +7873,6 @@ mozilla-esr78-push_444866.patch
 1519501-2-66a1.patch
 1520815-66a1.patch
 
-
-
-
 mozilla-esr60_446566.patch
 
 

frg/work-js/mozilla-release/patches/series-test

@@ -6437,6 +6437,7 @@ NOBUG-20190207-crashreporter-67a1.patch
 1578531-71a1.patch
 1577411-71a1.patch
 1579546-71a1.patch
+1579545-71a1.patch
 1577799-71a1.patch
 1581921-71a1.patch
 1582078-71a1.patch
@@ -6812,6 +6813,7 @@ NOBUG-20190207-crashreporter-67a1.patch
 1624015-2-76a1.patch
 1624015-3-76a1.patch
 1624015-4-76a1.patch
+1623593-76a1.patch
 1626007-76a1.patch
 1594545-01-76a1.patch
 1594545-02-76a1.patch
@@ -6938,6 +6940,7 @@ NOBUG-20190207-crashreporter-67a1.patch
 1637474-1-78a1.patch
 1637474-2-78a1.patch
 1638036-78a1.patch
+1638195-PARTIAL-78a1.patch
 1639813-78a1.patch
 1638060-78a1.patch
 1624857-78a1.patch
@@ -7062,6 +7065,7 @@ NOBUG-20190207-crashreporter-67a1.patch
 1662381-78.patch
 1661485-81a1.patch
 1665675-78.patch
+1656044-PARTIAL-81a1.patch
 1659265-PARTIAL-81a1.patch
 1722225-1-killtelemetry-bhr-2539.patch
 1722225-2-killtelemetry-bhr-2539.patch