From c1d72cb9dd0187281a387ebccf4237c610aac4e7 Mon Sep 17 00:00:00 2001 From: Max Ihlenfeldt Date: Mon, 30 Sep 2024 10:56:18 +0000 Subject: [PATCH] chromium: Update to 129.0.6668.70 Fixes #837. Release notes: https://chromereleases.googleblog.com/2024/09/stable-channel-update-for-desktop_17.html https://chromereleases.googleblog.com/2024/09/stable-channel-update-for-desktop_24.html Build and patch changes: ------------------------ Drop one backported patch that is included upstream now. Rebase remaining patches. License changes: ---------------- Added licenses: * third_party/android_deps/libs/com_google_android_gms_play_services_identity_credentials/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5766672 * third_party/fast_float/src/LICENSE-MIT - https://chromium-review.googlesource.com/c/chromium/src/+/5743598 Removed licenses: * ios/components/third_party/compiler-rt/LICENSE.TXT - https://chromium-review.googlesource.com/c/chromium/src/+/5767039 * third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7/LICENSE, third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5786197 * third_party/catapult/third_party/html5lib-python/LICENSE - https://chromium-review.googlesource.com/c/catapult/+/5768072 * third_party/libudev/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5738848 * third_party/sudden_motion_sensor/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5734364 Updated licenses: * third_party/android_deps/libs/com_google_android_gms_play_services_base/LICENSE, third_party/android_deps/libs/com_google_android_gms_play_services_basement/LICENSE, third_party/android_deps/libs/com_google_android_gms_play_services_tasks/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/5766672 Test-built (big thanks to @SoumyaWind): --------------------------------------- * chromium-ozone-wayland: - master, clang, MACHINE=qemux86-64 - scarthgap, clang, MACHINE=qemuarm64, qemux86-64 * chromium-x11: - master, clang, MACHINE=qemuarm, qemuarm64, qemux86-64, raspberrypi4-64 - scarthgap, clang, MACHINE=qemuarm, qemuarm64, qemux86-64, raspberrypi4-64 Signed-off-by: Max Ihlenfeldt --- .../recipes-browser/chromium/chromium-gn.inc | 4 +-- ...> chromium-ozone-wayland_129.0.6668.70.bb} | 0 ...3.137.bb => chromium-x11_129.0.6668.70.bb} | 0 .../recipes-browser/chromium/chromium.inc | 16 +++++------ ...ompiler-settings-conflicting-with-OE.patch | 14 +++++----- .../chromium/files/0002-v8-qemu-wrapper.patch | 12 ++++----- ...options-not-available-in-release-ver.patch | 4 +-- ...ink-latomic-failure-on-CentOS-8-host.patch | 4 +-- ...0006-Don-t-pass-unknown-LLVM-options.patch | 4 +-- ...rrect-path-to-libclang_rt.builtins.a.patch | 2 +- ...sable-crabbyavif-to-fix-build-errors.patch | 4 +-- ...browser-ui-views-side_panel-fix-miss.patch | 27 ------------------- ...6613.137.bb => gn-native_129.0.6668.70.bb} | 0 13 files changed, 29 insertions(+), 62 deletions(-) rename meta-chromium/recipes-browser/chromium/{chromium-ozone-wayland_128.0.6613.137.bb => chromium-ozone-wayland_129.0.6668.70.bb} (100%) rename meta-chromium/recipes-browser/chromium/{chromium-x11_128.0.6613.137.bb => chromium-x11_129.0.6668.70.bb} (100%) delete mode 100644 meta-chromium/recipes-browser/chromium/files/backport/Backport-chrome-browser-ui-views-side_panel-fix-miss.patch rename meta-chromium/recipes-browser/chromium/{gn-native_128.0.6613.137.bb => gn-native_129.0.6668.70.bb} (100%) diff --git a/meta-chromium/recipes-browser/chromium/chromium-gn.inc b/meta-chromium/recipes-browser/chromium/chromium-gn.inc index 9ef517ec1..d90a5ee2a 100644 --- a/meta-chromium/recipes-browser/chromium/chromium-gn.inc +++ b/meta-chromium/recipes-browser/chromium/chromium-gn.inc @@ -11,9 +11,7 @@ OUTPUT_DIR = "out/Release" B = "${S}/${OUTPUT_DIR}" # Backported patches. -SRC_URI += "\ - file://backport/Backport-chrome-browser-ui-views-side_panel-fix-miss.patch \ -" +# None currently \o/ # Non-specific patches. SRC_URI += "\ diff --git a/meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_128.0.6613.137.bb b/meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_129.0.6668.70.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_128.0.6613.137.bb rename to meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_129.0.6668.70.bb diff --git a/meta-chromium/recipes-browser/chromium/chromium-x11_128.0.6613.137.bb b/meta-chromium/recipes-browser/chromium/chromium-x11_129.0.6668.70.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/chromium-x11_128.0.6613.137.bb rename to meta-chromium/recipes-browser/chromium/chromium-x11_129.0.6668.70.bb diff --git a/meta-chromium/recipes-browser/chromium/chromium.inc b/meta-chromium/recipes-browser/chromium/chromium.inc index 8504958ea..287dfccba 100644 --- a/meta-chromium/recipes-browser/chromium/chromium.inc +++ b/meta-chromium/recipes-browser/chromium/chromium.inc @@ -4,7 +4,7 @@ HOMEPAGE = "https://www.chromium.org/Home" CVE_PRODUCT = "chromium:chromium google:chrome" SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz" -SRC_URI[sha256sum] = "e1d39c170dfdc2627a7b003e11d77f04a578b8e1cfe41e714cdaa345c91f4943" +SRC_URI[sha256sum] = "094ddec3774b54feb04dcfb020e61766de16feabb04850d73ef82e38c4bbf2b5" S = "${WORKDIR}/chromium-${PV}" @@ -76,7 +76,6 @@ LIC_FILES_CHKSUM = "\ file://${S}/chrome/third_party/mozilla_security_manager/LICENSE;md5=0c259b853bbf067b361100ce560adce7 \ file://${S}/courgette/third_party/bsdiff/LICENCE;md5=7c2ad392281bc3d9b04a31102ee7abdd \ file://${S}/courgette/third_party/divsufsort/LICENSE;md5=e261f081e52882dad3ff0225497ce451 \ - file://${S}/ios/components/third_party/compiler-rt/LICENSE.TXT;md5=67ce57844c93575886f0099fa1bf95cd \ file://${S}/ios/third_party/blink/LICENSE;md5=9fdb47308c4e0a2b6d07c5af39e5da1a \ file://${S}/ios/third_party/lottie/LICENSE;md5=1e714768add1e7fdb1288bac703bad06 \ file://${S}/ios/third_party/material_components_ios/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -126,20 +125,21 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_auth/LICENSE;md5=b8c82a390fc5a5bba473726868fc5e5d \ file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_auth_api_phone/LICENSE;md5=5c9317538bd492b4fd01eec9d6972640 \ file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_auth_base/LICENSE;md5=b8c82a390fc5a5bba473726868fc5e5d \ - file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_base/LICENSE;md5=329ee645e53d3c85d35792e5ad18ebe6 \ - file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_basement/LICENSE;md5=329ee645e53d3c85d35792e5ad18ebe6 \ + file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_base/LICENSE;md5=e5a8d882f7945961271786002e6a581d \ + file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_basement/LICENSE;md5=e5a8d882f7945961271786002e6a581d \ file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_cast/LICENSE;md5=1e61529f08860f8fa1c90bf8af8007ff \ file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_cast_framework/LICENSE;md5=6688c3d596b2e35dd1928d1ffdf5a9e2 \ file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_clearcut/LICENSE;md5=32c019d8c1f8222a8aad9c3e1f1d2d10 \ file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_cloud_messaging/LICENSE;md5=fb1c3d71ca3681654ec1604b10fc1ace \ file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_flags/LICENSE;md5=92b728c587a67a1b9577e9ca141ca520 \ file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_gcm/LICENSE;md5=92b728c587a67a1b9577e9ca141ca520 \ + file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_identity_credentials/LICENSE;md5=fff98c651a1ae8a04462a12f8ea1f7a4 \ file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_iid/LICENSE;md5=05fc50851d6d550ef2bb400b326353f0 \ file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_instantapps/LICENSE;md5=cd033bdb088af16ecdbcd95bd5562a30 \ file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_location/LICENSE;md5=6a7afdc2d1780ac0a9bd21bd59640cdf \ file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_phenotype/LICENSE;md5=32c019d8c1f8222a8aad9c3e1f1d2d10 \ file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_stats/LICENSE;md5=92b728c587a67a1b9577e9ca141ca520 \ - file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_tasks/LICENSE;md5=329ee645e53d3c85d35792e5ad18ebe6 \ + file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_tasks/LICENSE;md5=e5a8d882f7945961271786002e6a581d \ file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_vision/LICENSE;md5=d332b0f8bf5e67cef70541572ba69b61 \ file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common/LICENSE;md5=d332b0f8bf5e67cef70541572ba69b61 \ file://${S}/third_party/android_deps/libs/com_google_android_material_material/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \ @@ -179,8 +179,6 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/LICENSE;md5=a5dd953e661e22a77f7b8062ae790f6a \ file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_android_extensions_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_parcelize_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_atomicfu_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -230,7 +228,6 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/catapult/third_party/flot/LICENSE.txt;md5=5bc600a435aadbd7dcde045ccb3208bf \ file://${S}/third_party/catapult/third_party/google-auth/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ file://${S}/third_party/catapult/third_party/gsutil/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/catapult/third_party/html5lib-python/LICENSE;md5=1ba5ada9e6fead1fdc32f43c9f10ba7c \ file://${S}/third_party/catapult/third_party/httplib2/LICENSE;md5=56e5e931172b6164b62dc7c4aba6c8cf \ file://${S}/third_party/catapult/third_party/ijson/LICENSE.txt;md5=2809bd5857eee6be054555222fd89712 \ file://${S}/third_party/catapult/third_party/oauth2client/LICENSE;md5=88f599f710b9d48dad0929ebd090fc1a \ @@ -300,6 +297,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/emoji-segmenter/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/expat/src/expat/COPYING;md5=7b3b078238d0901d3b339289117cb7fb \ file://${S}/third_party/farmhash/LICENSE;md5=7dfaa79e2b070897e495fec386e3acfc \ + file://${S}/third_party/fast_float/src/LICENSE-MIT;md5=32b11d50c7d9788d4270f6a83f3e68eb \ file://${S}/third_party/fdlibm/LICENSE;md5=b17367d6c97e638599071d99a3049dfe \ file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=a0156e1de86eb34eb5d75486b539aa58 \ file://${S}/third_party/fft2d/LICENSE;md5=a062f975da2ca26745be122d5a0b1356 \ @@ -356,7 +354,6 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/libsecret/LICENSE;md5=23c2a5e0106b99d75238986559bb5fc6 \ file://${S}/third_party/libsrtp/LICENSE;md5=2909fcf6f09ffff8430463d91c08c4e1 \ file://${S}/third_party/libsync/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/libudev/LICENSE;md5=4fbd65380cdd255951079008b364516c \ file://${S}/third_party/libunwind/src/LICENSE.TXT;md5=f66970035d12f196030658b11725e1a1 \ file://${S}/third_party/liburlpattern/LICENSE;md5=5be7cac9f8920c488c4dda56dbfeaec2 \ file://${S}/third_party/libusb/src/COPYING;md5=fbc093901857fcd118f065f900982c24 \ @@ -427,7 +424,6 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/spirv-tools/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/sqlite/LICENSE;md5=7256769d4613c0af5a72be32ba20ccf7 \ file://${S}/third_party/subresource-filter-ruleset/LICENSE;md5=408c32b7944dedb9d57797eca2447ea1 \ - file://${S}/third_party/sudden_motion_sensor/LICENSE;md5=6f89397ba4dda73a940f27f76e9ad9d4 \ file://${S}/third_party/swiftshader/LICENSE.txt;md5=d273d63619c9aeaf15cdaf76422c4f87 \ file://${S}/third_party/swiftshader/third_party/SPIRV-Headers/LICENSE;md5=d14ee3b13f42e9c9674acc5925c3d741 \ file://${S}/third_party/swiftshader/third_party/SPIRV-Tools/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ diff --git a/meta-chromium/recipes-browser/chromium/files/0001-Drop-GN-compiler-settings-conflicting-with-OE.patch b/meta-chromium/recipes-browser/chromium/files/0001-Drop-GN-compiler-settings-conflicting-with-OE.patch index 9ffcf0d4c..1b2fa53c3 100644 --- a/meta-chromium/recipes-browser/chromium/files/0001-Drop-GN-compiler-settings-conflicting-with-OE.patch +++ b/meta-chromium/recipes-browser/chromium/files/0001-Drop-GN-compiler-settings-conflicting-with-OE.patch @@ -19,10 +19,10 @@ Signed-off-by: Max Ihlenfeldt 1 file changed, 48 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 5898b8c..340960f 100644 +index 45086d6..dfbb2ab 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1196,27 +1196,6 @@ config("compiler_cpu_abi") { +@@ -1211,27 +1211,6 @@ config("compiler_cpu_abi") { "-msse3", ] } @@ -50,7 +50,7 @@ index 5898b8c..340960f 100644 } else if (current_cpu == "mipsel" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { -@@ -1224,9 +1203,6 @@ config("compiler_cpu_abi") { +@@ -1239,9 +1218,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mipsel-linux-android" ] ldflags += [ "--target=mipsel-linux-android" ] @@ -60,7 +60,7 @@ index 5898b8c..340960f 100644 } } else { cflags += [ "-EL" ] -@@ -1306,8 +1282,6 @@ config("compiler_cpu_abi") { +@@ -1321,8 +1297,6 @@ config("compiler_cpu_abi") { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { if (is_clang) { @@ -69,7 +69,7 @@ index 5898b8c..340960f 100644 } else { cflags += [ "-EB" ] ldflags += [ "-EB" ] -@@ -1355,9 +1329,6 @@ config("compiler_cpu_abi") { +@@ -1370,9 +1344,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mips64el-linux-android" ] ldflags += [ "--target=mips64el-linux-android" ] @@ -79,7 +79,7 @@ index 5898b8c..340960f 100644 } } else { cflags += [ -@@ -1415,8 +1386,6 @@ config("compiler_cpu_abi") { +@@ -1430,8 +1401,6 @@ config("compiler_cpu_abi") { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { if (is_clang) { @@ -88,7 +88,7 @@ index 5898b8c..340960f 100644 } else { cflags += [ "-EB", -@@ -1585,23 +1554,6 @@ config("compiler_deterministic") { +@@ -1600,23 +1569,6 @@ config("compiler_deterministic") { } } } diff --git a/meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch b/meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch index 2eedc89f4..9ed28746a 100644 --- a/meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch +++ b/meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch @@ -17,7 +17,7 @@ Signed-off-by: Maksim Sisov 2 files changed, 5 insertions(+) diff --git a/tools/v8_context_snapshot/BUILD.gn b/tools/v8_context_snapshot/BUILD.gn -index 80d4b3d..5666cdf 100644 +index f46bec2..5438365 100644 --- a/tools/v8_context_snapshot/BUILD.gn +++ b/tools/v8_context_snapshot/BUILD.gn @@ -45,6 +45,7 @@ if (use_v8_context_snapshot) { @@ -29,10 +29,10 @@ index 80d4b3d..5666cdf 100644 "root_out_dir") + "/v8_context_snapshot_generator", diff --git a/v8/BUILD.gn b/v8/BUILD.gn -index 92e8541..6343c8e 100644 +index 19e0d2b..85d40c8 100644 --- a/v8/BUILD.gn +++ b/v8/BUILD.gn -@@ -2223,6 +2223,7 @@ template("run_torque") { +@@ -2256,6 +2256,7 @@ template("run_torque") { } args = [ @@ -40,7 +40,7 @@ index 92e8541..6343c8e 100644 "./" + rebase_path( get_label_info(":torque($toolchain)", "root_out_dir") + "/torque", root_build_dir), -@@ -2386,6 +2387,7 @@ action("generate_bytecode_builtins_list") { +@@ -2419,6 +2420,7 @@ action("generate_bytecode_builtins_list") { outputs = [ "$target_gen_dir/builtins-generated/bytecodes-builtins-list.h" ] deps = [ ":bytecode_builtins_list_generator($v8_generator_toolchain)" ] args = [ @@ -48,7 +48,7 @@ index 92e8541..6343c8e 100644 "./" + rebase_path( get_label_info( ":bytecode_builtins_list_generator($v8_generator_toolchain)", -@@ -2431,6 +2433,7 @@ template("run_mksnapshot") { +@@ -2473,6 +2475,7 @@ template("run_mksnapshot") { } args = [ @@ -56,7 +56,7 @@ index 92e8541..6343c8e 100644 "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)", "root_out_dir") + "/mksnapshot", root_build_dir), -@@ -7370,6 +7373,7 @@ if (v8_enable_i18n_support) { +@@ -7452,6 +7455,7 @@ if (v8_enable_i18n_support) { outputs = [ output_file ] args = [ diff --git a/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch b/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch index 0dc641e22..23aaa3fcf 100644 --- a/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch +++ b/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch @@ -13,10 +13,10 @@ Signed-off-by: Randy MacLeod 1 file changed, 5 insertions(+) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 340960f..0efc6f8 100644 +index dfbb2ab..16f5b23 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1876,6 +1876,11 @@ config("default_warnings") { +@@ -1891,6 +1891,11 @@ config("default_warnings") { } cflags += [ diff --git a/meta-chromium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch b/meta-chromium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch index 6541fb504..3702b70ff 100644 --- a/meta-chromium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch +++ b/meta-chromium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch @@ -18,10 +18,10 @@ Signed-off-by: Randy MacLeod 2 files changed, 4 insertions(+) diff --git a/base/BUILD.gn b/base/BUILD.gn -index 59f1502..2cd90ee 100644 +index 2561c27..7eca069 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -1119,7 +1119,9 @@ component("base") { +@@ -1117,7 +1117,9 @@ component("base") { # Needed for if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. diff --git a/meta-chromium/recipes-browser/chromium/files/0006-Don-t-pass-unknown-LLVM-options.patch b/meta-chromium/recipes-browser/chromium/files/0006-Don-t-pass-unknown-LLVM-options.patch index 3048e2d2c..1569dab3b 100644 --- a/meta-chromium/recipes-browser/chromium/files/0006-Don-t-pass-unknown-LLVM-options.patch +++ b/meta-chromium/recipes-browser/chromium/files/0006-Don-t-pass-unknown-LLVM-options.patch @@ -17,10 +17,10 @@ Signed-off-by: Max Ihlenfeldt 1 file changed, 18 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 0efc6f8..5e13f0c 100644 +index 16f5b23..0dc5b57 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -579,24 +579,6 @@ config("compiler") { +@@ -581,24 +581,6 @@ config("compiler") { } } diff --git a/meta-chromium/recipes-browser/chromium/files/0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch b/meta-chromium/recipes-browser/chromium/files/0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch index 107d9b2b7..7fe1860c0 100644 --- a/meta-chromium/recipes-browser/chromium/files/0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch +++ b/meta-chromium/recipes-browser/chromium/files/0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch @@ -21,7 +21,7 @@ Signed-off-by: Max Ihlenfeldt 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn -index e6d80a8..69ccf2f 100644 +index fcca59b..496f3c3 100644 --- a/build/config/clang/BUILD.gn +++ b/build/config/clang/BUILD.gn @@ -190,14 +190,15 @@ template("clang_lib") { diff --git a/meta-chromium/recipes-browser/chromium/files/0011-Disable-crabbyavif-to-fix-build-errors.patch b/meta-chromium/recipes-browser/chromium/files/0011-Disable-crabbyavif-to-fix-build-errors.patch index 0ef7c6d21..f000c6f0d 100644 --- a/meta-chromium/recipes-browser/chromium/files/0011-Disable-crabbyavif-to-fix-build-errors.patch +++ b/meta-chromium/recipes-browser/chromium/files/0011-Disable-crabbyavif-to-fix-build-errors.patch @@ -47,7 +47,7 @@ index 687033e..4006422 100644 } diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc b/third_party/blink/renderer/platform/image-decoders/image_decoder.cc -index 198c107..a792151 100644 +index f208b65..4fb788f 100644 --- a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc +++ b/third_party/blink/renderer/platform/image-decoders/image_decoder.cc @@ -36,7 +36,6 @@ @@ -77,7 +77,7 @@ index 198c107..a792151 100644 return "image/avif"; } #endif -@@ -305,15 +301,9 @@ std::unique_ptr ImageDecoder::CreateByMimeType( +@@ -309,15 +305,9 @@ std::unique_ptr ImageDecoder::CreateByMimeType( max_decoded_bytes); #if BUILDFLAG(ENABLE_AV1_DECODER) } else if (mime_type == "image/avif") { diff --git a/meta-chromium/recipes-browser/chromium/files/backport/Backport-chrome-browser-ui-views-side_panel-fix-miss.patch b/meta-chromium/recipes-browser/chromium/files/backport/Backport-chrome-browser-ui-views-side_panel-fix-miss.patch deleted file mode 100644 index 7c42e3377..000000000 --- a/meta-chromium/recipes-browser/chromium/files/backport/Backport-chrome-browser-ui-views-side_panel-fix-miss.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0c7ad5925e2eaddb65032e1836ab5f29af932931 Mon Sep 17 00:00:00 2001 -From: Takuto Ikuta -Date: Fri, 26 Jul 2024 09:41:32 +0000 -Subject: [PATCH] Backport "chrome/browser/ui/views/side_panel: fix missing - deps" - -This fixes a build race condition due to a missing dependency. The patch -will be included in upstream's 129 release. - -Upstream-Status: Backport [https://crrev.com/c/5740584] -Signed-off-by: Max Ihlenfeldt ---- - chrome/browser/ui/views/side_panel/BUILD.gn | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/chrome/browser/ui/views/side_panel/BUILD.gn b/chrome/browser/ui/views/side_panel/BUILD.gn -index 9ceabe8..c1d4066 100644 ---- a/chrome/browser/ui/views/side_panel/BUILD.gn -+++ b/chrome/browser/ui/views/side_panel/BUILD.gn -@@ -114,6 +114,7 @@ source_set("side_panel") { - "//base", - "//chrome/browser:browser_public_dependencies", - "//chrome/browser/companion/core/mojom:mojo_bindings", -+ "//chrome/browser/companion/visual_query", - "//chrome/browser/profiles:profile", - "//chrome/browser/ui/actions:actions_headers", - "//chrome/browser/ui/color:color_headers", diff --git a/meta-chromium/recipes-browser/chromium/gn-native_128.0.6613.137.bb b/meta-chromium/recipes-browser/chromium/gn-native_129.0.6668.70.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/gn-native_128.0.6613.137.bb rename to meta-chromium/recipes-browser/chromium/gn-native_129.0.6668.70.bb