Chronological shuffle after recent landings

mozilla-release/patches/1638195-PARTIAL-78a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1589514976 0
 # Node ID 2c4692d0b6cbdcfef0ae02bf1c0abb20d96d898d
-# Parent  10b61c8612bc4be569116e773058a5618d67eaa3
+# Parent  601955d78858eec022fc39a5c68733fb7c8e95b4
 Bug 1638195 - Remove python configure knowledge of old configure arguments that were removed. r=nalexander
 
 --enable-cookies, removed in bug 1623593.
@@ -23,7 +23,7 @@ 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,48 +206,40 @@ def old_configure_options(*options):
+@@ -206,49 +206,41 @@ def old_configure_options(*options):
  
      return depends(host_for_sub_configure, target_for_sub_configure, all_options, *options)
  
@@ -53,6 +53,7 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
      '--enable-necko-wifi',
      '--enable-negotiateauth',
 -    '--enable-nfc',
+     '--enable-nspr-build',
      '--enable-official-branding',
      '--enable-parental-controls',
      '--enable-posix-nspr-emulation',
@@ -72,7 +73,7 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
      '--enable-xul',
      '--enable-zipwriter',
      '--includedir',
-@@ -257,33 +249,28 @@ def old_configure_options(*options):
+@@ -258,38 +250,33 @@ def old_configure_options(*options):
      '--with-android-max-sdk',
      '--with-android-min-sdk',
      '--with-app-basename',
@@ -87,6 +88,10 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
      '--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',
@@ -94,6 +99,7 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
 -    '--with-system-bz2',
      '--with-system-icu',
      '--with-system-libevent',
+     '--with-system-nspr',
      '--with-system-nss',
      '--with-system-png',
      '--with-system-zlib',

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  75904b07be2db33b373f7ec55ee61538ec767b9a
+# Parent  51c492d2935c70f94b7a0d1cf432785c588b5ebc
 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
-@@ -246,25 +246,23 @@ def old_configure_options(*options):
+@@ -247,29 +247,27 @@ def old_configure_options(*options):
      '--libdir',
      '--prefix',
      '--with-android-distribution-directory',
@@ -26,17 +26,21 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
      '--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-icu',
      '--with-system-libevent',
+     '--with-system-nspr',
      '--with-system-nss',
      '--with-system-png',
      '--with-system-zlib',
      '--with-user-appdir',
-     '--x-includes',
 diff --git a/js/moz.configure b/js/moz.configure
 --- a/js/moz.configure
 +++ b/js/moz.configure
@@ -62,7 +66,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
-@@ -1511,31 +1511,16 @@ dnl ====================================
+@@ -1518,31 +1518,16 @@ dnl ====================================
  dnl =
  dnl = Standalone module options
  dnl =

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  70ee88d122513f9666a3323def30334f49c1d5d0
+# Parent  e05efc44f7b3a20e0712794ca6544a7f15cbfb93
 Bug 1639815 - Move --with-sixgill to python configure. r=froydnj
 
 Differential Revision: https://phabricator.services.mozilla.com/D76286
@@ -11,28 +11,28 @@ 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
-@@ -253,17 +253,16 @@ def old_configure_options(*options):
-     '--with-branding',
-     '--with-debug-label',
-     '--with-distribution-id',
-     '--with-intl-api',
+@@ -258,17 +258,16 @@ def old_configure_options(*options):
      '--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-sixgill',
      '--with-system-icu',
      '--with-system-libevent',
+     '--with-system-nspr',
      '--with-system-nss',
      '--with-system-png',
      '--with-system-zlib',
      '--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
