merge: update to ungoogled-chromium 137.0.7151.55

utils/depot_tools.patch

@@ -66,17 +66,17 @@
          self._gn_args = local_scope.get('gclient_gn_args', [])
          # It doesn't make sense to set all of these, since setting gn_args_from
          # to another DEPS will make gclient ignore any other local gn_args*
-@@ -3977,6 +3987,7 @@ def CMDsync(parser, args):
-                       dest='experiments',
+@@ -3983,6 +3993,7 @@ def CMDsync(parser, args):
                        default=[],
-                       help='Which experiments should be enabled.')
+                       help='Specify to skip processing of a certain type of '
+                       'dep.')
 +    parser.add_option('--sysroot')
      (options, args) = parser.parse_args(args)
      client = GClient.LoadCurrentConfig(options)
  
 --- a/gclient_scm.py
 +++ b/gclient_scm.py
-@@ -971,8 +971,7 @@ class GitWrapper(SCMWrapper):
+@@ -979,8 +979,7 @@ class GitWrapper(SCMWrapper):
          self._SetFetchConfig(options)
  
          # Fetch upstream if we don't already have |revision|.
@@ -86,7 +86,7 @@
              self._Fetch(options, prune=options.force)
  
              if not scm.GIT.IsValidRevision(
-@@ -988,7 +987,7 @@ class GitWrapper(SCMWrapper):
+@@ -996,7 +995,7 @@ class GitWrapper(SCMWrapper):
  
          # This is a big hammer, debatable if it should even be here...
          if options.force or options.reset:
@@ -95,7 +95,7 @@
              if options.upstream and upstream_branch:
                  target = upstream_branch
              self._Scrub(target, options)
-@@ -1003,7 +1002,6 @@ class GitWrapper(SCMWrapper):
+@@ -1011,7 +1010,6 @@ class GitWrapper(SCMWrapper):
              # to the checkout step.
              if not (options.force or options.reset):
                  self._CheckClean(revision)
@@ -103,7 +103,7 @@
  
              if not current_revision:
                  current_revision = self._Capture(
-@@ -1691,8 +1689,7 @@ class GitWrapper(SCMWrapper):
+@@ -1702,8 +1700,7 @@ class GitWrapper(SCMWrapper):
              fetch_cmd.append('--no-tags')
          elif quiet:
              fetch_cmd.append('--quiet')