Browse Source

Chronological shuffle for 78a1 and 79a1

Ian Neal 1 month ago
parent
commit
0f224294df

+ 2 - 2
mozilla-release/patches/1621960-5-79a1.patch

@@ -2,7 +2,7 @@
 # User Mitchell Hentges <mhentges@mozilla.com>
 # Date 1591805408 0
 # Node ID 3b1827c74e34f1f0dfbf9ad174e2c8b84965c44d
-# Parent  ba6fd6ceb2aa041a3eb6b32e3d7f4c3372f4bfba
+# Parent  6738462f4a3c2b8bc68535721222ed6fcfdb7b02
 Bug 1621960: Change |mach python| default from Python 2 to Python 3 r=rstewart
 
 Depends on D77967
@@ -28,8 +28,8 @@ diff --git a/mach b/mach
      reftest
      release
      rusttests
+     static-analysis
      talos-test
-     taskcluster-build-image
 diff --git a/python/mach_commands.py b/python/mach_commands.py
 --- a/python/mach_commands.py
 +++ b/python/mach_commands.py

+ 0 - 0
mozilla-release/patches/1622963-79a1.patch → mozilla-release/patches/1622963-2only-79a1.patch


+ 0 - 0
mozilla-release/patches/1632429-3-PARTIAL-78a1.patch → mozilla-release/patches/1632429-2-PARTIAL-78a1.patch


+ 0 - 0
mozilla-release/patches/1632429-09-79a1.patch → mozilla-release/patches/1632429-8-79a1.patch


+ 0 - 0
mozilla-release/patches/1632429-10-79a1.patch → mozilla-release/patches/1632429-9-79a1.patch


+ 5 - 5
mozilla-release/patches/1632874-1-79a1.patch

@@ -2,7 +2,7 @@
 # User Mitchell Hentges <mhentges@mozilla.com>
 # Date 1591645016 0
 # Node ID c9c52538d77d06601c253b2efaa3b207b540318a
-# Parent  9cb5b8703cf112bd834480aef0944487639c1b1c
+# Parent  a9c196ca10dc2d3f346369471563eaf85dc42863
 Bug 1632874: |mach bootstrap| should write mozconfig file if it doesn't exist r=rstewart
 
 Rather than always printing instructions at the end of the bootstrap phase, we will now create a mozconfig
@@ -420,15 +420,15 @@ diff --git a/python/mozboot/mozboot/bootstrap.py b/python/mozboot/mozboot/bootst
  Or, if you prefer Git, by following the instruction here to clone from the
  Mercurial repository:
  
-@@ -466,18 +476,31 @@ class Bootstrapper(object):
+@@ -462,18 +472,31 @@ class Bootstrapper(object):
+                                                     have_clone,
+                                                     checkout_root)
+ 
          print(self.finished % name)
          if not (self.instance.which('rustc') and self.instance._parse_version('rustc')
                  >= MODERN_RUST_VERSION):
              print("To build %s, please restart the shell (Start a new terminal window)" % name)
  
-         self._output_mozconfig(application)
- 
-     def _output_mozconfig(self, application):
 -        # Like 'suggest_browser_mozconfig' or 'suggest_mobile_android_mozconfig'.
 -        getattr(self.instance, 'suggest_%s_mozconfig' % application)()
 +        # Like 'generate_browser_mozconfig' or 'generate_mobile_android_mozconfig'.

+ 0 - 0
mozilla-release/patches/1634391-2-78a1.patch → mozilla-release/patches/1634391-78a1.patch


+ 11 - 26
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  5b816857f1f5d2f137a9f72474f27815b4913809
 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,10 +142,10 @@ 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):
+@@ -254,27 +254,25 @@ def old_configure_options(*options):
+     '--with-app-basename',
      '--with-app-name',
      '--with-branding',
-     '--with-cross-lib',
      '--with-debug-label',
      '--with-distribution-id',
      '--with-doc-include-dirs',
