From c6b2e4d3d2125763b4e97c946be0a2ec2afa79e6 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 30 Jan 2024 17:27:37 -0500 Subject: [PATCH] Update to Chromium version 121.0.6167.86 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- patch/patch.cfg | 5 ----- patch/patches/mojo_generator_1422178.patch | 13 ------------- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 patch/patches/mojo_generator_1422178.patch diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index f427bb0bc..e64dfa135 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,6 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/121.0.6167.75', + 'chromium_checkout': 'refs/tags/121.0.6167.86', 'depot_tools_checkout': '6444de14d1' } diff --git a/patch/patch.cfg b/patch/patch.cfg index efa9f5e3d..c19c3329d 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -715,11 +715,6 @@ patches = [ # https://chromium-review.googlesource.com/c/chromium/src/+/5120035 'name': 'base_allocator_5120035' }, - { - # Fix mojom_ts_generator.py error with Python 3.11. - # https://bugs.chromium.org/p/chromium/issues/detail?id=1422178 - 'name': 'mojo_generator_1422178' - }, { # chrome: mac: Support locale configuration. # https://github.com/chromiumembedded/cef/issues/3623 diff --git a/patch/patches/mojo_generator_1422178.patch b/patch/patches/mojo_generator_1422178.patch deleted file mode 100644 index a00f5cd2c..000000000 --- a/patch/patches/mojo_generator_1422178.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git mojo/public/tools/bindings/generators/mojom_ts_generator.py mojo/public/tools/bindings/generators/mojom_ts_generator.py -index 98516f03276e4..a1bda9c021c52 100644 ---- mojo/public/tools/bindings/generators/mojom_ts_generator.py -+++ mojo/public/tools/bindings/generators/mojom_ts_generator.py -@@ -177,6 +177,8 @@ def _GetWebUiModulePath(module): - path = module.metadata.get('webui_module_path') - if path is None or path == '/': - return path -+ if path == '': -+ return '/' - if _IsAbsoluteChromeResourcesPath(path): - return path.rstrip('/') + '/' - return '/{}/'.format(path.strip('/'))