fix: update gclient_paths.patch for both x64 and arm64 v8 builds - #129
fix: update gclient_paths.patch for both x64 and arm64 v8 builds#129pplupo wants to merge 1 commit into
Conversation
Upstream depot_tools removed @functools.lru_cache from five functions in gclient_paths.py. The old patch no longer applied cleanly because the line numbers had shifted and the _GetGClientConfigInner hunk was missing. Patch regenerated against the current depot_tools HEAD, confirmed working by a community reporter on Euro-Office/DesktopEditors#66. Signed-off-by: Peter P. Lupo <pplupo@gmail.com>
chrip
left a comment
There was a problem hiding this comment.
Thanks for picking this up, and thanks @Duckle29 for tracking down the working patch.
The regenerated patch is correct — I verified it applies cleanly against depot_tools
HEAD. The reason CI is red is that #127 pinned depot_tools to 6e5a13d2 (2026-06-22) in
Common/3dParty/v8/nc-build.py, so the build checks out that revision and then tries to
apply a HEAD-era patch: "patch failed: gclient_paths.py:21". The patch and the pin have
to move together.
Rather than have you rework this, I'll fold your patch into a combined PR that also:
- bumps the pin to f394ab2c9 (2026-07-24) — I tested every depot_tools commit touching
gclient_paths.py, and your patch applies from 93974d014 (the ruff reformat) through
HEAD; I'd rather not pin HEAD itself since that's the UV migration; - pins depot_tools in tools/8.9/{x64,arm64}-linux-dynamic/nc-build.sh too — #127 only
covered nc-build.py, so those two stillgit pull origin mainand have been broken
since depot_tools f065bb3b0 as well. Good catch that both arch dirs need the patch.
You'll be credited with Co-authored-by, and @Duckle29 as well. I'll link it here and
close this one once it's up.
Separately on Euro-Office/DesktopEditors#66: that build failed because DesktopEditors
still pins the core submodule at fb7bb6a (2026-07-01), three commits before #127.
Core main is already fine there — Euro-Office/DesktopEditors#66 needs a submodule bump
in DesktopEditors, which I'll open as its own PR.
Upstream depot_tools removed @functools.lru_cache from five functions in gclient_paths.py. The old patch no longer applied cleanly because the line numbers had shifted and the _GetGClientConfigInner hunk was missing.
Patch regenerated against the current depot_tools HEAD, confirmed working by a community reporter on Euro-Office/DesktopEditors#66.