@@ -160,8 +160,6 @@ 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',
@@ -197,28 +195,15 @@ 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', 
- @depends('--enable-pipeline-operator')
- def enable_pipeline_operator(value):
-     if value:
-         return True
+@@ -490,8 +490,69 @@ set_config('EDITLINE_LIBS', ['-lreadline
  
- set_config('ENABLE_PIPELINE_OPERATOR', enable_pipeline_operator)
- set_define('ENABLE_PIPELINE_OPERATOR', enable_pipeline_operator)
+ @depends('--enable-readline', editline, when=editline)
+ def bundled_editline(readline, editline):
+     return editline and not readline
  
-+
- # Initial support for new regexp engine
- # ==================================================
- 
- js_option('--enable-new-regexp', default=False, help='Enable new regexp engine')
- 
- @depends('--enable-new-regexp')
- def enable_new_regexp(value):
-     if value:
-         return True
+ set_config('JS_BUNDLED_EDITLINE', bundled_editline)
  
- set_config('ENABLE_NEW_REGEXP', enable_new_regexp)
- set_define('ENABLE_NEW_REGEXP', enable_new_regexp)
+ set_define('EDITLINE', True, when=editline)
 +
 +
 +# ECMAScript Internationalization API Support (uses ICU)
@@ -304,7 +289,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)
+@@ -1463,25 +1463,16 @@ AC_SUBST_LIST(MOZ_FIX_LINK_PATHS)
  AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
  
  AC_SUBST(MOZ_APP_NAME)
@@ -356,7 +341,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" ||
+@@ -3078,28 +3078,16 @@ if test -n "$MOZ_TELEMETRY_REPORTING" ||
    AC_DEFINE(MOZ_DATA_REPORTING)
    AC_SUBST(MOZ_DATA_REPORTING)
  fi

+ 0 - 0
mozilla-release/patches/1436251-3-PARTIAL-79a1.patch → mozilla-release/patches/1636251-3-PARTIAL-79a1.patch


+ 3 - 3
mozilla-release/patches/1638985-79a1.patch

@@ -2,7 +2,7 @@
 # User Andi-Bogdan Postelnicu <bpostelnicu@mozilla.com>
 # Date 1591890869 0
 # Node ID b793e08a5e8b02550385affd0480175b6873a18f
-# Parent  ca657de498ee206e1eb6ead05e13bdf1b1d1b3fb
+# Parent  76ca4f6f2902a94881120acf0a494ad6e9af988d
 Bug 1638985 - Convert 'mach static-analysis' to run with Python 3. r=rstewart
 
 Differential Revision: https://phabricator.services.mozilla.com/D79306
@@ -10,9 +10,9 @@ Differential Revision: https://phabricator.services.mozilla.com/D79306
 diff --git a/mach b/mach
 --- a/mach
 +++ b/mach
-@@ -37,17 +37,16 @@ py2commands="
+@@ -36,17 +36,16 @@ py2commands="
+     pastebin
      prettier-format
-     python
      python-test
      raptor
      raptor-test

+ 9 - 17
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  7b168ce74c1f34cd3d37e526dca78fa44587204b
 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):
+@@ -255,32 +255,30 @@ def old_configure_options(*options):
      '--libdir',
      '--prefix',
      '--with-android-distribution-directory',
@@ -26,6 +26,7 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
      '--with-doc-include-dirs',
      '--with-doc-input-dirs',
      '--with-doc-output-dir',
+     '--with-intl-api',
      '--with-jitreport-granularity',
      '--with-macbundlename-prefix',
      '--with-nspr-cflags',
@@ -37,24 +38,25 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
 -    '--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',
 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
