Browse Source

Chronological shuffle for 70a1

Ian Neal 1 month ago
parent
commit
1a2ef12de5

+ 8 - 8
mozilla-release/patches/1485793-70a1.patch

@@ -2,7 +2,7 @@
 # User Andrew Halberstadt <ahalberstadt@mozilla.com>
 # Date 1562700237 0
 # Node ID a27ee4ef3e01adf9d9a7e99e5f482d489e93747e
-# Parent  54c7563d0ba499a1c4381c2e12a58c818f4146c9
+# Parent  175a3137061062c3ddefb4fbe0d722fadb0fe905
 Bug 1485793 - [eslint] Don't print an error message if there aren't any files to lint, r=Standard8
 
 This case is expected in the mozlint world (e.g, when running all linters).
@@ -15,25 +15,25 @@ Differential Revision: https://phabricator.services.mozilla.com/D37414
 diff --git a/tools/lint/eslint/__init__.py b/tools/lint/eslint/__init__.py
 --- a/tools/lint/eslint/__init__.py
 +++ b/tools/lint/eslint/__init__.py
-@@ -3,16 +3,17 @@
+@@ -1,16 +1,17 @@
+ # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+ # 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/.
  
- from __future__ import absolute_import, print_function
- 
  import json
  import os
 +import re
  import signal
  import sys
- 
  sys.path.append(os.path.join(os.path.dirname(__file__), "eslint"))
- from eslint import setup_helper
- 
+ import setup_helper
  from mozbuild.nodeutil import find_node_executable
  
