merge: update to ungoogled-chromium 141.0.7390.54

utils/depot_tools.patch

@@ -6,6 +6,7 @@
 #   replace 'src' in checkout paths with the output directory
 #   add flag to specify an allowed sysroot
 #   ensure shallow fetches
+#   allow using newer httplib2 with pysocks
 #   utilize a newer version of gsutil to support later versions of python
 --- a/gclient.bat
 +++ b/gclient.bat
@@ -57,7 +58,7 @@
                      gcs_deps.append(
                          GcsDependency(parent=self,
                                        name=name,
-@@ -931,6 +939,8 @@ class Dependency(gclient_utils.WorkItem,
+@@ -930,6 +938,8 @@ class Dependency(gclient_utils.WorkItem,
  
          self._gn_args_from = local_scope.get('gclient_gn_args_from')
          self._gn_args_file = local_scope.get('gclient_gn_args_file')
@@ -66,7 +67,7 @@
          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*
-@@ -3983,6 +3993,7 @@ def CMDsync(parser, args):
+@@ -3987,6 +3997,7 @@ def CMDsync(parser, args):
                        default=[],
                        help='Specify to skip processing of a certain type of '
                        'dep.')
@@ -113,9 +114,23 @@
          self._Run(fetch_cmd, options, show_header=options.verbose, retry=True)
  
      def _SetFetchConfig(self, options):
+--- a/gerrit_util.py
++++ b/gerrit_util.py
+@@ -35,7 +35,10 @@ from typing import NamedTuple, List, Opt
+ from typing import Tuple, TypedDict, cast
+ 
+ import httplib2
+-import httplib2.socks
++try:
++    import httplib2.socks
++except ModuleNotFoundError:
++    import socks
+ 
+ import auth
+ import gclient_utils
 --- a/gsutil.py
 +++ b/gsutil.py
-@@ -25,7 +25,7 @@ DEFAULT_BIN_DIR = os.path.join(THIS_DIR,
+@@ -26,7 +26,7 @@ DEFAULT_BIN_DIR = os.path.join(THIS_DIR,
  
  IS_WINDOWS = os.name == 'nt'