+@@ -443,8 +443,17 @@ js_option('--enable-new-regexp', default
+ 
+ @depends('--enable-new-regexp')
  def enable_new_regexp(value):
      if value:
          return True
  
  set_config('ENABLE_NEW_REGEXP', enable_new_regexp)
  set_define('ENABLE_NEW_REGEXP', enable_new_regexp)
- 
- 
++
 +# 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')
@@ -63,20 +65,10 @@ diff --git a/js/moz.configure b/js/moz.configure
 +js_option('--with-cross-lib', nargs=1, default=depends(target.alias)(lambda x: '/usr/%s' % x),
 +          help='Use dir as the location for arm libraries')
 +set_config('CROSS_LIB', depends_if('--with-cross-lib')(lambda x: x))
-+
-+
- # ECMAScript Internationalization API Support (uses ICU)
- # ======================================================
- js_option('--with-system-icu', help='Use system ICU')
- 
- system_icu = pkg_check_modules('MOZ_ICU', 'icu-i18n >= 67.1', when='--with-system-icu')
- 
- set_config('MOZ_SYSTEM_ICU', True, when=system_icu)
- set_define('MOZ_SYSTEM_ICU', True, when=system_icu)
 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 ====================================
+@@ -1518,31 +1518,16 @@ dnl ====================================
  dnl =
  dnl = Standalone module options
  dnl =

+ 7 - 15
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  c62254edd9401b27d35d64e91e93cbd0c41e1d25
 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):
+@@ -269,17 +269,16 @@ def old_configure_options(*options):
      '--with-jitreport-granularity',
      '--with-macbundlename-prefix',
      '--with-nspr-cflags',
@@ -22,17 +22,18 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
      '--with-nss-prefix',
 -    '--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',
 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
+@@ -452,8 +452,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')
  set_config('QEMU_EXE', depends_if('--with-qemu-exe')(lambda x: x))
@@ -40,7 +41,7 @@ diff --git a/js/moz.configure b/js/moz.configure
  js_option('--with-cross-lib', nargs=1, default=depends(target.alias)(lambda x: '/usr/%s' % x),
            help='Use dir as the location for arm libraries')
  set_config('CROSS_LIB', depends_if('--with-cross-lib')(lambda x: x))
- 
++
 +# Enable static checking using sixgill
 +# ====================================
 +
@@ -55,19 +56,10 @@ diff --git a/js/moz.configure b/js/moz.configure
 +    return value[0]
 +
 +set_config('SIXGILL_PATH', sixgill)
-+
- 
- # ECMAScript Internationalization API Support (uses ICU)
- # ======================================================
- js_option('--with-system-icu', help='Use system ICU')
- 
- system_icu = pkg_check_modules('MOZ_ICU', 'icu-i18n >= 67.1', when='--with-system-icu')
- 
- set_config('MOZ_SYSTEM_ICU', True, when=system_icu)
 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 ====================================
+@@ -1359,33 +1359,16 @@ dnl ====================================
  dnl = Enable using the clang plugin to build
  dnl ========================================================
  

+ 8 - 16
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  1e39ad122842711ce5f2465c919155e08e6db146
 Bug 1639815 - Move --enable-readline to python configure. r=froydnj
 
 Differential Revision: https://phabricator.services.mozilla.com/D76287
@@ -11,7 +11,7 @@ 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):
+@@ -232,17 +232,16 @@ def old_configure_options(*options):
      '--enable-necko-wifi',
      '--enable-negotiateauth',
      '--enable-nfc',
@@ -32,15 +32,17 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
 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):
