glean up crap

mozilla-release/patches/1519319-3-66a1.patch

@@ -0,0 +1,61 @@
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1547245074 0
+#      Fri Jan 11 22:17:54 2019 +0000
+# Node ID b9d64807cd97fae903cf2fae57c0042b7085f365
+# Parent  1fc1d2f8c878f92715822f5a581b9a8c03f35f75
+Bug 1519319 - Move bindgen.configure include to js/moz.configure. r=froydnj
+
+Bindgen is only used when building js or toolkit, so we only need to
+include the configure part in js/moz.configure, which is included in
+both cases.
+
+Depends on D16293
+
+Differential Revision: https://phabricator.services.mozilla.com/D16294
+
+diff --git a/js/moz.configure b/js/moz.configure
+--- a/js/moz.configure
++++ b/js/moz.configure
+@@ -13,16 +13,18 @@ def building_js(build_project):
+ 
+ # Exception to the rule above: JS_STANDALONE is a special option that doesn't
+ # want the js_option treatment. When we're done merging js/src/configure and
+ # top-level configure, it can go away, although the JS_STANDALONE config
+ # will still need to be set depending on building_js above.
+ option(env='JS_STANDALONE', default=building_js,
+        help='Reserved for internal use')
+ 
++include('../build/moz.configure/bindgen.configure',
++        when='--enable-compile-environment')
+ include('../build/moz.configure/rust.configure',
+         when='--enable-compile-environment')
+ 
+ @depends('JS_STANDALONE')
+ def js_standalone(value):
+     if value:
+         return True
+ set_config('JS_STANDALONE', js_standalone)
+diff --git a/moz.configure b/moz.configure
+--- a/moz.configure
++++ b/moz.configure
+@@ -236,19 +236,16 @@ set_config('RUST_LIB_PREFIX', library_na
+ set_config('RUST_LIB_SUFFIX', library_name_info.rust_lib.suffix)
+ set_config('OBJ_SUFFIX', library_name_info.obj.suffix)
+ # Lots of compilation tests depend on this variable being present.
+ add_old_configure_assignment('OBJ_SUFFIX', library_name_info.obj.suffix)
+ set_define('MOZ_DLL_PREFIX', depends(library_name_info.dll.prefix)(lambda s: '"%s"' % s))
+ set_config('IMPORT_LIB_SUFFIX', library_name_info.import_lib.suffix)
+ set_define('MOZ_DLL_SUFFIX', depends(library_name_info.dll.suffix)(lambda s: '"%s"' % s))
+ 
+-# Depends on host_library_name_info, so needs to go here.
+-include('build/moz.configure/bindgen.configure',
+-        when='--enable-compile-environment')
+ include(include_project_configure)
+ 
+ @depends('--help')
+ @imports(_from='mozbuild.backend', _import='backends')
+ def build_backends_choices(_):
+     return tuple(backends)
+ 
+ 

mozilla-release/patches/1528226-67a1.patch

@@ -0,0 +1,35 @@
+# HG changeset patch
+# User Mike Hommey <mh+mozilla@glandium.org>
+# Date 1550244188 0
+#      Fri Feb 15 15:23:08 2019 +0000
+# Node ID 4befc5c89e6950991224895ad2c31d46b97fc533
+# Parent  9696fa097cd0ac3e27b3a34dff1677970ea7b3ea
+Bug 1528226 - Check rustc version before cbindgen. r=froydnj
+
+Differential Revision: https://phabricator.services.mozilla.com/D19941
+
+diff --git a/js/moz.configure b/js/moz.configure
+--- a/js/moz.configure
++++ b/js/moz.configure
+@@ -13,19 +13,19 @@ def building_js(build_project):
+ 
+ # Exception to the rule above: JS_STANDALONE is a special option that doesn't
+ # want the js_option treatment. When we're done merging js/src/configure and
+ # top-level configure, it can go away, although the JS_STANDALONE config
+ # will still need to be set depending on building_js above.
+ option(env='JS_STANDALONE', default=building_js,
+        help='Reserved for internal use')
+ 
+-include('../build/moz.configure/bindgen.configure',
++include('../build/moz.configure/rust.configure',
+         when='--enable-compile-environment')
+-include('../build/moz.configure/rust.configure',
++include('../build/moz.configure/bindgen.configure',
+         when='--enable-compile-environment')
+ 
+ @depends('JS_STANDALONE')
+ def js_standalone(value):
+     if value:
+         return True
+ set_config('JS_STANDALONE', js_standalone)
+ set_define('JS_STANDALONE', js_standalone)

mozilla-release/patches/1639815-2-78a1.patch

@@ -41,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
 +# ====================================
 +

mozilla-release/patches/1656993-81a1.patch

@@ -2,7 +2,7 @@
 # User Ricky Stewart <rstewart@mozilla.com>
 # Date 1597684862 0
 # Node ID eff0a199fae6727caebd03b687824a398fe132ba
-# Parent  21ef9093c4dd92dddc65210c04015c77e266725f
+# Parent  a1882627c4801865af1fe5a0fc699da915cbc0af
 Bug 1656993: Create and require by default global `virtualenv`s in `~/.mozbuild` for `mach` r=mhentges,ahal
 
 In two different places we've been encountering issues regarding 1) how we configure the system Python environment and 2) how the system Python environment relates to the `virtualenv`s that we use for building, testing, and other dev tasks. Specifically:
@@ -39,10 +39,9 @@ diff --git a/build/build_virtualenv_packages.txt b/build/build_virtualenv_packag
 new file mode 100644
 --- /dev/null
 +++ b/build/build_virtualenv_packages.txt
-@@ -0,0 +1,4 @@
+@@ -0,0 +1,3 @@
 +inherit-from-parent-environment
 +packages.txt:build/common_virtualenv_packages.txt
-+python3:mozilla.pth:third_party/python/glean_parser
 +set-variable MOZBUILD_VIRTUALENV=1
 diff --git a/build/virtualenv_packages.txt b/build/common_virtualenv_packages.txt
 rename from build/virtualenv_packages.txt
@@ -538,7 +537,7 @@ diff --git a/python/mozboot/mozboot/base.py b/python/mozboot/mozboot/base.py
 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
-@@ -387,16 +387,17 @@ class Bootstrapper(object):
+@@ -407,16 +407,17 @@ class Bootstrapper(object):
              (checkout_type, checkout_root) = r
              self.instance.validate_environment(checkout_root)
              have_clone = bool(checkout_type)
@@ -556,7 +555,7 @@ diff --git a/python/mozboot/mozboot/bootstrap.py b/python/mozboot/mozboot/bootst
          # Like 'install_browser_packages' or 'install_mobile_android_packages'.
          getattr(self.instance, 'install_%s_packages' % application)()
  
-@@ -473,16 +474,17 @@ class Bootstrapper(object):
+@@ -492,16 +493,17 @@ class Bootstrapper(object):
  
          if not have_clone:
              print(SOURCE_ADVERTISE)
@@ -682,7 +681,7 @@ diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/m
 diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
 --- a/python/mozbuild/mozbuild/mach_commands.py
 +++ b/python/mozbuild/mozbuild/mach_commands.py
-@@ -1117,8 +1117,60 @@ class Repackage(MachCommandBase):
+@@ -1116,8 +1116,59 @@ class Repackage(MachCommandBase):
          repackage_mar(
              self.topsrcdir,
              input,
@@ -728,7 +727,6 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
 +        manager.install_pip_package('zstandard>=0.9.0,<=0.13.0')
 +
 +        if PY3:
-+            manager.install_pip_package('glean_sdk~=31.5.0')
 +            print('Python 3 mach environment created.')
 +            python2, _ = find_python2_executable()
 +            if not python2:

mozilla-release/patches/1660105-81a1.patch

@@ -1,39 +0,0 @@
-# HG changeset patch
-# User Ricky Stewart <rstewart@mozilla.com>
-# Date 1597942019 0
-# Node ID 59edb9c938c148891a1c8c5905897ff4e40962fc
-# Parent  de33002bfafc6ae3ab3e7521b7e1a92a1d69d271
-Bug 1660105 - Allow installing `glean_sdk` to fail in `create-mach-environment`. r=mhentges,froydnj
-
-`glean_sdk` can't currently be installed on Apple Silicon or OpenBSD since Glean can't be built from source. While that issue is being resolved (see bug 1660120), allow this installation to fail.
-
-Differential Revision: https://phabricator.services.mozilla.com/D87667
-
-diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
---- a/python/mozbuild/mozbuild/mach_commands.py
-+++ b/python/mozbuild/mozbuild/mach_commands.py
-@@ -1204,17 +1204,23 @@ class CreateMachEnvironment(MachCommandB
-             os.path.join(self.topsrcdir, 'build',
-                          'mach_virtualenv_packages.txt'),
-             populate_local_paths=False)
-         manager.build(sys.executable)
- 
-         manager.install_pip_package('zstandard>=0.9.0,<=0.13.0')
- 
-         if PY3:
--            manager.install_pip_package('glean_sdk~=31.5.0')
-+            # This can fail on some platforms. See
-+            # https://bugzilla.mozilla.org/show_bug.cgi?id=1660120
-+            try:
-+                manager.install_pip_package('glean_sdk~=31.5.0')
-+            except subprocess.CalledProcessError:
-+                print('Could not install glean_sdk, so telemetry will not be '
-+                      'collected. Continuing.')
-             print('Python 3 mach environment created.')
-             python2, _ = find_python2_executable()
-             if not python2:
-                 print('WARNING! Could not find a Python 2 executable to create '
-                       'a Python 2 virtualenv', file=sys.stderr)
-                 return 0
-             ret = subprocess.call([
-                 python2, os.path.join(self.topsrcdir, 'mach'),

mozilla-release/patches/1661624-85a1.patch

@@ -2,7 +2,7 @@
 # User Ricky Stewart <rstewart@mozilla.com>
 # Date 1606511100 0
 # Node ID 4058e147401f15cfca916f32156381725b4d2137
-# Parent  6296964a4699ca853425ab5a1e58056ffe739579
+# Parent  b89669cd583e65bc2b77534fe68adfcc4bef3dcb
 Bug 1661624 - Include `psutil` in the `mach` `virtualenv`s r=firefox-build-system-reviewers,rstewart
 
 Install `psutil` when setting up the `mach` `virtualenv`s and stop importing the in-tree version in the build.
@@ -39,7 +39,7 @@ diff --git a/build/common_virtualenv_packages.txt b/build/common_virtualenv_pack
 diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
 --- a/python/mozbuild/mozbuild/mach_commands.py
 +++ b/python/mozbuild/mozbuild/mach_commands.py
-@@ -1207,16 +1207,26 @@ class CreateMachEnvironment(MachCommandB
+@@ -1150,16 +1150,26 @@ class CreateMachEnvironment(MachCommandB
              self.topsrcdir, virtualenv_path, sys.stdout,
              os.path.join(self.topsrcdir, 'build',
                           'mach_virtualenv_packages.txt'),
@@ -59,10 +59,10 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
 +            )
 +
          if not PY2:
-             # This can fail on some platforms. See
-             # https://bugzilla.mozilla.org/show_bug.cgi?id=1660120
-             try:
-                 manager.install_pip_package('glean_sdk~=31.5.0')
-             except subprocess.CalledProcessError:
-                 print('Could not install glean_sdk, so telemetry will not be '
-                       'collected. Continuing.')
+             print('Python 3 mach environment created.')
+             python2, _ = find_python2_executable()
+             if not python2:
+                 print('WARNING! Could not find a Python 2 executable to create '
+                       'a Python 2 virtualenv', file=sys.stderr)
+                 return 0
+             ret = subprocess.call([

mozilla-release/patches/1662775-82a1.patch

@@ -2,7 +2,7 @@
 # User Ricky Stewart <rstewart@mozilla.com>
 # Date 1599554463 0
 # Node ID 1575ac14206f1c9527dc50545d9e2a2825fdf822
-# Parent  65564d846f32803023d16138bd61ad756207c61f
+# Parent  12344879eb624ce47e67f991ffe1e8c1b5eaebf7
 Bug 1662775 - Refactor logic to locate `mach` `virtualenv`s r=glandium
 
 This will be found in a couple places, so we might as well make a helper function. For symmetry put it in the same file where we keep the helper function to locate the `state_dir`.
@@ -101,7 +101,7 @@ diff --git a/python/mozboot/mozboot/util.py b/python/mozboot/mozboot/util.py
 diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
 --- a/python/mozbuild/mozbuild/mach_commands.py
 +++ b/python/mozbuild/mozbuild/mach_commands.py
-@@ -1124,40 +1124,38 @@ class CreateMachEnvironment(MachCommandB
+@@ -1129,40 +1129,38 @@ class CreateMachEnvironment(MachCommandB
  
      @Command('create-mach-environment', category='devenv',
               description=(
@@ -138,11 +138,11 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
  
 -        if PY3:
 +        if not PY2:
-             # This can fail on some platforms. See
-             # https://bugzilla.mozilla.org/show_bug.cgi?id=1660120
-             try:
-                 manager.install_pip_package('glean_sdk~=31.5.0')
-             except subprocess.CalledProcessError:
-                 print('Could not install glean_sdk, so telemetry will not be '
-                       'collected. Continuing.')
              print('Python 3 mach environment created.')
+             python2, _ = find_python2_executable()
+             if not python2:
+                 print('WARNING! Could not find a Python 2 executable to create '
+                       'a Python 2 virtualenv', file=sys.stderr)
+                 return 0
+             ret = subprocess.call([
+                 python2, os.path.join(self.topsrcdir, 'mach'),

mozilla-release/patches/1663755-82a1.patch

@@ -2,7 +2,7 @@
 # User Ricky Stewart <rstewart@mozilla.com>
 # Date 1599862481 0
 # Node ID 4627a7a4713dbef81fb169254d08fefc52cbb235
-# Parent  d8042259bd2f282dd6bc07bc68c03336f99cc233
+# Parent  cd4c8e718298fd3383d275a845ad5c627af6d2c8
 Bug 1663755 - Remove `inherit-from-parent-environment` implementation r=ahal
 
 This was originally meant to allow `virtualenv`s to use packages from a parent Python environment without having to re-install them. This turned out to not pan out as we would have liked, so we're going another way to solve the same problem. Bug 1660351 walked back a bunch of this logic; this patch deletes the rest of it.
@@ -12,10 +12,9 @@ Differential Revision: https://phabricator.services.mozilla.com/D89492
 diff --git a/build/build_virtualenv_packages.txt b/build/build_virtualenv_packages.txt
 --- a/build/build_virtualenv_packages.txt
 +++ b/build/build_virtualenv_packages.txt
-@@ -1,4 +1,3 @@
+@@ -1,3 +1,2 @@
 -inherit-from-parent-environment
  packages.txt:build/common_virtualenv_packages.txt
- python3:mozilla.pth:third_party/python/glean_parser
  set-variable MOZBUILD_VIRTUALENV=1
 diff --git a/python/mozbuild/mozbuild/virtualenv.py b/python/mozbuild/mozbuild/virtualenv.py
 --- a/python/mozbuild/mozbuild/virtualenv.py

mozilla-release/patches/1681560-86a1.patch

@@ -2,7 +2,7 @@
 # User Connor Sheehan <sheehan@mozilla.com>
 # Date 1608152522 0
 # Node ID a31a95d6a390d1ba471fe4ab0830edec689ade3d
-# Parent  7842181fbbbf614efce321e8184e1c53ed0dcbf2
+# Parent  b5bcd0c054349db12e23a4872e3c8a5672c9c117
 Bug 1681560: install native packages using requirements files with pinned hashes r=firefox-build-system-reviewers,mhentges
 
 At the moment installing Python packages with native code is done by calling
@@ -19,183 +19,6 @@ We also add the new requirements files to the sparse profile for `mach`.
 
 Differential Revision: https://phabricator.services.mozilla.com/D99912
 
-diff --git a/build/glean_requirements.in b/build/glean_requirements.in
-new file mode 100644
---- /dev/null
-+++ b/build/glean_requirements.in
-@@ -0,0 +1,2 @@
-+glean_sdk==33.7.0
-+
-diff --git a/build/glean_requirements.txt b/build/glean_requirements.txt
-new file mode 100644
---- /dev/null
-+++ b/build/glean_requirements.txt
-@@ -0,0 +1,165 @@
-+#
-+# This file is autogenerated by pip-compile
-+# To update, run:
-+#
-+#    pip-compile --generate-hashes --output-file=glean_requirements.txt glean_requirements.in
-+#
-+appdirs==1.4.4 \
-+    --hash=sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41 \
-+    --hash=sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128 \
-+    # via glean-parser
-+attrs==20.3.0 \
-+    --hash=sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6 \
-+    --hash=sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700 \
-+    # via jsonschema
-+cffi==1.14.4 \
-+    --hash=sha256:00a1ba5e2e95684448de9b89888ccd02c98d512064b4cb987d48f4b40aa0421e \
-+    --hash=sha256:00e28066507bfc3fe865a31f325c8391a1ac2916219340f87dfad602c3e48e5d \
-+    --hash=sha256:045d792900a75e8b1e1b0ab6787dd733a8190ffcf80e8c8ceb2fb10a29ff238a \
-+    --hash=sha256:0638c3ae1a0edfb77c6765d487fee624d2b1ee1bdfeffc1f0b58c64d149e7eec \
-+    --hash=sha256:105abaf8a6075dc96c1fe5ae7aae073f4696f2905fde6aeada4c9d2926752362 \
-+    --hash=sha256:155136b51fd733fa94e1c2ea5211dcd4c8879869008fc811648f16541bf99668 \
-+    --hash=sha256:1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c \
-+    --hash=sha256:1d2c4994f515e5b485fd6d3a73d05526aa0fcf248eb135996b088d25dfa1865b \
-+    --hash=sha256:2c24d61263f511551f740d1a065eb0212db1dbbbbd241db758f5244281590c06 \
-+    --hash=sha256:51a8b381b16ddd370178a65360ebe15fbc1c71cf6f584613a7ea08bfad946698 \
-+    --hash=sha256:594234691ac0e9b770aee9fcdb8fa02c22e43e5c619456efd0d6c2bf276f3eb2 \
-+    --hash=sha256:5cf4be6c304ad0b6602f5c4e90e2f59b47653ac1ed9c662ed379fe48a8f26b0c \
-+    --hash=sha256:64081b3f8f6f3c3de6191ec89d7dc6c86a8a43911f7ecb422c60e90c70be41c7 \
-+    --hash=sha256:6bc25fc545a6b3d57b5f8618e59fc13d3a3a68431e8ca5fd4c13241cd70d0009 \
-+    --hash=sha256:798caa2a2384b1cbe8a2a139d80734c9db54f9cc155c99d7cc92441a23871c03 \
-+    --hash=sha256:7c6b1dece89874d9541fc974917b631406233ea0440d0bdfbb8e03bf39a49b3b \
-+    --hash=sha256:840793c68105fe031f34d6a086eaea153a0cd5c491cde82a74b420edd0a2b909 \
-+    --hash=sha256:8d6603078baf4e11edc4168a514c5ce5b3ba6e3e9c374298cb88437957960a53 \
-+    --hash=sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35 \
-+    --hash=sha256:9f7a31251289b2ab6d4012f6e83e58bc3b96bd151f5b5262467f4bb6b34a7c26 \
-+    --hash=sha256:9ffb888f19d54a4d4dfd4b3f29bc2c16aa4972f1c2ab9c4ab09b8ab8685b9c2b \
-+    --hash=sha256:a5ed8c05548b54b998b9498753fb9cadbfd92ee88e884641377d8a8b291bcc01 \
-+    --hash=sha256:a7711edca4dcef1a75257b50a2fbfe92a65187c47dab5a0f1b9b332c5919a3fb \
-+    --hash=sha256:af5c59122a011049aad5dd87424b8e65a80e4a6477419c0c1015f73fb5ea0293 \
-+    --hash=sha256:b18e0a9ef57d2b41f5c68beefa32317d286c3d6ac0484efd10d6e07491bb95dd \
-+    --hash=sha256:b4e248d1087abf9f4c10f3c398896c87ce82a9856494a7155823eb45a892395d \
-+    --hash=sha256:ba4e9e0ae13fc41c6b23299545e5ef73055213e466bd107953e4a013a5ddd7e3 \
-+    --hash=sha256:c6332685306b6417a91b1ff9fae889b3ba65c2292d64bd9245c093b1b284809d \
-+    --hash=sha256:d5ff0621c88ce83a28a10d2ce719b2ee85635e85c515f12bac99a95306da4b2e \
-+    --hash=sha256:d9efd8b7a3ef378dd61a1e77367f1924375befc2eba06168b6ebfa903a5e59ca \
-+    --hash=sha256:df5169c4396adc04f9b0a05f13c074df878b6052430e03f50e68adf3a57aa28d \
-+    --hash=sha256:ebb253464a5d0482b191274f1c8bf00e33f7e0b9c66405fbffc61ed2c839c775 \
-+    --hash=sha256:ec80dc47f54e6e9a78181ce05feb71a0353854cc26999db963695f950b5fb375 \
-+    --hash=sha256:f032b34669220030f905152045dfa27741ce1a6db3324a5bc0b96b6c7420c87b \
-+    --hash=sha256:f60567825f791c6f8a592f3c6e3bd93dd2934e3f9dac189308426bd76b00ef3b \
-+    --hash=sha256:f803eaa94c2fcda012c047e62bc7a51b0bdabda1cad7a92a522694ea2d76e49f \
-+    # via glean-sdk
-+click==7.1.2 \
-+    --hash=sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a \
-+    --hash=sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc \
-+    # via glean-parser
-+diskcache==5.1.0 \
-+    --hash=sha256:bc7928df986dbc8a8d6e34c33b0da89d668cfa65e7fcc91298a6959a35076993 \
-+    --hash=sha256:d8d608363f1b0ecbc216b5b34b6c8e269a5d4cce338269f3b1c1f8f11816f71d \
-+    # via glean-parser
-+glean-parser==1.29.0 \
-+    --hash=sha256:7cf1b02ef87fad57bf0f6b9711a98c1fd8f89c9df702245d16c09bf1b042a255 \
-+    --hash=sha256:df7436e164148594176ec55f7d7c3c5c944daca67c3cc30428514628625b214b \
-+    # via glean-sdk
-+glean_sdk==33.7.0 \
-+    --hash=sha256:2fc5e8d2ec668fae2235e0cae6cb59a6611a1cbdc9cf667319bf01fe1f53e8ce \
-+    --hash=sha256:93f943ffc10bee45942a0b9e7262e44e2ab30fa71c185e079b5cabca4c7f64c2 \
-+    --hash=sha256:aa655ff576b8fe209be973f6f6920f3bdb5e1ea1388bfcf569a10b6d29843b26 \
-+    --hash=sha256:c92ef6cf3ba3604dd5597e9f2ff3158a7b853757882ecfc9a33a2f2c941cb171 \
-+    --hash=sha256:e038e3ae8c29d6e5047b755120c8846fcb79aca76531f9210f738dbc21808d99 \
-+    # via -r glean_requirements.in
-+importlib-metadata==3.3.0 \
-+    --hash=sha256:5c5a2720817414a6c41f0a49993908068243ae02c1635a228126519b509c8aed \
-+    --hash=sha256:bf792d480abbd5eda85794e4afb09dd538393f7d6e6ffef6e9f03d2014cf9450 \
-+    # via jsonschema
-+jinja2==2.11.2 \
-+    --hash=sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0 \
-+    --hash=sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035 \
-+    # via glean-parser
-+jsonschema==3.2.0 \
-+    --hash=sha256:4e5b3cf8216f577bee9ce139cbe72eca3ea4f292ec60928ff24758ce626cd163 \
-+    --hash=sha256:c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a \
-+    # via glean-parser
-+markupsafe==1.1.1 \
-+    --hash=sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473 \
-+    --hash=sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161 \
-+    --hash=sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235 \
-+    --hash=sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5 \
-+    --hash=sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42 \
-+    --hash=sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff \
-+    --hash=sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b \
-+    --hash=sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1 \
-+    --hash=sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e \
-+    --hash=sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183 \
-+    --hash=sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66 \
-+    --hash=sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b \
-+    --hash=sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1 \
-+    --hash=sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15 \
-+    --hash=sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1 \
-+    --hash=sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e \
-+    --hash=sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b \
-+    --hash=sha256:7c1699dfe0cf8ff607dbdcc1e9b9af1755371f92a68f706051cc8c37d447c905 \
-+    --hash=sha256:88e5fcfb52ee7b911e8bb6d6aa2fd21fbecc674eadd44118a9cc3863f938e735 \
-+    --hash=sha256:8defac2f2ccd6805ebf65f5eeb132adcf2ab57aa11fdf4c0dd5169a004710e7d \
-+    --hash=sha256:98c7086708b163d425c67c7a91bad6e466bb99d797aa64f965e9d25c12111a5e \
-+    --hash=sha256:9add70b36c5666a2ed02b43b335fe19002ee5235efd4b8a89bfcf9005bebac0d \
-+    --hash=sha256:9bf40443012702a1d2070043cb6291650a0841ece432556f784f004937f0f32c \
-+    --hash=sha256:ade5e387d2ad0d7ebf59146cc00c8044acbd863725f887353a10df825fc8ae21 \
-+    --hash=sha256:b00c1de48212e4cc9603895652c5c410df699856a2853135b3967591e4beebc2 \
-+    --hash=sha256:b1282f8c00509d99fef04d8ba936b156d419be841854fe901d8ae224c59f0be5 \
-+    --hash=sha256:b2051432115498d3562c084a49bba65d97cf251f5a331c64a12ee7e04dacc51b \
-+    --hash=sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6 \
-+    --hash=sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f \
-+    --hash=sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f \
-+    --hash=sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2 \
-+    --hash=sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7 \
-+    --hash=sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be \
-+    # via jinja2
-+pathspec==0.8.1 \
-+    --hash=sha256:86379d6b86d75816baba717e64b1a3a3469deb93bb76d613c9ce79edc5cb68fd \
-+    --hash=sha256:aa0cb481c4041bf52ffa7b0d8fa6cd3e88a2ca4879c533c9153882ee2556790d \
-+    # via yamllint
-+pycparser==2.20 \
-+    --hash=sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0 \
-+    --hash=sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705 \
-+    # via cffi
-+pyrsistent==0.17.3 \
-+    --hash=sha256:2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e \
-+    # via jsonschema
-+pyyaml==5.3.1 \
-+    --hash=sha256:06a0d7ba600ce0b2d2fe2e78453a470b5a6e000a985dd4a4e54e436cc36b0e97 \
-+    --hash=sha256:240097ff019d7c70a4922b6869d8a86407758333f02203e0fc6ff79c5dcede76 \
-+    --hash=sha256:4f4b913ca1a7319b33cfb1369e91e50354d6f07a135f3b901aca02aa95940bd2 \
-+    --hash=sha256:6034f55dab5fea9e53f436aa68fa3ace2634918e8b5994d82f3621c04ff5ed2e \
-+    --hash=sha256:69f00dca373f240f842b2931fb2c7e14ddbacd1397d57157a9b005a6a9942648 \
-+    --hash=sha256:73f099454b799e05e5ab51423c7bcf361c58d3206fa7b0d555426b1f4d9a3eaf \
-+    --hash=sha256:74809a57b329d6cc0fdccee6318f44b9b8649961fa73144a98735b0aaf029f1f \
-+    --hash=sha256:7739fc0fa8205b3ee8808aea45e968bc90082c10aef6ea95e855e10abf4a37b2 \
-+    --hash=sha256:95f71d2af0ff4227885f7a6605c37fd53d3a106fcab511b8860ecca9fcf400ee \
-+    --hash=sha256:ad9c67312c84def58f3c04504727ca879cb0013b2517c85a9a253f0cb6380c0a \
-+    --hash=sha256:b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d \
-+    --hash=sha256:cc8955cfbfc7a115fa81d85284ee61147059a753344bc51098f3ccd69b0d7e0c \
-+    --hash=sha256:d13155f591e6fcc1ec3b30685d50bf0711574e2c0dfffd7644babf8b5102ca1a \
-+    # via glean-parser, yamllint
-+six==1.15.0 \
-+    --hash=sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259 \
-+    --hash=sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced \
-+    # via jsonschema
-+typing-extensions==3.7.4.3 \
-+    --hash=sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918 \
-+    --hash=sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c \
-+    --hash=sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f \
-+    # via importlib-metadata
-+yamllint==1.25.0 \
-+    --hash=sha256:b1549cbe5b47b6ba67bdeea31720f5c51431a4d0c076c1557952d841f7223519 \
-+    --hash=sha256:c7be4d0d2584a1b561498fa9acb77ad22eb434a109725c7781373ae496d823b3 \
-+    # via glean-parser
-+zipp==3.4.0 \
-+    --hash=sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108 \
-+    --hash=sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb \
-+    # via importlib-metadata
-+
-+# WARNING: The following packages were not pinned, but pip requires them to be
-+# pinned when the requirements file includes hashes. Consider using the --allow-unsafe flag.
-+# setuptools
 diff --git a/build/psutil_requirements.in b/build/psutil_requirements.in
 new file mode 100644
 --- /dev/null
@@ -340,7 +163,7 @@ new file mode 100644
 diff --git a/python/mozbuild/mozbuild/base.py b/python/mozbuild/mozbuild/base.py
 --- a/python/mozbuild/mozbuild/base.py
 +++ b/python/mozbuild/mozbuild/base.py
-@@ -829,17 +829,19 @@ class MozbuildObject(ProcessExecutionMix
+@@ -830,17 +830,19 @@ class MozbuildObject(ProcessExecutionMix
      def _set_log_level(self, verbose):
          self.log_manager.terminal_handler.setLevel(logging.INFO if not verbose else logging.DEBUG)
  
@@ -364,7 +187,7 @@ diff --git a/python/mozbuild/mozbuild/base.py b/python/mozbuild/mozbuild/base.py
 diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
 --- a/python/mozbuild/mozbuild/mach_commands.py
 +++ b/python/mozbuild/mozbuild/mach_commands.py
-@@ -1280,33 +1280,39 @@ class CreateMachEnvironment(MachCommandB
+@@ -1148,22 +1148,26 @@ class CreateMachEnvironment(MachCommandB
  
          manager = VirtualenvManager(
              self.topsrcdir, virtualenv_path, sys.stdout,
@@ -392,18 +215,4 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
              )
  
          if not PY2:
-             # This can fail on some platforms. See
-             # https://bugzilla.mozilla.org/show_bug.cgi?id=1660120
-             try:
--                manager.install_pip_package('glean_sdk~=31.5.0')
-+                manager.install_pip_requirements(
-+                    os.path.join(self.topsrcdir, "build", "glean_requirements.txt")
-+                )
-             except subprocess.CalledProcessError:
-                 print('Could not install glean_sdk, so telemetry will not be '
-                       'collected. Continuing.')
              print('Python 3 mach environment created.')
-             python2, _ = find_python2_executable()
-             if not python2:
-                 print('WARNING! Could not find a Python 2 executable to create '
-                       'a Python 2 virtualenv', file=sys.stderr)

mozilla-release/patches/1692383-87a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1613523218 0
 # Node ID 9539a7f2006af1fbe025182ca40e2a52c368e77b
-# Parent  81f60551f0aaf30736815381b528166dcba5f5e4
+# Parent  d0e189bc34b4b245260dacd40d85b474fdc139df
 Bug 1692383 - Upgrade python-zstandard to 0.15.1. r=firefox-build-system-reviewers,mhentges
 
 As far as I can tell, we don't use zstandard from python2. As the last
@@ -238,7 +238,7 @@ diff --git a/build/zstandard_requirements.txt b/build/zstandard_requirements.txt
 diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
 --- a/python/mozbuild/mozbuild/mach_commands.py
 +++ b/python/mozbuild/mozbuild/mach_commands.py
-@@ -1280,33 +1280,33 @@ class CreateMachEnvironment(MachCommandB
+@@ -1148,33 +1148,33 @@ class CreateMachEnvironment(MachCommandB
  
          manager = VirtualenvManager(
              self.topsrcdir, virtualenv_path, sys.stdout,
@@ -268,11 +268,11 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
 +                os.path.join(self.topsrcdir, "build", "zstandard_requirements.txt")
 +            )
 +
-             # This can fail on some platforms. See
-             # https://bugzilla.mozilla.org/show_bug.cgi?id=1660120
-             try:
-                 manager.install_pip_requirements(
-                     os.path.join(self.topsrcdir, "build", "glean_requirements.txt")
-                 )
-             except subprocess.CalledProcessError:
-                 print('Could not install glean_sdk, so telemetry will not be '
+             print('Python 3 mach environment created.')
+             python2, _ = find_python2_executable()
+             if not python2:
+                 print('WARNING! Could not find a Python 2 executable to create '
+                       'a Python 2 virtualenv', file=sys.stderr)
+                 return 0
+             ret = subprocess.call([
+                 python2, os.path.join(self.topsrcdir, 'mach'),

mozilla-release/patches/1705296-89a1.patch

@@ -2,7 +2,7 @@
 # User Mike Hommey <mh+mozilla@glandium.org>
 # Date 1618534809 0
 # Node ID 42bb67ed33ddf7183df15ca990c5b7493c2dc0ad
-# Parent  d5565fadb2b18a99766ac93e1a530c13de98f452
+# Parent  d7056f7fabe7723ddce8be9a4f881ac6d19a1122
 Bug 1705296 - Don't create a python2 mach virtualenv. r=firefox-build-system-reviewers,mhentges
 
 No mach command uses python2 anymore, so we don't need to create a
@@ -38,7 +38,7 @@ diff --git a/python/mozboot/mozboot/util.py b/python/mozboot/mozboot/util.py
 diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
 --- a/python/mozbuild/mozbuild/mach_commands.py
 +++ b/python/mozbuild/mozbuild/mach_commands.py
-@@ -1125,28 +1125,23 @@ class Repackage(MachCommandBase):
+@@ -1123,28 +1123,23 @@ class Repackage(MachCommandBase):
          )
  
  
@@ -70,7 +70,7 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
  
          manager = VirtualenvManager(
              self.topsrcdir, virtualenv_path, sys.stdout,
-@@ -1162,36 +1157,24 @@ class CreateMachEnvironment(MachCommandB
+@@ -1160,27 +1155,13 @@ class CreateMachEnvironment(MachCommandB
                  os.path.join(self.topsrcdir, "build", "psutil_requirements.txt")
              )
          except subprocess.CalledProcessError:
@@ -87,15 +87,6 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
 +            os.path.join(self.topsrcdir, "build", "zstandard_requirements.txt")
 +        )
  
--            # This can fail on some platforms. See
--            # https://bugzilla.mozilla.org/show_bug.cgi?id=1660120
--            try:
--                manager.install_pip_requirements(
--                    os.path.join(self.topsrcdir, "build", "glean_requirements.txt")
--                )
--            except subprocess.CalledProcessError:
--                print('Could not install glean_sdk, so telemetry will not be '
--                      'collected. Continuing.')
 -            print('Python 3 mach environment created.')
 -            python2, _ = find_python2_executable()
 -            if not python2:
@@ -110,17 +101,6 @@ diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuil
 -                      file=sys.stderr)
 -        else:
 -            print('Python 2 mach environment created.')
-+        # This can fail on some platforms. See
-+        # https://bugzilla.mozilla.org/show_bug.cgi?id=1660120
-+        try:
-+            manager.install_pip_requirements(
-+                os.path.join(self.topsrcdir, "build", "glean_requirements.txt")
-+            )
-+        except subprocess.CalledProcessError:
-+            print(
-+                "Could not install glean_sdk, so telemetry will not be "
-+                "collected. Continuing."
-+            )
 +        print("Mach environment created.")
 diff --git a/python/mozbuild/mozbuild/pythonutil.py b/python/mozbuild/mozbuild/pythonutil.py
 --- a/python/mozbuild/mozbuild/pythonutil.py

mozilla-release/patches/1714641-01-91a1.patch

@@ -10,14 +10,6 @@ used and `python2:` items will never be needed.
 
 Differential Revision: https://phabricator.services.mozilla.com/D117059
 
-diff --git a/build/build_virtualenv_packages.txt b/build/build_virtualenv_packages.txt
---- a/build/build_virtualenv_packages.txt
-+++ b/build/build_virtualenv_packages.txt
-@@ -1,3 +1,3 @@
- packages.txt:build/common_virtualenv_packages.txt
--python3:mozilla.pth:third_party/python/glean_parser
-+mozilla.pth:third_party/python/glean_parser
- set-variable MOZBUILD_VIRTUALENV=1
 diff --git a/build/common_virtualenv_packages.txt b/build/common_virtualenv_packages.txt
 --- a/build/common_virtualenv_packages.txt
 +++ b/build/common_virtualenv_packages.txt

mozilla-release/patches/NOBUG-20190111-explainpy3-66a1.patch

@@ -0,0 +1,86 @@
+# HG changeset patch
+# User Steve Fink <sfink@mozilla.com>
+# Date 1546060465 28800
+#      Fri Dec 28 21:14:25 2018 -0800
+# Node ID bc9a09046f1b83752004d6a4a9b54f06386a5e63
+# Parent  1f686d42d43ebd73b045dd16d1c167a0ed3e55f7
+No bug. Convert explain.py to python3 (maintaining python2 compatibility).
+
+diff --git a/js/src/devtools/rootAnalysis/explain.py b/js/src/devtools/rootAnalysis/explain.py
+--- a/js/src/devtools/rootAnalysis/explain.py
++++ b/js/src/devtools/rootAnalysis/explain.py
+@@ -1,12 +1,14 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
++from __future__ import print_function
++
++import argparse
+ import re
+-import argparse
+ 
+ from collections import defaultdict
+ 
+ parser = argparse.ArgumentParser(description='Process some integers.')
+ parser.add_argument('rootingHazards', nargs='?', default='rootingHazards.txt')
+ parser.add_argument('gcFunctions', nargs='?', default='gcFunctions.txt')
+ parser.add_argument('hazards', nargs='?', default='hazards.txt')
+ parser.add_argument('extra', nargs='?', default='unnecessary.txt')
+@@ -29,30 +31,30 @@ try:
+         # List of tuples (gcFunction, index of hazard) used to maintain the
+         # ordering of the hazards
+         hazardOrder = []
+ 
+         for line in rootingHazards:
+             m = re.match(r'^Time: (.*)', line)
+             mm = re.match(r'^Run on:', line)
+             if m or mm:
+-                print >>hazards, line
+-                print >>extra, line
+-                print >>refs, line
++                print(line, file=hazards)
++                print(line, file=extra)
++                print(line, file=refs)
+                 continue
+ 
+             m = re.match(r'^Function.*has unnecessary root', line)
+             if m:
+-                print >>extra, line
++                print(line, file=extra)
+                 continue
+ 
+             m = re.match(r'^Function.*takes unsafe address of unrooted', line)
+             if m:
+                 num_refs += 1
+-                print >>refs, line
++                print(line, file=refs)
+                 continue
+ 
+             m = re.match(
+                 r"^Function.*has unrooted.*of type.*live across GC call ('?)(.*?)('?) at \S+:\d+$", line)  # NOQA: E501
+             if m:
+                 # Function names are surrounded by single quotes. Field calls
+                 # are unquoted.
+                 current_gcFunction = m.group(2)
+@@ -87,19 +89,19 @@ try:
+                     explanation += line
+             if current_func:
+                 gcExplanations[current_func] = explanation
+ 
+         for gcFunction, index in hazardOrder:
+             gcHazards = hazardousGCFunctions[gcFunction]
+ 
+             if gcFunction in gcExplanations:
+-                print >>hazards, (gcHazards[index] + gcExplanations[gcFunction])
++                print(gcHazards[index] + gcExplanations[gcFunction], file=hazards)
+             else:
+-                print >>hazards, gcHazards[index]
++                print(gcHazards[index], file=hazards)
+ 
+ except IOError as e:
+     print('Failed: %s' % str(e))
+ 
+ print("Wrote %s" % args.hazards)
+ print("Wrote %s" % args.extra)
+ print("Wrote %s" % args.refs)
+ print("Found %d hazards and %d unsafe references" % (num_hazards, num_refs))

mozilla-release/patches/TOP-NOBUG-disable-glean-25319.patch

@@ -1,35 +0,0 @@
-# HG changeset patch
-# User Frank-Rainer Grahl <frgrahl@gmx.net>
-# Date 1717614985 -7200
-# Parent  1b46aa341f29c2b008299de1055a4ce55439dc87
-No Bug - Do not use the glean sdk. r=me a=me
-
-diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
---- a/python/mozbuild/mozbuild/mach_commands.py
-+++ b/python/mozbuild/mozbuild/mach_commands.py
-@@ -1210,20 +1210,14 @@ class CreateMachEnvironment(MachCommandB
-                 "Could not install psutil, so telemetry will be missing some "
-                 "data. Continuing."
-             )
- 
-         manager.install_pip_requirements(
-             os.path.join(self.topsrcdir, "build", "zstandard_requirements.txt")
-         )
- 
--        # This can fail on some platforms. See
--        # https://bugzilla.mozilla.org/show_bug.cgi?id=1660120
--        try:
--            manager.install_pip_requirements(
--                os.path.join(self.topsrcdir, "build", "glean_requirements.txt")
--            )
--        except subprocess.CalledProcessError:
--            print(
--                "Could not install glean_sdk, so telemetry will not be "
--                "collected. Continuing."
--            )
-+        # ^We don't want glean
-+        print(
-+            "glean_sdk not installed. Telemetry will not be "
-+            "collected. Continuing."
-+        )
-         print("Mach environment created.")

mozilla-release/patches/series

@@ -5233,7 +5233,9 @@ NOBUG-20180824-buildsetting-63a1.patch
 1519308-66a1.patch
 1257904-66a1.patch
 1519319-2-66a1.patch
+1519319-3-66a1.patch
 1519629-66a1.patch
+NOBUG-20190111-explainpy3-66a1.patch
 1519729-2-66a1.patch
 1519729-3-66a1.patch
 1519660-66a1.patch
@@ -5387,6 +5389,7 @@ NOBUG-removenonascii67a1-25314.patch
 1528304-67a1.patch
 1504339-67a1.patch
 1528028-67a1.patch
+1528226-67a1.patch
 1528194-1-67a1.patch
 1528194-2-67a1.patch
 1528241-67a1.patch
@@ -6696,7 +6699,6 @@ NOBUG-removenonascii67a1-25314.patch
 1659154-81a1.patch
 1659411-1-81a1.patch
 1656993-81a1.patch
-1660105-81a1.patch
 1659047-81a1.patch
 1659575-81a1.patch
 1659411-2-81a1.patch
@@ -7472,7 +7474,6 @@ TOP-1707096-91a1.patch
 TOP-1846703-binutilsfix-11504.patch
 TOP-1859635-NSS3901-11506.patch
 TOP-NOBUG-killtelemetry-debugger-25319.patch
-TOP-NOBUG-disable-glean-25319.patch
 TOP-1472170-PARTIAL-NOTESTS-63a1.patch
 TOP-1864587-angle-11507.patch
 TOP-1880562-NSS3902-11509.patch