awesome-bookmarks/helium
3
0
Fork 0
mirror of https://github.com/imputnet/helium.git synced 2026-08-20 00:57:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge: update to chromium 150.0.7871.186 (#2191)

Browse Source
This commit is contained in:
jj
2026-07-24 14:49:45 +02:00
committed by GitHub
parent dee5600297 1d1425f9d7
commit 335b9afa20
3 changed files with 53 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chromium_version.txt
+1 -1
View File
@@ -1 +1 @@
150.0.7871.181
150.0.7871.186
utils/clone.py
+13 -3
View File
@@ -86,7 +86,14 @@ def clone(args): # pylint: disable=too-many-branches, too-many-locals, too-many-
# Set up staging directory
ucstaging.mkdir(exist_ok=True)
get_logger().info('Cloning latest depot_tools')
get_logger().info('Cloning depot_tools')
dt_commit = re.search(r"depot_tools\.git'\s*\+\s*'@'\s*\+\s*'([^']+)',",
Path(args.output / 'DEPS').read_text(encoding=ENCODING)).group(1)
if args.dt_commit:
dt_commit = args.dt_commit
if not dt_commit:
get_logger().error('Unable to obtain commit for depot_tools checkout')
sys.exit(1)
if not dtpath.exists():
dtpath.mkdir()
run(['git', 'init', '-q'], cwd=dtpath, check=True)
@@ -96,8 +103,8 @@ def clone(args): # pylint: disable=too-many-branches, too-many-locals, too-many-
],
cwd=dtpath,
check=True)
run(['git', 'fetch', '--depth=1', 'origin', 'HEAD'], cwd=dtpath, check=True)
run(['git', 'reset', '--hard', 'FETCH_HEAD'], cwd=dtpath, check=True)
run(['git', 'fetch', '--depth=1', 'origin', dt_commit], cwd=dtpath, check=True)
run(['git', 'reset', '--hard', dt_commit], cwd=dtpath, check=True)
run(['git', 'clean', '-ffdx'], cwd=dtpath, check=True)
if iswin:
(dtpath / 'git.bat').write_text('git')
@@ -269,6 +276,9 @@ def main():
'--sysroot',
choices=('amd64', 'arm64', 'armhf', 'i386', 'mips64el', 'mipsel'),
help='Download a linux sysroot for the given architecture')
parser.add_argument('--dt-commit',
help=('Specify a commit for the depot_tools checkout. '
'Defaults to using the commit specified in the DEPS file.'))
add_common_params(parser)
args = parser.parse_args()
clone(args)
utils/depot_tools.patch
+39 -41
View File
@@ -19,36 +19,36 @@
+call python3 "%~dp0gclient.py" %*
--- a/gclient.py
+++ b/gclient.py
@@ -130,8 +130,8 @@ DEPOT_TOOLS_DIR = os.path.dirname(os.pat
@@ -128,8 +128,8 @@ DEPOT_TOOLS_DIR = os.path.dirname(os.pat
# one, e.g. if a spec explicitly says `cache_dir = None`.)
UNSET_CACHE_DIR = object()
-PREVIOUS_CUSTOM_VARS_FILE = ".gclient_previous_custom_vars"
-PREVIOUS_SYNC_COMMITS_FILE = ".gclient_previous_sync_commits"
-PREVIOUS_CUSTOM_VARS_FILE = '.gclient_previous_custom_vars'
-PREVIOUS_SYNC_COMMITS_FILE = '.gclient_previous_sync_commits'
+PREVIOUS_CUSTOM_VARS_FILE = r'UC_STAGING'+os.sep+'.gclient_previous_custom_vars'
+PREVIOUS_SYNC_COMMITS_FILE = r'UC_STAGING'+os.sep+'.gclient_previous_sync_commits'
PREVIOUS_SYNC_COMMITS = "GCLIENT_PREVIOUS_SYNC_COMMITS"
PREVIOUS_SYNC_COMMITS = 'GCLIENT_PREVIOUS_SYNC_COMMITS'
@@ -452,6 +452,7 @@ class Dependency(gclient_utils.WorkItem,
git_dependencies_state=gclient_eval.DEPS,
print_outbuf=False,
):
@@ -426,6 +426,7 @@ class Dependency(gclient_utils.WorkItem,
protocol='https',
git_dependencies_state=gclient_eval.DEPS,
print_outbuf=False):
+ if name and name[0:3] == "src": name = r"UC_OUT"+name[3:]
gclient_utils.WorkItem.__init__(self, name)
DependencySettings.__init__(
self,
@@ -856,6 +857,7 @@ class Dependency(gclient_utils.WorkItem,
DependencySettings.__init__(self, parent, url, managed, custom_deps,
custom_vars, custom_hooks, deps_file,
@@ -771,6 +772,7 @@ class Dependency(gclient_utils.WorkItem,
condition = dep_value.get("condition")
dep_type = dep_value.get("dep_type")
condition = dep_value.get('condition')
dep_type = dep_value.get('dep_type')
+ if dep_type == 'cipd': continue
if not self._get_option("process_all_deps", False):
if not self._get_option('process_all_deps', False):
should_process = should_process and _should_process(condition)
@@ -915,6 +917,12 @@ class Dependency(gclient_utils.WorkItem,
merged_condition
)
@@ -822,6 +824,12 @@ class Dependency(gclient_utils.WorkItem,
should_process_object = should_process and _should_process(
merged_condition)
+ if name != "src/third_party/node/node_modules" and \
+ (not name.startswith("src/build/linux/") or \
@@ -57,62 +57,60 @@
+ should_process_object = True
+ merged_condition = 'True'
gcs_deps.append(
GcsDependency(
parent=self,
@@ -1046,6 +1054,8 @@ class Dependency(gclient_utils.WorkItem,
GcsDependency(parent=self,
name=name,
@@ -932,6 +940,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")
self._gn_args_from = local_scope.get('gclient_gn_args_from')
self._gn_args_file = local_scope.get('gclient_gn_args_file')
+ if self._gn_args_file and self._gn_args_file[0:3] == "src":
+ self._gn_args_file = r"UC_OUT"+self._gn_args_file[3:]
self._gn_args = local_scope.get("gclient_gn_args", [])
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*
@@ -4572,6 +4582,7 @@ def CMDsync(parser, args):
default=[],
help="Specify to skip processing of a certain type of dep.",
)
@@ -4028,6 +4038,7 @@ def CMDsync(parser, args):
default=[],
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
@@ -1161,9 +1161,7 @@ class GitWrapper(SCMWrapper):
@@ -995,8 +995,7 @@ class GitWrapper(SCMWrapper):
self._SetFetchConfig(options)
# Fetch upstream if we don't already have |revision|.
- if not scm.GIT.IsValidRevision(
- self.checkout_path, revision, sha_only=True
- ):
- self.checkout_path, revision, sha_only=True):
+ if False:
self._Fetch(options, prune=options.force)
if not scm.GIT.IsValidRevision(
@@ -1180,7 +1178,7 @@ class GitWrapper(SCMWrapper):
@@ -1012,7 +1011,7 @@ class GitWrapper(SCMWrapper):
# This is a big hammer, debatable if it should even be here...
if options.force or options.reset:
- target = "HEAD"
- target = 'HEAD'
+ target = 'FETCH_HEAD'
if options.upstream and upstream_branch:
target = upstream_branch
self._Scrub(target, options)
@@ -1195,8 +1193,6 @@ class GitWrapper(SCMWrapper):
@@ -1027,7 +1026,6 @@ class GitWrapper(SCMWrapper):
# to the checkout step.
if not (options.force or options.reset):
self._CheckClean(revision)
- self._CheckDetachedHead(revision, options)
-
if not current_revision:
current_revision = self._Capture(
["rev-list", "-n", "1", "HEAD"]
@@ -2004,8 +2000,7 @@ class GitWrapper(SCMWrapper):
fetch_cmd.append("--no-tags")
@@ -1724,8 +1722,7 @@ class GitWrapper(SCMWrapper):
fetch_cmd.append('--no-tags')
elif quiet:
fetch_cmd.append("--quiet")
fetch_cmd.append('--quiet')
- if depth:
- fetch_cmd.append("--depth=" + str(depth))
- fetch_cmd.append('--depth=' + str(depth))
+ fetch_cmd.append('--depth=1')
self._Run(fetch_cmd, options, show_header=options.verbose, retry=True)
@@ -135,9 +133,9 @@
+++ b/gsutil.py
@@ -26,7 +26,7 @@ DEFAULT_BIN_DIR = os.path.join(THIS_DIR,
IS_WINDOWS = os.name == "nt"
IS_WINDOWS = os.name == 'nt'
-VERSION = "5.35"
-VERSION = '5.35'
+VERSION = 'GSUVER'
# Google OAuth Context required by gsutil.