From 87d1d2a7f3764e0c9d822bf4069d658f128417d4 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Mon, 3 Jun 2024 10:46:03 -0400 Subject: [PATCH] Fix deletion of third_party/test_fonts contents See https://crbug.com/343199633 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patch.cfg | 5 +++++ patch/patches/DEPS.patch | 26 ++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 patch/patches/DEPS.patch diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 2f24407e8..ef807a363 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -8,5 +8,5 @@ { 'chromium_checkout': 'refs/tags/126.0.6478.26', - 'depot_tools_checkout': '7d95eb2eb0' + 'depot_tools_checkout': 'f318db0055' } diff --git a/patch/patch.cfg b/patch/patch.cfg index 8b55bba1b..cf2d15a3f 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -814,5 +814,10 @@ patches = [ # RequestContextTest.PopupNavDestroyParentAfterCreationRCGlobal. # https://issues.chromium.org/issues/323753235#comment11 'name': 'content_initiator_policy_323753235' + }, + { + # Move test_fonts into their own directory. + # https://issues.chromium.org/issues/343199633 + 'name': 'DEPS' } ] diff --git a/patch/patches/DEPS.patch b/patch/patches/DEPS.patch new file mode 100644 index 000000000..cd2a1fa40 --- /dev/null +++ b/patch/patches/DEPS.patch @@ -0,0 +1,26 @@ +diff --git DEPS DEPS +index 5183762f9cedc..c691198319e88 100644 +--- DEPS ++++ DEPS +@@ -2102,16 +2102,16 @@ deps = { + 'dep_type': 'cipd', + }, + +- 'src/third_party/test_fonts': { ++ 'src/third_party/test_fonts/test_fonts': { + 'dep_type': 'gcs', + 'condition': 'non_git_source', + 'bucket': 'chromium-fonts', + 'objects': [ + { +- 'object_name': '336e775eec536b2d785cc80eff6ac39051931286', +- 'sha256sum': 'a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8', +- 'size_bytes': 32624734, +- 'generation': 1647440500943755, ++ 'object_name': 'f26f29c9d3bfae588207bbc9762de8d142e58935c62a86f67332819b15203b35', ++ 'sha256sum': 'f26f29c9d3bfae588207bbc9762de8d142e58935c62a86f67332819b15203b35', ++ 'size_bytes': 32750602, ++ 'generation': 1717109450425063, + }, + ], + },