+@@ -467,8 +467,31 @@ js_option('--with-sixgill', nargs=1, hel
+ @imports('os')
+ 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')
      return value[0]
  
  set_config('SIXGILL_PATH', sixgill)
- 
- 
++
++
 +# Support for readline
 +# =====================================================
 +@depends('--enable-js-shell', target_is_windows, compile_environment)
@@ -62,20 +64,10 @@ diff --git a/js/moz.configure b/js/moz.configure
 +set_config('JS_BUNDLED_EDITLINE', bundled_editline)
 +
 +set_define('EDITLINE', True, when=editline)
-+
-+
- # ECMAScript Internationalization API Support (uses ICU)
- # ======================================================
- js_option('--with-system-icu', help='Use system ICU')
- 
- system_icu = pkg_check_modules('MOZ_ICU', 'icu-i18n >= 67.1', when='--with-system-icu')
- 
- set_config('MOZ_SYSTEM_ICU', True, when=system_icu)
- set_define('MOZ_SYSTEM_ICU', True, when=system_icu)
 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
+@@ -1458,51 +1458,16 @@ fi
  fi # ! SKIP_COMPILER_CHECKS
  
  AC_DEFINE(CPP_THROW_NEW, [throw()])

+ 0 - 0
mozilla-release/patches/1643026-78a1.patch → mozilla-release/patches/1643026-79a1.patch


+ 11 - 11
mozilla-release/patches/1643298-79a1.patch

@@ -2,7 +2,7 @@
 # User Mitchell Hentges <mhentges@mozilla.com>
 # Date 1591744788 0
 # Node ID 5595d6b0dedd72abe1d69f38d0c4e405002b8394
-# Parent  28295a6ff0f02f2d24330b4ffdfa8f4887e5650f
+# Parent  f6f90380b6f9cf043e0045d36a9345512cc7e639
 Bug 1643298: |mach bootstrap --no-system-changes| should still output mozconfig r=rstewart,geckoview-reviewers,agi
 
 Differential Revision: https://phabricator.services.mozilla.com/D78997
@@ -10,7 +10,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D78997
 diff --git a/python/mozboot/mozboot/bootstrap.py b/python/mozboot/mozboot/bootstrap.py
 --- a/python/mozboot/mozboot/bootstrap.py
 +++ b/python/mozboot/mozboot/bootstrap.py
-@@ -366,16 +366,17 @@ class Bootstrapper(object):
+@@ -383,16 +383,17 @@ class Bootstrapper(object):
                  hg=self.instance.which('hg'))
              (checkout_type, checkout_root) = r
              have_clone = bool(checkout_type)
@@ -28,7 +28,7 @@ diff --git a/python/mozboot/mozboot/bootstrap.py b/python/mozboot/mozboot/bootst
          getattr(self.instance, 'install_%s_packages' % application)()
  
          hg_installed, hg_modern = self.instance.ensure_mercurial_modern()
-@@ -455,16 +456,19 @@ class Bootstrapper(object):
+@@ -472,16 +473,19 @@ class Bootstrapper(object):
                                                      have_clone,
                                                      checkout_root)
  
@@ -40,11 +40,11 @@ diff --git a/python/mozboot/mozboot/bootstrap.py b/python/mozboot/mozboot/bootst
 +        self._output_mozconfig(application)
 +
 +    def _output_mozconfig(self, application):
-         # Like 'suggest_browser_mozconfig' or 'suggest_mobile_android_mozconfig'.
-         getattr(self.instance, 'suggest_%s_mozconfig' % application)()
- 
- 
- def update_vct(hg, root_state_dir):
-     """Ensure version-control-tools in the state directory is up to date."""
-     vct_dir = os.path.join(root_state_dir, 'version-control-tools')
- 
+         # Like 'generate_browser_mozconfig' or 'generate_mobile_android_mozconfig'.
+         mozconfig = getattr(self.instance, 'generate_%s_mozconfig' % application)()
+ 
+         if mozconfig:
+             mozconfig_path = find_mozconfig(self.mach_context.topdir)
+             if not mozconfig_path:
+                 # No mozconfig file exists yet
+                 mozconfig_path = os.path.join(self.mach_context.topdir, 'mozconfig')

+ 81 - 81
mozilla-release/patches/series

@@ -6372,53 +6372,63 @@ NOBUG-removenonascii67a1-25314.patch
 1634623-1-78a1.patch
 1634623-2-78a1.patch
 1634623-3-78a1.patch