-@@ -96,17 +97,22 @@ def lint(paths, config, binary=None, fix
+ from mozprocess import ProcessHandler
+ 
+@@ -92,17 +93,22 @@ def lint(paths, config, binary=None, fix
          return []
  
      if not proc.output:

+ 0 - 0
mozilla-release/patches/1539451-PARTIAL-webide-70a1.patch → mozilla-release/patches/1539451-2-PARTIAL-webide-70a1.patch


+ 0 - 0
mozilla-release/patches/1559975-10-70a1.patch → mozilla-release/patches/1559975-10-69a1.patch


+ 0 - 0
mozilla-release/patches/1559975-11-70a1.patch → mozilla-release/patches/1559975-11-69a1.patch


+ 0 - 0
mozilla-release/patches/1559975-12-70a1.patch → mozilla-release/patches/1559975-12-69a1.patch


+ 0 - 0
mozilla-release/patches/1559975-13-70a1.patch → mozilla-release/patches/1559975-13-69a1.patch


+ 0 - 0
mozilla-release/patches/1559975-14-70a1.patch → mozilla-release/patches/1559975-14-69a1.patch


+ 0 - 0
mozilla-release/patches/1559975-15-70a1.patch → mozilla-release/patches/1559975-15-69a1.patch


+ 0 - 0
mozilla-release/patches/1559975-16-70a1.patch → mozilla-release/patches/1559975-16-69a1.patch


+ 0 - 0
mozilla-release/patches/1559975-17-70a1.patch → mozilla-release/patches/1559975-17-69a1.patch


+ 0 - 0
mozilla-release/patches/1559975-18-70a1.patch → mozilla-release/patches/1559975-18-69a1.patch


+ 5 - 4
mozilla-release/patches/1559975-30-70a1.patch

@@ -2,7 +2,7 @@
 # User Edwin Gao <egao@mozilla.com>
 # Date 1563551789 0
 # Node ID d9bce64ad7aca304c78949c548063b70c29f323a
-# Parent  ffb0d5450c69ae9e712afac0f890bec356902d62
+# Parent  f3ea257fdfa8ef9975e288788bf144cc1d5d87e5
 Bug 1559975 - fix python2 linter errors for tools/lint r=ahal
 
 Differential Revision: https://phabricator.services.mozilla.com/D37767
@@ -50,7 +50,7 @@ diff --git a/tools/lint/docs/conf.py b/tools/lint/docs/conf.py
 diff --git a/tools/lint/eslint/__init__.py b/tools/lint/eslint/__init__.py
 --- a/tools/lint/eslint/__init__.py
 +++ b/tools/lint/eslint/__init__.py
-@@ -1,20 +1,24 @@
+@@ -1,21 +1,25 @@
  # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
  # vim: set filetype=python:
  # This Source Code Form is subject to the terms of the Mozilla Public
@@ -61,6 +61,7 @@ diff --git a/tools/lint/eslint/__init__.py b/tools/lint/eslint/__init__.py
 +
  import json
  import os
+ import re
  import signal
  import sys
 +
@@ -266,5 +267,5 @@ diff --git a/tools/lint/yamllint_/__init__.py b/tools/lint/yamllint_/__init__.py
  import subprocess
  from collections import defaultdict
  
- import which
- from mozprocess import ProcessHandlerMixin
+ from mozfile import which
+ from mozlint import result

+ 0 - 0
mozilla-release/patches/1561695-70a1.patch → mozilla-release/patches/1561695-69a1.patch


+ 9 - 10
mozilla-release/patches/1563797-3-70a1.patch

@@ -2,7 +2,7 @@
 # User Andrew Halberstadt <ahalberstadt@mozilla.com>
 # Date 1562853819 0
 # Node ID 7f92f148ea546a606b4e434049ea3f4d29450b1c
-# Parent  8a9d67aa10276d5bc30cc6e7366cabc6536f3c1f
+# Parent  93a99f189b0b2ede007ea4377ea0283ab09de551
 Bug 1563797 - Use 'backports.shutil_which' instead of 'which' across the tree r=Callek
 
 Differential Revision: https://phabricator.services.mozilla.com/D37097
@@ -22,13 +22,12 @@ diff --git a/js/src/builtin/embedjs.py b/js/src/builtin/embedjs.py
 +
 +import errno
  import re, sys, os, subprocess
-+import shlex
-+
-+import buildconfig
- import mozpack.path as mozpath
--import shlex
+-import mozpack.path as mozpath
+ import shlex
 -import which
--import buildconfig
++
+ import buildconfig
++import mozpack.path as mozpath
 +from mozfile import which
  
  def ToCAsciiArray(lines):
@@ -454,8 +453,8 @@ diff --git a/tools/lint/spell/__init__.py b/tools/lint/spell/__init__.py
 diff --git a/tools/lint/yamllint_/__init__.py b/tools/lint/yamllint_/__init__.py
 --- a/tools/lint/yamllint_/__init__.py
 +++ b/tools/lint/yamllint_/__init__.py
-@@ -5,21 +5,20 @@
- from __future__ import absolute_import, print_function
+@@ -3,21 +3,20 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
  import re
  import os
@@ -478,7 +477,7 @@ diff --git a/tools/lint/yamllint_/__init__.py b/tools/lint/yamllint_/__init__.py
  
  YAMLLINT_INSTALL_ERROR = """
  Unable to install correct version of yamllint
-@@ -68,20 +67,17 @@ def get_yamllint_binary():
+@@ -66,20 +65,17 @@ def get_yamllint_binary():
      """
      Returns the path of the first yamllint binary available
      if not found returns None

+ 6 - 6
mozilla-release/patches/1563797-4-70a1.patch

@@ -2,7 +2,7 @@
 # User Andrew Halberstadt <ahalberstadt@mozilla.com>
 # Date 1562853879 0
 # Node ID 423da1d755f57c6f0149f6a5f3eb76f3bc5d6e30
-# Parent  dfe75bd91239ac71d262b61e589f546d34d286ae
+# Parent  70073bd5717dc4bc1fd2fbdea9ea6d57aa50965d
 Bug 1563797 - Use 'backports.shutil_which' instead of 'which' in the build system r=firefox-build-system-reviewers,chmanchester
 
 Credit: Callek for figuring out an issue in 'make check' making the binary
@@ -147,7 +147,7 @@ diff --git a/python/mozbuild/mozbuild/base.py b/python/mozbuild/mozbuild/base.py
      InvalidRepoPath,
  )
  
-@@ -559,19 +555,18 @@ class MozbuildObject(ProcessExecutionMix
+@@ -576,19 +572,18 @@ class MozbuildObject(ProcessExecutionMix
          but on Windows we can only flash the screen.
          """
          moz_nospam = os.environ.get('MOZ_NOSPAM')
@@ -169,7 +169,7 @@ diff --git a/python/mozbuild/mozbuild/base.py b/python/mozbuild/mozbuild/base.py
              elif sys.platform.startswith('win'):
                  from ctypes import Structure, windll, POINTER, sizeof
                  from ctypes.wintypes import DWORD, HANDLE, WINFUNCTYPE, BOOL, UINT
-@@ -594,19 +589,18 @@ class MozbuildObject(ProcessExecutionMix
+@@ -611,19 +606,18 @@ class MozbuildObject(ProcessExecutionMix
                  if not console:
                      return
  
@@ -191,7 +191,7 @@ diff --git a/python/mozbuild/mozbuild/base.py b/python/mozbuild/mozbuild/base.py
          except Exception as e:
              self.log(logging.WARNING, 'notifier-failed',
                       {'error': e.message}, 'Notification center failed: {error}')
-@@ -763,19 +757,18 @@ class MozbuildObject(ProcessExecutionMix
+@@ -780,19 +774,18 @@ class MozbuildObject(ProcessExecutionMix
          if 'MAKE' in os.environ:
              make = os.environ['MAKE']
              possible_makes.insert(0, make)
@@ -443,8 +443,8 @@ diff --git a/python/mozbuild/mozbuild/vendor_rust.py b/python/mozbuild/mozbuild/
  
      def check_cargo_version(self, cargo):
          '''
-         Ensure that cargo is new enough. cargo 1.37 added support
-         for the vendor command.
+         Ensure that cargo is new enough. cargo 0.12 added support
+         for source replacement, which is required for vendoring to work.
          '''
          out = subprocess.check_output([cargo, '--version']).splitlines()[0]
          if not out.startswith('cargo'):

+ 2 - 2
mozilla-release/patches/1572046-70a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1565218214 0
 # Node ID 3937d5503f16d1dfa3fb429cd9b1ca7920b03555
-# Parent  24452bf3b486977131da4305c7dcd8796da031f1
+# Parent  597406b1777d6f0bd40db1ac928978a2b8b7db54
 Bug 1572046 - Build shared libraries in a separate target. r=nalexander
 
 When a directory, like toolkit/library, builds both a static and a
@@ -69,7 +69,7 @@ diff --git a/config/recurse.mk b/config/recurse.mk
  
  # Interdependencies that moz.build world don't know about yet for compilation.
  # Note some others are hardcoded or "guessed" in recursivemake.py and emitter.py
- ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
+ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk3)
  toolkit/library/target: widget/gtk/mozgtk/gtk3/target
  endif
  ifdef MOZ_LDAP_XPCOM

+ 2 - 2
mozilla-release/patches/1572394-70a1.patch

@@ -2,7 +2,7 @@
 # User Rob Lemley <rob@thunderbird.net>
 # Date 1565315326 0
 # Node ID 588d192755ff338badfcbced109f05354bdb0550
-# Parent  d5884806ecf7ca69b1da3fa26007fe9b27669fce
+# Parent  a4e74f0bda3265e2f0562f08096acb211c878407
 Bug 1572394 - Remove MOZ_LDAP_XPCOM ifdef from config/recurse.mk. r=glandium
 
 Fixes Thunderbird build bustage related to target-shared.
@@ -20,7 +20,7 @@ diff --git a/config/recurse.mk b/config/recurse.mk
  
  # Interdependencies that moz.build world don't know about yet for compilation.
  # Note some others are hardcoded or "guessed" in recursivemake.py and emitter.py
- ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
+ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk3)
  toolkit/library/target: widget/gtk/mozgtk/gtk3/target
  endif
 -ifdef MOZ_LDAP_XPCOM

+ 0 - 0
mozilla-release/patches/1573434-5-PARTIAL-70a1.patch → mozilla-release/patches/1573434-PARTIAL-70a1.patch


+ 9 - 9
mozilla-release/patches/1574056-70a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1566510400 0
 # Node ID ccd4c2bcbd7a44a78cec78c6ddfd1a74dc6efce9
-# Parent  7b414f1f4ff7f30810e3efbdb9cd93d194d837fd
+# Parent  737d21b691e4f0e33d13e530f752250e92302fbc
 Bug 1574056 - Make `mach vendor rust` use now native `cargo vendor`. r=chmanchester
 
 Note that cargo vendor always uses the native version even when
@@ -13,12 +13,12 @@ Differential Revision: https://phabricator.services.mozilla.com/D43007
 diff --git a/python/mozbuild/mozbuild/vendor_rust.py b/python/mozbuild/mozbuild/vendor_rust.py
 --- a/python/mozbuild/mozbuild/vendor_rust.py
 +++ b/python/mozbuild/mozbuild/vendor_rust.py
-@@ -24,40 +24,23 @@ class VendorRust(MozbuildObject):
-             return self.substs['CARGO']
-         except (BuildEnvironmentNotFoundException, KeyError):
-             # Default if this tree isn't configured.
-             import which
-             return which.which('cargo')
+@@ -29,40 +29,23 @@ class VendorRust(MozbuildObject):
+             from mozfile import which
+             cargo = which('cargo')
+             if not cargo:
+                 raise OSError(errno.ENOENT, "Could not find 'cargo' on your $PATH.")
+             return cargo
  
      def check_cargo_version(self, cargo):
          '''
@@ -57,7 +57,7 @@ diff --git a/python/mozbuild/mozbuild/vendor_rust.py b/python/mozbuild/mozbuild/
          on the user. Allow changes to Cargo.{toml,lock} since that's
          likely to be a common use case.
          '''
-@@ -103,37 +86,21 @@ Please commit or stash these changes bef
+@@ -108,37 +91,21 @@ Please commit or stash these changes bef
      def _ensure_cargo(self):
          '''
          Ensures all the necessary cargo bits are installed.
@@ -97,7 +97,7 @@ diff --git a/python/mozbuild/mozbuild/vendor_rust.py b/python/mozbuild/mozbuild/
      # documentation claims that values are checked against the above
      # list and that multiple entries can be separated by '/'.  We
      # choose to list all combinations instead for the sake of
-@@ -343,18 +310,17 @@ license file's hash.
+@@ -347,18 +314,17 @@ license file's hash.
          relative_vendor_dir = 'third_party/rust'
          vendor_dir = mozpath.join(self.topsrcdir, relative_vendor_dir)
  

+ 4 - 4
mozilla-release/patches/1574761-70a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1566256887 0
 # Node ID b85cb0cd1e49429b33d2a59962cd23a26b81e3e0
-# Parent  d872c944e997b6e0a4512a98dc9701b7a3e14074
+# Parent  41034a4f28ee8779c8ad4d5435d376858dba874b
 Bug 1574761 - Avoid race condition creating old-configure. r=nalexander
 
 This is not something that happens under normal circumstances, but it
@@ -17,7 +17,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D42428
 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
-@@ -76,16 +76,20 @@ def prepare_mozconfig(mozconfig):
+@@ -83,16 +83,20 @@ def prepare_mozconfig(mozconfig):
  @imports(_from='__builtin__', _import='sorted')
  @imports('glob')
  @imports('itertools')
@@ -38,7 +38,7 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
      # directory.
      old_configure = os.path.abspath(old_configure[0])
      if build_project == 'js':
-@@ -117,19 +121,30 @@ def prepare_configure(old_configure, moz
+@@ -124,19 +128,30 @@ def prepare_configure(old_configure, moz
              old_configure + '.in'])
          if not script:
              die('Generated old-configure is empty! Check that your autoconf 2.13 program works!')
@@ -63,7 +63,7 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
 +                die('Failed re-creating old-configure: %s' % e.message)
 +
      cmd = [shell, old_configure]
-     with open('old-configure.vars', 'w') as out:
+     with encoded_open('old-configure.vars', 'w') as out:
          log.debug('Injecting the following to old-configure:')
  
          def inject(command):

+ 11 - 11
mozilla-release/patches/1575135-6-70a1.patch

@@ -3,7 +3,7 @@
 # Date 1566362683 0
 #      Wed Aug 21 04:44:43 2019 +0000
 # Node ID 2139ee18939eae14ea337e29ec46639d2b25836d
-# Parent  d12507575618b07da7c88319e142b3ce71f4019f
+# Parent  782cbdafb3b5a59d24d62a34ec68dcb41ab29135
 Bug 1575135 - Make configure sandbox open() look more like python 3's. r=nalexander
 
 As a consequence, we can replace the encoded_open function that did the
@@ -37,13 +37,13 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
  @imports(_from='os.path', _import='exists')
  @imports('re')
  def autoconf(mozconfig, autoconf):
-@@ -128,17 +121,17 @@ def prepare_configure(old_configure, moz
-         # Make old-configure append to config.log, where we put our own log.
-         # This could be done with a m4 macro, but it's way easier this way
-         script = script.replace('>./config.log', '>>${CONFIG_LOG=./config.log}')
- 
-         with open(old_configure, 'wb') as fh:
-             fh.write(script)
+@@ -143,17 +136,17 @@ def prepare_configure(old_configure, moz
+             try:
+                 # Likely the file already existed (on Windows). Retry after removing it.
+                 remove(old_configure)
+                 rename(fh.name, old_configure)
+             except OSError as e:
+                 die('Failed re-creating old-configure: %s' % e.message)
  
      cmd = [shell, old_configure]
 -    with encoded_open('old-configure.vars', 'w') as out:
@@ -56,7 +56,7 @@ diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configu
  
          if mozconfig:
              inject('# start of mozconfig values')
-@@ -339,34 +332,34 @@ def old_configure(prepare_configure, pre
+@@ -345,34 +338,34 @@ def old_configure(prepare_configure, pre
          if not line:
              break
          log.info(line.rstrip())
@@ -135,7 +135,7 @@ diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mo
  from six.moves import builtins as __builtin__
  import sys
  import types
-@@ -32,16 +33,17 @@ from mozbuild.configure.util import (
+@@ -30,16 +31,17 @@ from mozbuild.configure.util import (
  )
  from mozbuild.util import (
      encode,
@@ -153,7 +153,7 @@ diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mo
  # TRACE logging level, below (thus more verbose than) DEBUG
  TRACE = 5
  
-@@ -877,19 +879,31 @@ class ConfigureSandbox(dict):
+@@ -889,19 +891,31 @@ class ConfigureSandbox(dict):
  
      def _get_one_import(self, what):
          # The special `__sandbox__` module gives access to the sandbox

+ 8 - 10
mozilla-release/patches/1575420-70a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1566390342 0
 # Node ID 51bf6a97396d96ddb82fa91c2cf9bd9f5bc9ae06
-# Parent  4096cc17a03e213a3e13580a6b28c385a62b9a5e
+# Parent  f203f966e3335d4ca07cb32884837a685494ccee
 Bug 1575420 - Replace MOZ_WIDGET_TOOLKIT value of "gtk3" with "gtk". r=froydnj
 
 Differential Revision: https://phabricator.services.mozilla.com/D42765
@@ -579,7 +579,7 @@ diff --git a/chrome/moz.build b/chrome/moz.build
 diff --git a/config/recurse.mk b/config/recurse.mk
 --- a/config/recurse.mk
 +++ b/config/recurse.mk
-@@ -171,17 +171,17 @@ xpcom/xpidl/export: xpcom/idl-parser/xpi
+@@ -171,15 +171,15 @@ xpcom/xpidl/export: xpcom/idl-parser/xpi
  
  ifdef ENABLE_CLANG_PLUGIN
  $(filter-out config/host build/unix/stdc++compat/% build/clang-plugin/%,$(compile_targets)): build/clang-plugin/host build/clang-plugin/tests/target
@@ -592,12 +592,10 @@ diff --git a/config/recurse.mk b/config/recurse.mk
 +ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
  toolkit/library/target: widget/gtk/mozgtk/gtk3/target
  endif
- ifdef MOZ_LDAP_XPCOM
- ldap/target: security/target mozglue/build/target
- toolkit/library/target: ldap/target
- endif
  endif
  # Most things are built during compile (target/host), but some things happen during export
+ # Those need to depend on config/export for system wrappers.
+ $(addprefix build/unix/stdc++compat/,target host) build/clang-plugin/host: config/export
 diff --git a/dom/geolocation/moz.build b/dom/geolocation/moz.build
 --- a/dom/geolocation/moz.build
 +++ b/dom/geolocation/moz.build
@@ -768,7 +766,7 @@ diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build
 diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build
 --- a/gfx/cairo/cairo/src/moz.build
 +++ b/gfx/cairo/cairo/src/moz.build
-@@ -68,17 +68,17 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] in {'c
+@@ -64,17 +64,17 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] in {'c
      ]
  elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'beos':
      EXPORTS.cairo += [
@@ -834,7 +832,7 @@ diff --git a/gfx/harfbuzz/src/moz.build b/gfx/harfbuzz/src/moz.build
 diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
 --- a/gfx/skia/generate_mozbuild.py
 +++ b/gfx/skia/generate_mozbuild.py
-@@ -143,21 +143,21 @@ if CONFIG['CC_TYPE'] == 'gcc':
+@@ -144,21 +144,21 @@ if CONFIG['CC_TYPE'] == 'gcc':
  if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
      CXXFLAGS += [
          '-Wno-implicit-fallthrough',
@@ -858,7 +856,7 @@ diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
  
  import json
  
-@@ -447,17 +447,17 @@ def write_mozbuild(sources):
+@@ -448,17 +448,17 @@ def write_mozbuild(sources):
    write_sources(f, sources['gpu'], 4)
  
    f.write("if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':\n")
@@ -1337,7 +1335,7 @@ diff --git a/netwerk/protocol/moz.build b/netwerk/protocol/moz.build
 diff --git a/old-configure.in b/old-configure.in
 --- a/old-configure.in
 +++ b/old-configure.in
-@@ -1774,17 +1774,17 @@ dnl there are a lot of tests on MOZ_ENAB
+@@ -1794,17 +1794,17 @@ dnl there are a lot of tests on MOZ_ENAB
  dnl to keep that way than testing against MOZ_WIDGET_TOOLKIT
  case "$MOZ_WIDGET_TOOLKIT" in
  gtk*)

+ 112 - 112
mozilla-release/patches/series

@@ -5639,6 +5639,7 @@ NOBUG-removenonascii67a1-25314.patch
 1543725-69a1.patch
 1559740-1-69a1.patch
 1559740-2-69a1.patch
+1561695-69a1.patch
 1559975-08-69a1.patch
 1473498-01-69a1.patch
 1473498-02-69a1.patch
@@ -5653,73 +5654,51 @@ NOBUG-removenonascii67a1-25314.patch
 1563326-69a1.patch
 1556393-0-69a1.patch
 1561435-62-69a1.patch
-1559900-70a1.patch
-1618065-75a1.patch
+1559975-10-69a1.patch
+1559975-11-69a1.patch
+1559975-12-69a1.patch
+1559975-13-69a1.patch
+1559975-14-69a1.patch
+1559975-15-69a1.patch
+1559975-16-69a1.patch
+1559975-17-69a1.patch
+1559975-18-69a1.patch
 1558372-70a1.patch
+1563085-70a1.patch
+1559975-19-70a1.patch
+1559975-20-70a1.patch
+1559975-21-70a1.patch
+1562645-1-70a1.patch
+1559195-PARTIAL-70a1.patch
+1559900-70a1.patch
+1563937-70a1.patch
 1561749-70a1.patch
+1485793-70a1.patch
+1564824-70a1.patch
 1564117-1-70a1.patch
 1564117-2-70a1.patch
-1563937-70a1.patch
+1564330-70a1.patch
+1563797-1-70a1.patch
+1563797-2-70a1.patch
+1563797-3-70a1.patch
+1563797-4-70a1.patch
 1564643-70a1.patch
-1510351-70a1.patch
+1565314-70a1.patch
 1458385-1-70a1.patch
 1458385-2-70a1.patch
+1510351-70a1.patch
 1526744-70a1.patch
-1564824-70a1.patch
-1539451-PARTIAL-webide-70a1.patch
-1563133-70a1.patch
-1565130-70a1.patch
-1568558-70a1.patch
-1568535-70a1.patch
-1569223-2-70a1.patch
-1568771-70a1.patch
-1569880-70a1.patch
-1570334-70a1.patch
-1566482-70a1.patch
-1539780-70a1.patch
-1573434-5-PARTIAL-70a1.patch
-1574058-70a1.patch
-1540655-01-70a1.patch
-1575420-70a1.patch
-1564897-70a1.patch
-1560700-1-70a1.patch
-1560700-2-70a1.patch
-1575659-70a1.patch
-1574056-70a1.patch
-1570697-70a1.patch
-1572986-70a1.patch
-1574402-70a1.patch
-1404367-70a1.patch
-1402379-1only-70a1.patch
-1562686-2only-70a1.patch
-1577685-70a1.patch
-1559195-PARTIAL-70a1.patch
-1577867-70a1.patch
-1577664-70a1.patch
-1577869-70a1.patch
-1564216-1-70a1.patch
-1562462-2-70a1.patch
+1565725-70a1.patch
+1566032-70a1.patch
+1562645-2-70a1.patch
+1539451-2-PARTIAL-webide-70a1.patch
 1473498-06-70a1.patch
 1473498-07-70a1.patch
 1473498-08-70a1.patch
+1357317-70a1.patch
 1473498-09no10-70a1.patch
-1473498-11-70a1.patch
-1473498-12-70a1.patch
-1575135-2-70a1.patch
-1563085-70a1.patch
-1566032-70a1.patch
-1559975-10-70a1.patch
-1559975-11-70a1.patch
-1559975-12-70a1.patch
-1559975-13-70a1.patch
-1559975-14-70a1.patch
-1559975-15-70a1.patch
-1559975-16-70a1.patch
-1559975-17-70a1.patch
-1559975-18-70a1.patch
-1559975-19-70a1.patch
-1559975-20-70a1.patch
-1559975-21-70a1.patch
+1566960-70a1.patch
+1563133-70a1.patch
 1559975-22-70a1.patch
 1559975-23-70a1.patch
 1559975-24-70a1.patch
@@ -5731,23 +5710,76 @@ NOBUG-removenonascii67a1-25314.patch
 1559975-31-70a1.patch
 1559975-32-70a1.patch
 1559975-33-70a1.patch
-1559975-35-70a1.patch
-1559975-36-70a1.patch
-1559975-37-70a1.patch
-1562462-1-70a1.patch
-1563797-1-70a1.patch
-1563797-2-70a1.patch
-1563797-3-70a1.patch
-1563797-4-70a1.patch
+1564216-1-70a1.patch
+1567888-70a1.patch
+1565130-70a1.patch
+1568515-70a1.patch
+1568558-70a1.patch
+1568535-70a1.patch
 1568713-70a1.patch
+1569223-2-70a1.patch
+1568484-70a1.patch
+1561323-70a1.patch
+1568771-70a1.patch
+1569880-70a1.patch
+1566180-70a1.patch
 1569075-70a1.patch
+1570334-70a1.patch
+1473498-11-70a1.patch
+1566482-70a1.patch
+1562462-1-70a1.patch
+1562462-2-70a1.patch
+1559975-35-70a1.patch
+1559975-36-70a1.patch
+1512487-1-70a1.patch
+1512487-2-70a1.patch
+1564449-70a1.patch
+1570697-70a1.patch
+1473498-12-70a1.patch
+1571934-1-70a1.patch
+1571934-2-70a1.patch
+1572046-70a1.patch
+1321281-1-70a1.patch
+1321281-2-70a1.patch
+1572394-70a1.patch
+1539780-70a1.patch
+1564434-70a1.patch
+1573314-70a1.patch
+1570772-1-70a1.patch
+1570772-2-70a1.patch
+1573434-PARTIAL-70a1.patch
+1572986-70a1.patch
+1573080-1-70a1.patch
+1573080-2-70a1.patch
+1568634-70a1.patch
+1573406-70a1.patch
+1573861-70a1.patch
+1565717-1-70a1.patch
+1565717-2-70a1.patch
+1565717-3-70a1.patch
+1565717-4-70a1.patch
+1565717-5-70a1.patch
+1574058-70a1.patch
+1540655-01-70a1.patch
+1404367-70a1.patch
+1574402-70a1.patch
+1573566-6-70a1.patch
+1573722-70a1.patch
+1574761-70a1.patch
+1402379-1only-70a1.patch
+1560574-70a1.patch
 1575135-1-70a1.patch
+1575135-2-70a1.patch
 1575135-3-70a1.patch
 1575135-4-70a1.patch
 1575135-5-70a1.patch
 1575135-6-70a1.patch
 1575135-7-70a1.patch
 1575135-8-70a1.patch
+1575420-70a1.patch
+1560700-1-70a1.patch
+1560700-2-70a1.patch
+1435498-70a1.patch
 844509-1-70a1.patch
 844509-2-70a1.patch
 844509-3-70a1.patch
@@ -5760,13 +5792,22 @@ NOBUG-removenonascii67a1-25314.patch
 1575375-07-70a1.patch
 1575375-08no09-70a1.patch
 1575375-10-70a1.patch
+1564897-70a1.patch
 1575804-1-70a1.patch
+1566855-70a1.patch
+1574056-70a1.patch
+1562686-2only-70a1.patch
+1576097-1-70a1.patch
+1513705-70a1.patch
+1575659-70a1.patch
 1575804-2-70a1.patch
+1575436-70a1.patch
 1473498-13-70a1.patch
 1473498-14-70a1.patch
 1473498-15-70a1.patch
 1473498-16-70a1.patch
 1473498-17-70a1.patch
+1555762-70a1.patch
 1210157-1-70a1.patch
 1210157-2-70a1.patch
 1210157-3-70a1.patch
@@ -5774,60 +5815,19 @@ NOBUG-removenonascii67a1-25314.patch
 1210157-5-70a1.patch
 1210157-6-70a1.patch
 1210157-7-70a1.patch
-1577603-70a1.patch
-1561695-70a1.patch
-1566180-70a1.patch
-1571934-1-70a1.patch
-1571934-2-70a1.patch
-1573406-70a1.patch
 1570597-70a1.patch
-1564434-70a1.patch
-1573722-70a1.patch
-1357317-70a1.patch
-1560574-70a1.patch
-1555762-70a1.patch
-1512487-1-70a1.patch
-1512487-2-70a1.patch
-1568484-70a1.patch
-1485793-70a1.patch
-1562645-1-70a1.patch
-1562645-2-70a1.patch
-1570772-1-70a1.patch
-1570772-2-70a1.patch
+1559975-37-70a1.patch
+1577664-70a1.patch
+1577326-70a1.patch
+1577603-70a1.patch
 1570772-3-70a1.patch
 1570772-4-70a1.patch
 1570772-5no67-70a1.patch
-1573080-1-70a1.patch
-1573080-2-70a1.patch
-1576097-1-70a1.patch
-1561323-70a1.patch
-1513705-70a1.patch
-1575436-70a1.patch
-1321281-1-70a1.patch
-1321281-2-70a1.patch
-1564330-70a1.patch
-1565717-1-70a1.patch
-1565717-2-70a1.patch
-1565717-3-70a1.patch
-1565717-4-70a1.patch
-1565717-5-70a1.patch
-1568515-70a1.patch
-1564449-70a1.patch
-1566960-70a1.patch
-1567888-70a1.patch
-1435498-70a1.patch
-1572046-70a1.patch
-1572394-70a1.patch
-1573314-70a1.patch
-1573861-70a1.patch
-1573566-6-70a1.patch
-1565725-70a1.patch
-1574761-70a1.patch
-1568634-70a1.patch
 1576941-70a1.patch
-1577326-70a1.patch
-1565314-70a1.patch
-1566855-70a1.patch
+1577685-70a1.patch
+1577867-70a1.patch
+1577869-70a1.patch
+1618065-75a1.patch
 1578531-71a1.patch
 1577411-71a1.patch
 1577726-2-fix-71a1.patch