-@@ -459,8 +459,23 @@ set_define('ENABLE_NEW_REGEXP', enable_n
+@@ -457,8 +457,23 @@ set_define('ENABLE_NEW_REGEXP', enable_n
  # Options for generating the shell as a script
  # ============================================
  js_option('--with-qemu-exe', nargs=1, help='Use path as an arm emulator on host platforms')
@@ -59,7 +59,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
-@@ -1351,33 +1351,16 @@ dnl ====================================
+@@ -1358,33 +1358,16 @@ dnl ====================================
  dnl = Enable using the clang plugin to build
  dnl ========================================================
  

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  beaa6c0b548c760812586b48eb7131a0ebe3c06b
+# Parent  0257c3378bda41582d4e75275cf72cb2d75f77d2
 Bug 1639815 - Move --enable-readline to python configure. r=froydnj
 
 Differential Revision: https://phabricator.services.mozilla.com/D76287
@@ -11,11 +11,11 @@ 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
-@@ -225,17 +225,16 @@ def old_configure_options(*options):
-     '--enable-logrefcnt',
+@@ -226,17 +226,16 @@ def old_configure_options(*options):
      '--enable-mobile-optimize',
      '--enable-necko-wifi',
      '--enable-negotiateauth',
+     '--enable-nspr-build',
      '--enable-official-branding',
      '--enable-parental-controls',
      '--enable-posix-nspr-emulation',
@@ -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
-@@ -1451,51 +1451,16 @@ fi
+@@ -1458,51 +1458,16 @@ fi
  fi # ! SKIP_COMPILER_CHECKS
  
  AC_DEFINE(CPP_THROW_NEW, [throw()])

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  3346fbae598deb39901e1d2b68e7cb08cff07c32
+# Parent  bb13055ea35acd801fa2d79d93aa6b695aeb8841
 Bug 1639815 - Move --disable-icf to python configure. r=froydnj
 
 Differential Revision: https://phabricator.services.mozilla.com/D76290
@@ -52,12 +52,12 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
      '--enable-mobile-optimize',
      '--enable-necko-wifi',
      '--enable-negotiateauth',
+     '--enable-nspr-build',
      '--enable-official-branding',
-     '--enable-parental-controls',
 diff --git a/moz.configure b/moz.configure
 --- a/moz.configure
 +++ b/moz.configure
-@@ -595,16 +595,22 @@ js_option('--enable-dtrace', help='Build
+@@ -588,16 +588,22 @@ js_option('--enable-dtrace', help='Build
  
  dtrace = check_header('sys/sdt.h', when='--enable-dtrace',
                        onerror=lambda: die('dtrace enabled but sys/sdt.h not found'))

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  8e19f07750421aed7e45f196d2f9137d428fc98b
+# Parent  f729a1a5551bd3231a60366a719a6477be5f6125
 Bug 1639815 - Move --enable-strip and --enable-install-strip to python configure. r=nalexander
 
 Differential Revision: https://phabricator.services.mozilla.com/D76291
@@ -10,7 +10,7 @@ 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
-@@ -212,30 +212,28 @@ def old_configure_options(*options):
+@@ -212,31 +212,29 @@ def old_configure_options(*options):
      '--datadir',
      '--enable-content-sandbox',
      '--enable-crashreporter',
@@ -25,6 +25,7 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
      '--enable-mobile-optimize',
      '--enable-necko-wifi',
      '--enable-negotiateauth',
+     '--enable-nspr-build',
      '--enable-official-branding',
      '--enable-parental-controls',
      '--enable-posix-nspr-emulation',
@@ -44,7 +45,7 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
 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
-@@ -566,17 +566,16 @@ case "$target" in
+@@ -571,17 +571,16 @@ case "$target" in
          WIN32_CONSOLE_EXE_LDFLAGS=-mconsole
          WIN32_GUI_EXE_LDFLAGS=-mwindows
      else
@@ -62,7 +63,7 @@ diff --git a/js/src/old-configure.in b/js/src/old-configure.in
          fi
          WIN32_CONSOLE_EXE_LDFLAGS=-SUBSYSTEM:CONSOLE,$WIN32_SUBSYSTEM_VERSION
          WIN32_GUI_EXE_LDFLAGS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION
-@@ -1338,32 +1337,16 @@ dnl ====================================
+@@ -1345,32 +1344,16 @@ dnl ====================================
  dnl = Enable using the clang plugin to build
  dnl ========================================================
  
@@ -95,7 +96,7 @@ diff --git a/js/src/old-configure.in b/js/src/old-configure.in
  
  dnl ========================================================
  dnl = Support for demangling undefined symbols
-@@ -1461,18 +1444,16 @@ AC_SUBST(RCFLAGS)
+@@ -1468,18 +1451,16 @@ AC_SUBST(RCFLAGS)
  AC_SUBST(WINDRES)
  AC_SUBST(IMPLIB)
  AC_SUBST(FILTER)
@@ -117,7 +118,7 @@ diff --git a/js/src/old-configure.in b/js/src/old-configure.in
 diff --git a/moz.configure b/moz.configure
 --- a/moz.configure
 +++ b/moz.configure
-@@ -601,16 +601,37 @@ set_define('INCLUDE_MOZILLA_DTRACE', Tru
+@@ -594,16 +594,37 @@ set_define('INCLUDE_MOZILLA_DTRACE', Tru
  add_old_configure_assignment('enable_dtrace', 'yes', when=dtrace)
  
  
@@ -158,7 +159,7 @@ diff --git a/moz.configure b/moz.configure
 diff --git a/old-configure.in b/old-configure.in
 --- a/old-configure.in
 +++ b/old-configure.in
-@@ -688,17 +688,16 @@ case "$target" in
+@@ -690,17 +690,16 @@ case "$target" in
          else
              # Silence problematic clang warnings
              CXXFLAGS="$CXXFLAGS -Wno-incompatible-ms-struct"
@@ -176,7 +177,7 @@ diff --git a/old-configure.in b/old-configure.in
          fi
          WIN32_CONSOLE_EXE_LDFLAGS=-SUBSYSTEM:CONSOLE,$WIN32_SUBSYSTEM_VERSION
          WIN32_GUI_EXE_LDFLAGS=-SUBSYSTEM:WINDOWS,$WIN32_SUBSYSTEM_VERSION
-@@ -961,17 +960,16 @@ if test -n "$MOZ_LINKER"; then
+@@ -963,17 +962,16 @@ if test -n "$MOZ_LINKER"; then
    AC_DEFINE(MOZ_LINKER)
    MOZ_LINKER_EXTRACT=1
    AC_CHECK_PROGS(XZ, xz)
@@ -194,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 ========================================================
-@@ -2438,32 +2436,16 @@ dnl ====================================
+@@ -2451,32 +2449,16 @@ dnl ====================================
  dnl = Enable using the clang plugin to build
  dnl ========================================================
  
@@ -227,7 +228,7 @@ diff --git a/old-configure.in b/old-configure.in
     DEBUG_JS_MODULES=1,
     DEBUG_JS_MODULES=)
  
-@@ -2869,18 +2851,16 @@ AC_SUBST(MOZ_CRASHREPORTER)
+@@ -2882,18 +2864,16 @@ AC_SUBST(MOZ_CRASHREPORTER)
  AC_SUBST(MOZ_CRASHREPORTER_INJECTOR)
  AC_SUBST(MOZ_STUB_INSTALLER)
  AC_SUBST(MOZ_ENABLE_SIGNMAR)

mozilla-release/patches/1641775-78a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1590772287 0
 # Node ID 4ba16619f4cb6955ea1f99ec53301ee820839f3a
-# Parent  1fa2822314bf388fff1a6bc10c7742c250be3cee
+# Parent  fcfd598474c0f17f179c88929476ed5a72d58383
 Bug 1641775 - Move --with-system-nspr to python configure. r=firefox-build-system-reviewers,rstewart
 
 Versions of NSPR >= 4.10 come with a pkg-config file. We currently
@@ -471,30 +471,30 @@ new 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
-@@ -227,17 +227,16 @@ def old_configure_options(*options):
-     '--enable-libjpeg-turbo',
+@@ -217,17 +217,16 @@ def old_configure_options(*options):
+     '--enable-dump-painting',
+     '--enable-extensions',
+     '--enable-feeds',
      '--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',
-@@ -264,28 +263,23 @@ def old_configure_options(*options):
+     '--enable-startupcache',
+     '--enable-system-cairo',
+@@ -246,25 +245,20 @@ def old_configure_options(*options):
+     '--with-app-basename',
+     '--with-app-name',
+     '--with-branding',
      '--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',
@@ -504,20 +504,17 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
 -    '--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):
 diff --git a/js/moz.configure b/js/moz.configure
 --- a/js/moz.configure
 +++ b/js/moz.configure
@@ -587,7 +584,7 @@ diff --git a/js/src/old-configure.in b/js/src/old-configure.in
  dnl ========================================================
  MISSING_X=
  
-@@ -1209,18 +1204,16 @@ dnl are defined in build/autoconf/altopt
+@@ -1195,18 +1190,16 @@ dnl are defined in build/autoconf/altopt
  
  dnl ========================================================
  dnl =
@@ -606,7 +603,7 @@ diff --git a/js/src/old-configure.in b/js/src/old-configure.in
      ZLIB_DIR=yes
  fi
  
-@@ -1599,18 +1592,16 @@ HOST_CFLAGS=`echo \
+@@ -1500,18 +1493,16 @@ HOST_CFLAGS=`echo \
      $_COMPILATION_HOST_CFLAGS \
      $HOST_CFLAGS`
  
@@ -707,7 +704,7 @@ diff --git a/old-configure.in b/old-configure.in
  # 2_26 is the earliest version we can set GLIB_VERSION_MIN_REQUIRED.
  # The macro won't be used when compiling with earlier versions anyway.
  GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26
-@@ -1510,18 +1508,16 @@ dnl are defined in build/autoconf/altopt
+@@ -1495,18 +1493,16 @@ dnl are defined in build/autoconf/altopt
  
  dnl ========================================================
  dnl =
@@ -726,7 +723,7 @@ diff --git a/old-configure.in b/old-configure.in
                            Use system libevent [installed at prefix PFX]],
      LIBEVENT_DIR=$withval)
  
-@@ -3134,18 +3130,16 @@ HOST_CXXFLAGS=`echo \
+@@ -3101,18 +3097,16 @@ HOST_CXXFLAGS=`echo \
      $HOST_CXXFLAGS`
  
  AC_SUBST(MOZ_SYSTEM_PNG)

mozilla-release/patches/series

@@ -43,9 +43,9 @@ NOBUG-20170803-promisehelper-57a1.patch
 1380617-06-57a1.patch
 1380617-07-57a1.patch
 1380617-08no09-57a1.patch
-1388954-57a1.patch
 1381186-1-57a1.patch
 1381186-2-57a1.patch
+1388954-57a1.patch
 1372927-57a1.patch
 1380617-10-57a1.patch
 1382092-4-57a1.patch
@@ -82,17 +82,17 @@ NOBUG-20170803-promisehelper-57a1.patch
 1394804-3-57a1.patch
 1391421-2no1-58a1.patch
 1391421-4no3or5to9-58a1.patch
-1382388-58a1.patch
 1400846-58a1.patch
 1401187-1-58a1.patch
 1401187-2-58a1.patch
 1401814-58a1.patch
+1382388-58a1.patch
+870698-02-FIX-58a1.patch
 1401146-58a1.patch
 1402504-fix-58a1.patch
 1403084-58a1.patch
 1250832-58a1.patch
 1394559-58a1.patch
-870698-02-FIX-58a1.patch
 1304328-58a1.patch
 1403175-1-58a1.patch
 1403175-2-58a1.patch
@@ -376,7 +376,6 @@ NOBUG-20170803-promisehelper-57a1.patch
 1414340-2-fix-58a1.patch
 1411402-58a1.patch
 1416358-58a1.patch
-1415572-59a1.patch
 1353319-1-59a1.patch
 1353319-2-59a1.patch
 1353319-3-59a1.patch
@@ -409,6 +408,7 @@ NOBUG-20170803-promisehelper-57a1.patch
 1416193-59a1.patch
 1415554-59a1.patch
 1415612-59a1.patch
+1415572-59a1.patch
 1404917-1-59a1.patch
 1404917-2-59a1.patch
 1404917-3-59a1.patch
@@ -472,12 +472,12 @@ NOBUG-20170803-promisehelper-57a1.patch
 1403871-3-59a1.patch
 1418274-59a1.patch
 1402154-59a1.patch
+1417657-59a1.patch
 1419447-59a1.patch
 1408401-59a1.patch
 1419665-59a1.patch
 1381648-59a1.patch
 1419416-59a1.patch
-1417657-59a1.patch
 1419075-59a1.patch
 1408944-59a1.patch
 1419382-1-59a1.patch
@@ -725,7 +725,6 @@ NOBUG-20170803-promisehelper-57a1.patch
 1421491-59a1.patch
 1426251-59a1.patch
 1424452-59a1.patch
-1419902-59a1.patch
 1425876-59a1.patch
 1425316-1-59a1.patch
 1425316-2-59a1.patch
@@ -746,16 +745,17 @@ NOBUG-20170803-promisehelper-57a1.patch
 1426253-2-59a1.patch
 1426253-3-59a1.patch
 1426253-4-59a1.patch
-1426388-59a1.patch
 1426018-59a1.patch
 1419366-59a1.patch
+1419902-2-59a1.patch
+1426388-59a1.patch
+1309198-59a1.patch
 1421992-4c-59a1.patch
-1401359-59a1.patch
 1426108-59a1.patch
 1420289-0-59a1.patch
 1420289-1-59a1.patch
 1425897-59a1.patch
-1309198-59a1.patch
+1401359-59a1.patch
 1365574-59a1.patch
 1402485-59a1.patch
 1404823-59a1.patch
@@ -1359,6 +1359,7 @@ servo-19868-60a1.patch
 1433100-60a1.patch
 1428698-60a1.patch
 1431217-60a1.patch
+1431184-60a1.patch
 1432923-60a1.patch
 1432789-1-60a1.patch
 1432789-2-60a1.patch
@@ -1386,10 +1387,9 @@ servo-19877-60a1.patch
 1430139-2-60a1.patch
 1430139-3-60a1.patch
 1430139-4-60a1.patch
-1431184-60a1.patch
+1395973-60a1.patch
 1433276-1-60a1.patch
 1433276-2-60a1.patch
-1395973-60a1.patch
 1433576-60a1.patch
 1412066-60a1.patch
 685236-1-60a1.patch
@@ -1500,7 +1500,6 @@ servo-19824-60a1.patch
 1413112-5-60a1.patch
 1413112-6-60a1.patch
 1413112-7-60a1.patch
-1432870-60a1.patch
 1425340-60a1.patch
 1434219-60a1.patch
 1255379-60a1.patch
@@ -1545,6 +1544,7 @@ servo-19902-60a1.patch
 1207734-05-60a1.patch
 1207734-06-60a1.patch
 1433982-60a1.patch
+1432870-60a1.patch
 1434306-60a1.patch
 1431209-1-60a1.patch
 1431209-2-60a1.patch
@@ -1614,19 +1614,6 @@ servo-19902-60a1.patch
 1432963-15-60a1.patch
 1432963-16-60a1.patch
 1432963-17-60a1.patch
-1433505-1-60a1.patch
-1433505-2-60a1.patch
-1433505-3-60a1.patch
-1433545-1-60a1.patch
-1433545-2-60a1.patch
-1434342-1-60a1.patch
-1434342-2-60a1.patch
-1434342-3-60a1.patch
-1434342-4-60a1.patch
-1434342-5-60a1.patch
-1434342-6-60a1.patch
-1434342-7-60a1.patch
-1434342-8-60a1.patch
 1434628-60a1.patch
 1433579-60a1.patch
 servo-19465-60a1.patch
@@ -1658,6 +1645,19 @@ servo-19915-60a1.patch
 1432168-2-60a1.patch
 1432168-3-60a1.patch
 1434025-60a1.patch
+1433505-1-60a1.patch
+1433505-2-60a1.patch
+1433505-3-60a1.patch
+1433545-1-60a1.patch
+1433545-2-60a1.patch
+1434342-1-60a1.patch
+1434342-2-60a1.patch
+1434342-3-60a1.patch
+1434342-4-60a1.patch
+1434342-5-60a1.patch
+1434342-6-60a1.patch
+1434342-7-60a1.patch
+1434342-8-60a1.patch
 1434318-01-60a1.patch
 1434318-02-60a1.patch
 1434169-1-60a1.patch
@@ -1834,7 +1834,6 @@ NOBUG-20180206-jsgdb-60a1.patch
 1435293-60a1.patch
 1422036-60a1.patch
 1435174-60a1.patch
-1434599-60a1.patch
 1435673-1-60a1.patch
 1435673-2-60a1.patch
 1435673-3-60a1.patch
@@ -1874,6 +1873,7 @@ servo-19956-60a1.patch
 1434979-60a1.patch
 1435001-60a1.patch
 1433517-60a1.patch
+1434599-60a1.patch
 1432992-1a-60a1.patch
 1432992-1b-60a1.patch
 1436134-60a1.patch
@@ -2540,7 +2540,6 @@ servo-20104-60a1.patch
 1439565-2-60a1.patch
 1432232-60a1.patch
 1440670-60a1.patch
-1440257-60a1.patch
 1438848-60a1.patch
 1426006-60a1.patch
 1438841-60a1.patch
@@ -2805,6 +2804,7 @@ NOBUG-20180302-bindgen-60a1.patch
 1441916-7-60a1.patch
 1437844-60a1.patch
 1442305-60a1.patch
+1440257-60a1.patch
 1441153-60a1.patch
 1442318-60a1.patch
 1413049-1-60a1.patch
@@ -2884,6 +2884,10 @@ servo-20198-60a1.patch
 1440511-12-60a1.patch
 1411415-1a-60a1.patch
 1443236-60a1.patch
+1440771-1-60a1.patch
+1440771-2-60a1.patch
+1440771-3-60a1.patch
+1440771-4-60a1.patch
 1442150-2-60a1.patch
 1442150-3-60a1.patch
 1442150-4-60a1.patch
@@ -2924,10 +2928,6 @@ servo-20211-60a1.patch
 1434822-2-60a1.patch
 1434822-3-60a1.patch
 1430438-1-60a1.patch
-1440771-1-60a1.patch
-1440771-2-60a1.patch
-1440771-3-60a1.patch
-1440771-4-60a1.patch
 1442748-1-60a1.patch
 1442748-2-60a1.patch
 1443357-60a1.patch
@@ -3193,7 +3193,6 @@ NOBUG-20180313-inspector-61a1.patch
 1443792-4-61a1.patch
 1443792-5-61a1.patch
 1445193-61a1.patch
-1442819-61a1.patch
 1444167-1only-61a1.patch
 1445019-61a1.patch
 1363900-61a1.patch
@@ -3458,6 +3457,7 @@ servo-20407-61a1.patch
 1447210-1-61a1.patch
 1447210-2-61a1.patch
 1447817-61a1.patch
+1442819-61a1.patch
 1431221-01-61a1.patch
 1431221-02-61a1.patch
 1431221-03-61a1.patch
@@ -4056,11 +4056,11 @@ servo-20619-61a1.patch
 1451159-3-61a1.patch
 1451159-4-61a1.patch
 1455316-61a1.patch
+1448494-1-61a1.patch
+1448494-2-61a1.patch
 1459026-61a1.patch
 1458700-2no1-61a1.patch
 1458700-3no4to11-61a1.patch
-1448494-1-61a1.patch
-1448494-2-61a1.patch
 NOBUG-20180505-lint-61a1.patch
 1459074-62a1.patch
 1456112-62a1.patch
@@ -4084,6 +4084,7 @@ NOBUG-20180505-lint-61a1.patch
 1456118-62a1.patch
 1454149-62a1.patch
 1460258-62a1.patch
+1302449-62a1.patch
 1459979-62a1.patch
 1460451-62a1.patch
 1374699-1-62a1.patch
@@ -4100,7 +4101,6 @@ NOBUG-20180505-lint-61a1.patch
 1346291-1-62a1.patch
 1346291-2-62a1.patch
 1346291-3-62a1.patch
-1302449-62a1.patch
 1457359-62a1.patch
 1454640-1-62a1.patch
 1454640-2-62a1.patch
@@ -5305,6 +5305,7 @@ NOBUG-20190112-explainpy3-66a1.patch
 1519729-3-66a1.patch
 1519660-66a1.patch
 1520006-66a1.patch
+1519968-66a1.patch
 1519603-1-66a1.patch
 1519603-2-66a1.patch
 1519603-3-66a1.patch
@@ -5368,7 +5369,6 @@ NOBUG-20190118-zlib-66a1.patch
 1518106-1-66a1.patch
 1518106-2-66a1.patch
 1517298-66a1.patch
-1519968-66a1.patch
 1522150-1-66a1.patch
 1521584-67a1.patch
 1522507-67a1.patch
@@ -5591,6 +5591,7 @@ NOBUG-removenonascii67a1-25314.patch
 1433685-68a1.patch
 1542673-68a1.patch
 1537574-68a1.patch
+1536486-68a1.patch
 1538810-1-68a1.patch
 1538810-2-68a1.patch
 1522931-1only-68a1.patch
@@ -5610,8 +5611,6 @@ NOBUG-removenonascii67a1-25314.patch
 1546501-crashreporter-68a1.patch
 1542826-6only-68a1.patch
 1495672-68a1.patch
-1536486-68a1.patch
-1547196-68a1.patch
 1546697-1-68a1.patch
 1545567-68a1.patch
 1543644-68a1.patch
@@ -5648,6 +5647,7 @@ NOBUG-removenonascii67a1-25314.patch
 1549794-68a1.patch
 1550532-68a1.patch
 1550868-68a1.patch
+1547196-68a1.patch
 1505471-68a1.patch
 1552336-68a1.patch
 1552430-68a1.patch
@@ -5805,7 +5805,6 @@ NOBUG-removenonascii67a1-25314.patch
 1559975-18-69a1.patch
 1562389-1-70a1.patch
 1562389-2-70a1.patch
-1577934-70a1.patch
 1558372-70a1.patch
 1563085-70a1.patch
 1559975-19-70a1.patch
@@ -5970,6 +5969,7 @@ NOBUG-removenonascii67a1-25314.patch
 1577685-70a1.patch
 1577867-70a1.patch
 1577869-70a1.patch
+1577934-70a1.patch
 1577908-71a1.patch
 1577501-71a1.patch
 1578531-71a1.patch
@@ -6553,8 +6553,6 @@ NOBUG-removenonascii67a1-25314.patch
 1636122-78a1.patch
 1637305-78a1.patch
 1636251-1-PARTIAL-78a1.patch
-1641783-78a1.patch
-1641775-78a1.patch
 1637474-1-78a1.patch
 1637474-2-78a1.patch
 1637409-78a1.patch
@@ -6617,6 +6615,8 @@ NOBUG-removenonascii67a1-25314.patch
 1639313-78a1.patch
 1638978-78a1.patch
 1641329-78a1.patch
+1641783-78a1.patch
+1641775-78a1.patch
 1635764-78a1.patch
 1642005-79a1.patch
 1642040-79a1.patch