+1635271-78a1.patch
+1634563-78a1.patch
+1635099-78a1.patch
+1635491-78a1.patch
+1635514-78a1.patch
+1635526-78a1.patch
 1632916-78a1.patch
 1633039-78a1.patch
 1633037-78a1.patch
-1635526-78a1.patch
-1635585-78a1.patch
+1633016-78a1.patch
 1635795-78a1.patch
-1636209-78a1.patch
+1635585-78a1.patch
 1633156-78a1.patch
-1635112-2-78a1.patch
-1635112-3-78a1.patch
-1635112-4-78a1.patch
-1633628-78a1.patch
+1634535-78a1.patch
+1635481-78a1.patch
+1619339-78a1.patch
+1636209-78a1.patch
 1636265-78a1.patch
+1633628-78a1.patch
+1635834-78a1.patch
+1127565-78a1.patch
+1632429-2-PARTIAL-78a1.patch
 1636122-78a1.patch
+1637305-78a1.patch
+1636251-1-PARTIAL-78a1.patch
 1637474-1-78a1.patch
 1637474-2-78a1.patch
-1634391-2-78a1.patch
-1635321-78a1.patch
-1643298-79a1.patch
-1638036-78a1.patch
-1639813-78a1.patch
-1638060-78a1.patch
-1640142-78a1.patch
-1624857-78a1.patch
-1640878-78a1.patch
-1641073-78a1.patch
-1635764-78a1.patch
-1641640-2-78a1.patch
-1641329-78a1.patch
-1635491-78a1.patch
-1635514-78a1.patch
-1632429-3-PARTIAL-78a1.patch
+1637409-78a1.patch
+1634391-78a1.patch
+1637665-78a1.patch
+1637254-2-78a1.patch
 1637778-78a1.patch
+1637737-78a1.patch
+1638036-78a1.patch
 1579329-78a1.patch
+1637911-78a1.patch
+1635321-78a1.patch
+1638799-78a1.patch
+1638870-78a1.patch
+1631197-78a1.patch
 1639151-78a1.patch
 1638948-78a1.patch
 1638951-78a1.patch
+1635573-PARTIAL-78a1.patch
+1638780-78a1.patch
+1638012-78a1.patch
+1635112-2-78a1.patch
+1635112-3-78a1.patch
+1635112-4-78a1.patch
 1638967-78a1.patch
 1638982-2-78a1.patch
 1638995-78a1.patch
 1638983-78a1.patch
 1634675-78a1.patch
-1638993-78a1.patch
-1638976-78a1.patch
-1637305-78a1.patch
-1637665-78a1.patch
-1637737-78a1.patch
+1637381-1-78a1.patch
+1637381-7-78a1.patch
+1639813-78a1.patch
 1639815-1-78a1.patch
 1639815-2-78a1.patch
 1639815-3-78a1.patch
@@ -6427,50 +6437,48 @@ NOBUG-removenonascii67a1-25314.patch
 1639815-6-78a1.patch
 1639815-7-78a1.patch
 1639815-8-78a1.patch
+1639569-78a1.patch
 1632345-78a1.patch
-1637911-78a1.patch
-1634535-78a1.patch
-1635481-78a1.patch
-1635271-78a1.patch
-1637254-2-78a1.patch
-1635573-PARTIAL-78a1.patch
+1638060-78a1.patch
+1640142-78a1.patch
+1638993-78a1.patch
+1638976-78a1.patch
 1640171-2-78a1.patch
-1631197-78a1.patch
-1638780-78a1.patch
-1637381-1-78a1.patch
-1637381-7-78a1.patch
 1640716-78a1.patch
-1641242-78a1.patch
-1639313-78a1.patch
+1624857-78a1.patch
+1640878-78a1.patch
+1641073-78a1.patch
 1639624-78a1.patch
-1643026-78a1.patch
-1634563-78a1.patch
-1635099-78a1.patch
-1637409-78a1.patch
-1633016-78a1.patch
-1639569-78a1.patch
-1638870-78a1.patch
-1619339-78a1.patch
 1638965-78a1.patch
+1641242-78a1.patch
 1638954-78a1.patch
+1641640-2-78a1.patch
+1639313-78a1.patch
 1638978-78a1.patch
-1127565-78a1.patch
-1635834-78a1.patch
-1638799-78a1.patch
-1638012-78a1.patch
-1621960-781.patch
-1636251-1-PARTIAL-78a1.patch
+1641329-78a1.patch
+1635764-78a1.patch
 1642005-79a1.patch
+1642040-79a1.patch
+1621960-781.patch
+1643026-79a1.patch
+1642446-79a1.patch
 1642505-79a1.patch
-1633937-79a1.patch
 1639406-79a1.patch
-1643188-79a1.patch
+1633937-79a1.patch
 1643229-79a1.patch
+1632080-79a1.patch
 1643211-79a1.patch
+1643166-79a1.patch
+1632874-1-79a1.patch
+1643188-79a1.patch
 1642032-1-79a1.patch
 1642032-2-79a1.patch
-1642032-3-79a1.patch
 1496639-79a1.patch
+1622963-2only-79a1.patch
+1621960-1-79a1.patch
+1621960-2-79a1.patch
+1643298-79a1.patch
+1621960-4-79a1.patch
 1637845-01-79a1.patch
 1637845-02-79a1.patch
 1637845-03-79a1.patch
@@ -6489,49 +6497,41 @@ NOBUG-removenonascii67a1-25314.patch
 1637845-16-79a1.patch
 1637845-17-79a1.patch
 1637845-18-79a1.patch
+1643317-79a1.patch
+1642032-3-79a1.patch
+1621960-5-79a1.patch
 1638985-79a1.patch
-1436251-3-PARTIAL-79a1.patch
+1636251-3-PARTIAL-79a1.patch
 1645097-79a1.patch
-1643317-79a1.patch
+1632429-8-79a1.patch
 1643625-79a1.patch
-1635293-79a1.patch
-1643810-79a1.patch
+1632429-9-79a1.patch
+1634765-79a1.patch
 1646299-1-79a1.patch
 1646299-2-79a1.patch
 1646299-3-79a1.patch
 1646299-4-79a1.patch
-1392914-79a1.patch
+1635293-79a1.patch
+1643810-79a1.patch
+1643258-PARTIAL-79a1.patch
 1646405-0-79a1.patch
 1646405-1-79a1.patch
 1646405-2-79a1.patch
 1646405-3-79a1.patch
 1646405-4-79a1.patch
 1646405-5-79a1.patch
-1646427-1-79a1.patch
-1646427-2-79a1.patch
-1646427-3-79a1.patch
-1646427-4-79a1.patch
 1646421-1-79a1.patch
 1646421-2-79a1.patch
 1646421-3-79a1.patch
 1646421-4-79a1.patch
-1634765-79a1.patch
-1643166-79a1.patch
-1622963-79a1.patch
-1621960-1-79a1.patch
-1621960-2-79a1.patch
-1621960-4-79a1.patch
-1621960-5-79a1.patch
-1632429-09-79a1.patch
-1632429-10-79a1.patch
+1646427-1-79a1.patch
+1646427-2-79a1.patch
+1646427-3-79a1.patch
 1647629-79a1.patch
-1463035-79a1.patch
-1643258-PARTIAL-79a1.patch
-1632080-79a1.patch
-1642040-79a1.patch
-1642446-79a1.patch
-1632874-1-79a1.patch
+1646427-4-79a1.patch
 1648336-79a1.patch
+1463035-79a1.patch
+1392914-79a1.patch
 1645948-80a1.patch
 1240930-80a1.patch
 1482675-80a1.patch