Skip to content

Commit bfcbddc

Browse files
committed
chromium: 145.0.7632.159
Release Notes: https://chromereleases.googleblog.com/2026/03/stable-channel-update-for-desktop.html Build and patch changes: ------------------------ Removed patches: None Modified patches: * 0001-Drop-GN-compiler-settings-conflicting-with-OE.patch * 0001-Fix-building-gpu_host_impl.cc-on-Linux.patch * 0003-wrapper-extra-flags.patch * 0009-Adjust-the-Rust-build-to-our-needs.patch * 0013-Reduce-minimum-browser-window-width-to-480px.patch New patches: * chromium-145-zip_ffi_glue-use-edition2024.patch zip_ffi_glue needs Rust 2024 Edition due to the let chains used in Chromium 145 License changes: ---------------- Added licenses: * third_party/android_deps/autorolled/committed/libs/org_jetbrains_kotlinx_atomicfu_jvm/LICENSE * third_party/litert/LICENSE * third_party/nlohmann_json/LICENSE Removed licenses: * third_party/android_deps/libs/org_jetbrains_kotlinx_atomicfu_jvm/LICENSE * third_party/webrtc/rtc_base/third_party/sigslot/LICENSE Updated licenses: * third_party/ffmpeg/CREDITS.chromium * third_party/screen-ai/THIRD_PARTY_LICENSES Test-built: ----------- * chromium-ozone-wayland * MACHINE=intel-corei7-64, qemuarm64, raspberrypi3 * chromium-x11 * MACHINE=intel-corei7-64, qemuarm64, raspberrypi3 Test dependencies: ------------------ * URI: git://git.openembedded.org/openembedded-core - branch: master - revision: 531f87111d83430615f2e20dd41a3dd5fc25c7ab * URI: git://git.openembedded.org/meta-openembedded - layers: meta-oe - branch: master - revision: 6b55bede28261c38fb1da1474ca5c991ac414c93 * URI: git://git.yoctoproject.org/meta-intel - branch: master - revision: a885c3a6fe5475de198899f4c40435b254fcbccc * URI: https://github.com/agherzan/meta-raspberrypi - branch: master - revision: 9720dc611cf38ff2990bdf0f6afa106645ca1f93 Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
1 parent 7505239 commit bfcbddc

10 files changed

Lines changed: 101 additions & 43 deletions

meta-chromium/recipes-browser/chromium/chromium-gn.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ SRC_URI += "\
3434
${@ '' if rust_is_newer_than_190(d) else 'file://chromium-142-crabbyavif-rust18x.patch'} \
3535
file://fix-SYS_SECCOMP-redefinition.patch \
3636
file://use-adler2.patch \
37+
file://chromium-145-zip_ffi_glue-use-edition2024.patch \
3738
"
3839

3940
# ARM/AArch64-specific patches.

meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_144.0.7559.132.bb renamed to meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_145.0.7632.159.bb

File renamed without changes.

meta-chromium/recipes-browser/chromium/chromium-x11_144.0.7559.132.bb renamed to meta-chromium/recipes-browser/chromium/chromium-x11_145.0.7632.159.bb

File renamed without changes.

meta-chromium/recipes-browser/chromium/chromium.inc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ HOMEPAGE = "https://www.chromium.org/Home"
44
CVE_PRODUCT = "chromium:chromium google:chrome"
55

66
SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz"
7-
SRC_URI[sha256sum] = "424d6c3118f757ab6748ab32a610e0cc026a738004646b07f842615f89252c3f"
7+
SRC_URI[sha256sum] = "67cea4991881f3532cdd1d3a4207427d398ee32fa8dca5db5a03fab08a9b09da"
88
S = "${UNPACKDIR}/chromium-${PV}"
99

1010
# GCC is not tested or officially supported upstream, and supporting it here
@@ -162,6 +162,7 @@ LIC_FILES_CHKSUM = "\
162162
file://${S}/third_party/android_deps/autorolled/committed/libs/org_checkerframework_checker_qual/LICENSE;md5=41d84637c348061d361a75c8fd685c14 \
163163
file://${S}/third_party/android_deps/autorolled/committed/libs/org_checkerframework_checker_util/LICENSE;md5=87abbc18e66acb445c00810347051776 \
164164
file://${S}/third_party/android_deps/autorolled/committed/libs/org_codehaus_mojo_animal_sniffer_annotations/LICENSE;md5=a5dd953e661e22a77f7b8062ae790f6a \
165+
file://${S}/third_party/android_deps/autorolled/committed/libs/org_jetbrains_kotlinx_atomicfu_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
165166
file://${S}/third_party/android_deps/autorolled/committed/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
166167
file://${S}/third_party/android_deps/autorolled/committed/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
167168
file://${S}/third_party/android_deps/autorolled/committed/libs/org_jetbrains_kotlinx_kotlinx_coroutines_play_services/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -171,7 +172,6 @@ LIC_FILES_CHKSUM = "\
171172
file://${S}/third_party/android_deps/autorolled/committed/libs/org_reactivestreams_reactive_streams/LICENSE;md5=e58c24d18490515b4c3001f330261afc \
172173
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_android_extensions_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
173174
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_parcelize_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
174-
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_atomicfu_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
175175
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
176176
file://${S}/third_party/android_media/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
177177
file://${S}/third_party/android_opengl/LICENSE;md5=d10e92761a860d4113a7a525c78daf13 \
@@ -453,7 +453,7 @@ LIC_FILES_CHKSUM = "\
453453
file://${S}/third_party/fast_float/src/LICENSE-MIT;md5=32b11d50c7d9788d4270f6a83f3e68eb \
454454
file://${S}/third_party/fdlibm/LICENSE;md5=b17367d6c97e638599071d99a3049dfe \
455455
file://${S}/third_party/federated_compute/src/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
456-
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=331b973a7612318cb2a0e01629ca7e52 \
456+
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=b7cbca23ed0604649b2111e6e9d21ea6 \
457457
file://${S}/third_party/fft2d/LICENSE;md5=a062f975da2ca26745be122d5a0b1356 \
458458
file://${S}/third_party/flac/COPYING.Xiph;md5=3d6da238b5b57a0965d6730291119f65 \
459459
file://${S}/third_party/flatbuffers/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
@@ -522,6 +522,7 @@ LIC_FILES_CHKSUM = "\
522522
file://${S}/third_party/libyuv/LICENSE;md5=464282cfb405b005b9637f11103a7325 \
523523
file://${S}/third_party/libzip/LICENSE;md5=6bb2408fd544544b86946e67ec2da9a0 \
524524
file://${S}/third_party/lit/LICENSE;md5=4b390b7b932ca7872d1de2c834797cad \
525+
file://${S}/third_party/litert/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
525526
file://${S}/third_party/llvm-libc/src/LICENSE.TXT;md5=ff42885ed2ab98f1ecb8c1fc41205343 \
526527
file://${S}/third_party/lottie/LICENSE;md5=827837648055a0bfb7782b91ab42eed1 \
527528
file://${S}/third_party/lss/LICENSE;md5=31b650551268648966d774a3ecc710cf \
@@ -537,6 +538,7 @@ LIC_FILES_CHKSUM = "\
537538
file://${S}/third_party/modp_b64/LICENSE;md5=eb7e2e0af1d4971360553aedadee8d86 \
538539
file://${S}/third_party/nearby/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
539540
file://${S}/third_party/neon_2_sse/LICENSE;md5=53abad1ded16f44100126962f4bbef6c \
541+
file://${S}/third_party/nlohmann_json/LICENSE;md5=d9545308f01613f54de6f21134ec51f3 \
540542
file://${S}/third_party/node/Apache-LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
541543
file://${S}/third_party/node/node_modules/@azure/msal-browser/LICENSE;md5=4f9c2c296f77b3096b6c11a16fa7c66e \
542544
file://${S}/third_party/node/node_modules/lit/LICENSE;md5=4b390b7b932ca7872d1de2c834797cad \
@@ -571,7 +573,7 @@ LIC_FILES_CHKSUM = "\
571573
file://${S}/third_party/rjsmin/LICENSE;md5=34f8c1142fd6208a8be89399cb521df9 \
572574
file://${S}/third_party/rnnoise/COPYING;md5=1890bf89a18f8339491894a0b45428bf \
573575
file://${S}/third_party/ruy/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
574-
file://${S}/third_party/screen-ai/THIRD_PARTY_LICENSES;md5=618c57b748c4025c1a34e47b197fe7c5 \
576+
file://${S}/third_party/screen-ai/THIRD_PARTY_LICENSES;md5=ef54a886a51f3e264488632dd8d5cf1f \
575577
file://${S}/third_party/securemessage/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
576578
file://${S}/third_party/selenium-atoms/LICENSE;md5=5cd827bdaf8605a596a7ac9dcf808ea1 \
577579
file://${S}/third_party/selenium-atoms/LICENSE.sizzle;md5=7a9495742f21b7624515e120b720cc65 \
@@ -620,7 +622,6 @@ LIC_FILES_CHKSUM = "\
620622
file://${S}/third_party/webrtc/modules/third_party/g711/LICENSE;md5=b36ce10e2d3d47fd5e3a465cbc9626da \
621623
file://${S}/third_party/webrtc/modules/third_party/g722/LICENSE;md5=b6ec8735a974f440bc0cd4d93929336e \
622624
file://${S}/third_party/webrtc/modules/third_party/portaudio/LICENSE;md5=9f48147ba9bd3e7ca9a2392d2a3099c1 \
623-
file://${S}/third_party/webrtc/rtc_base/third_party/sigslot/LICENSE;md5=d31e106d9b0e980d8b5773f151e33ec7 \
624625
file://${S}/third_party/woff2/LICENSE;md5=027c71da9e4664fdf192e6ec615f4d18 \
625626
file://${S}/third_party/wtl/Ms-PL.txt;md5=1d2c3cdd7e748a6bc4213321d9157c5a \
626627
file://${S}/third_party/wuffs/src/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \

meta-chromium/recipes-browser/chromium/files/0001-Drop-GN-compiler-settings-conflicting-with-OE.patch

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
2222
index 59942a3..cf5e62e 100644
2323
--- a/build/config/compiler/BUILD.gn
2424
+++ b/build/config/compiler/BUILD.gn
25-
@@ -1301,23 +1301,6 @@ config("compiler_cpu_abi") {
25+
@@ -1306,25 +1306,6 @@
2626
"-mfpmath=sse",
2727
"-msse3",
2828
]
@@ -35,18 +35,20 @@ index 59942a3..cf5e62e 100644
3535
- "-march=$arm_arch",
3636
- "-mfloat-abi=$arm_float_abi",
3737
- ]
38-
- if (arm_tune != "") {
39-
- cflags += [ "-mtune=$arm_tune" ]
40-
- }
4138
- } else if (current_cpu == "arm64") {
4239
- if (is_clang && !is_android && !is_fuchsia && !is_chromeos_device) {
4340
- cflags += [ "--target=aarch64-linux-gnu" ]
4441
- ldflags += [ "--target=aarch64-linux-gnu" ]
42+
- }
43+
- if (target_os == "chromeos" && cros_target_cpu_arch != "" &&
44+
- current_cpu == target_cpu) {
45+
- cflags += [ "-march=$cros_target_cpu_arch" ]
46+
- ldflags += [ "-march=$cros_target_cpu_arch" ]
4547
- }
4648
} else if (current_cpu == "mipsel") {
4749
ldflags += [ "-Wl,--hash-style=sysv" ]
4850
if (custom_toolchain == "") {
49-
@@ -1325,9 +1308,6 @@ config("compiler_cpu_abi") {
51+
@@ -1332,9 +1313,6 @@
5052
if (is_android) {
5153
cflags += [ "--target=mipsel-linux-android" ]
5254
ldflags += [ "--target=mipsel-linux-android" ]
@@ -56,7 +58,7 @@ index 59942a3..cf5e62e 100644
5658
}
5759
} else {
5860
cflags += [ "-EL" ]
59-
@@ -1407,8 +1387,6 @@ config("compiler_cpu_abi") {
61+
@@ -1414,8 +1392,6 @@
6062
ldflags += [ "-Wl,--hash-style=sysv" ]
6163
if (custom_toolchain == "") {
6264
if (is_clang) {
@@ -65,7 +67,7 @@ index 59942a3..cf5e62e 100644
6567
} else {
6668
cflags += [ "-EB" ]
6769
ldflags += [ "-EB" ]
68-
@@ -1457,8 +1435,6 @@ config("compiler_cpu_abi") {
70+
@@ -1464,8 +1440,6 @@
6971
cflags += [ "--target=mips64el-linux-android" ]
7072
ldflags += [ "--target=mips64el-linux-android" ]
7173
} else {
@@ -74,7 +76,7 @@ index 59942a3..cf5e62e 100644
7476
}
7577
} else {
7678
cflags += [
77-
@@ -1516,8 +1492,6 @@ config("compiler_cpu_abi") {
79+
@@ -1523,8 +1497,6 @@
7880
ldflags += [ "-Wl,--hash-style=sysv" ]
7981
if (custom_toolchain == "") {
8082
if (is_clang) {
@@ -83,7 +85,7 @@ index 59942a3..cf5e62e 100644
8385
} else {
8486
cflags += [
8587
"-EB",
86-
@@ -1686,23 +1660,6 @@ config("compiler_deterministic") {
88+
@@ -1695,23 +1667,6 @@
8789
}
8890
}
8991

meta-chromium/recipes-browser/chromium/files/0001-Fix-building-gpu_host_impl.cc-on-Linux.patch

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@ diff --git a/components/viz/host/gpu_host_impl.cc b/components/viz/host/gpu_host
1717
index e37dd6bb11..27bf4bc8e7 100644
1818
--- a/components/viz/host/gpu_host_impl.cc
1919
+++ b/components/viz/host/gpu_host_impl.cc
20-
@@ -27,10 +27,12 @@
20+
@@ -28,11 +28,13 @@
2121
#include "gpu/config/gpu_info.h"
2222
#include "gpu/ipc/common/gpu_client_ids.h"
2323
#include "gpu/ipc/host/gpu_disk_cache.h"
2424
-#include "gpu/webgpu/dawn_commit_hash.h"
2525
#include "mojo/public/cpp/bindings/sync_call_restrictions.h"
26+
#include "services/webnn/host/weights_file_provider.h"
2627
#include "skia/buildflags.h"
2728
#include "skia/ext/skia_commit_hash.h"
2829
+#if BUILDFLAG(SKIA_USE_DAWN)

meta-chromium/recipes-browser/chromium/files/0003-wrapper-extra-flags.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ diff --git a/chrome/installer/linux/common/wrapper b/chrome/installer/linux/comm
1717
index aaa46bf..7d8c8dd 100755
1818
--- a/chrome/installer/linux/common/wrapper
1919
+++ b/chrome/installer/linux/common/wrapper
20-
@@ -36,5 +36,7 @@ exec < /dev/null
20+
@@ -36,5 +36,7 @@
2121
exec > >(exec cat)
2222
exec 2> >(exec cat >&2)
23-
23+
2424
+CHROME_EXTRA_ARGS=""
2525
+
2626
# Note: exec -a below is a bashism.
27-
-exec -a "$0" "$HERE/@@PROGNAME@@" "$@"
27+
-exec -a "$0" "$HERE/@@PROGNAME" "$@"
2828
+exec -a "$0" "$HERE/@@PROGNAME@@" ${CHROME_EXTRA_ARGS} "$@"

meta-chromium/recipes-browser/chromium/files/0009-Adjust-the-Rust-build-to-our-needs.patch

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ diff --git a/build/config/rust.gni b/build/config/rust.gni
3030
index bd18d13..e260576 100644
3131
--- a/build/config/rust.gni
3232
+++ b/build/config/rust.gni
33-
@@ -93,6 +93,11 @@ declare_args() {
34-
# a platform. Mostly applicable to Windows, where new versions can handle ANSI
35-
# escape sequences but it's not reliable in general.
36-
force_rustc_color_output = false
33+
@@ -102,6 +102,11 @@
34+
# * Fixing pre-existing violations of `clippy` lints (crbug.com/472355480)
35+
# * Deciding on a policy (e.g. which trybots can/should cover `clippy`)
36+
enable_rust_clippy = false
3737
+
3838
+ # Override the vendor part of the Rust target triple (with a leading dash)
3939
+ # used for building target code (not host code). Leave empty to use the
@@ -42,7 +42,7 @@ index bd18d13..e260576 100644
4242
}
4343

4444
declare_args() {
45-
@@ -184,12 +189,19 @@ if (enable_rust) {
45+
@@ -193,12 +198,19 @@
4646
# other toolchains.
4747
rust_abi_target = ""
4848
if (is_linux || is_chromeos) {
@@ -65,18 +65,25 @@ index bd18d13..e260576 100644
6565
} else if (current_cpu == "arm") {
6666
if (arm_float_abi == "hard") {
6767
float_suffix = "hf"
68-
@@ -207,25 +219,21 @@ if (is_linux || is_chromeos) {
69-
# The thumbv7 vs. armv7 distinction is for legacy reasons and both
70-
# targets in fact target Thumb, see:
71-
# https://github.com/rust-lang/rust/issues/44722
72-
- if (arm_use_neon) {
73-
- rust_abi_target = "thumbv7neon-unknown-linux-gnueabi" + float_suffix
74-
- } else {
75-
- rust_abi_target = "armv7-unknown-linux-gnueabi" + float_suffix
76-
- }
68+
@@ -206,31 +218,21 @@
69+
float_suffix = ""
70+
}
71+
if (arm_arch == "armv7-a" || arm_arch == "armv7") {
72+
- # We have no way to inform Rust about the -a suffix, so we end up
73+
- # targeting armv7 in both cases.
74+
- #
75+
- # We also try to propagate the availability of NEON without feature
76+
- # detection; in C++ this is done by -mfpu=neon, but in Rust we need to
77+
- # use a different ABI target.
78+
- #
79+
- # The thumbv7 vs. armv7 distinction is for legacy reasons and both
80+
- # targets in fact target Thumb, see:
81+
- # https://github.com/rust-lang/rust/issues/44722
82+
- rust_abi_target = "thumbv7neon-unknown-linux-gnueabi" + float_suffix
7783
+ rust_abi_target = "armv7" + vendor + "-linux-gnueabi" + float_suffix
7884
} else {
79-
rust_abi_target = "arm-unknown-linux-gnueabi" + float_suffix
85+
- rust_abi_target = "arm-unknown-linux-gnueabi" + float_suffix
86+
+ rust_abi_target = "arm" + vendor + "-linux-gnueabi" + float_suffix
8087
}
8188
} else if (current_cpu == "riscv64") {
8289
- rust_abi_target = "riscv64gc-unknown-linux-gnu"
@@ -117,7 +124,7 @@ diff --git a/build/rust/gni_impl/rustc_wrapper.py b/build/rust/gni_impl/rustc_wr
117124
index 8f2096d..de43d44 100755
118125
--- a/build/rust/gni_impl/rustc_wrapper.py
119126
+++ b/build/rust/gni_impl/rustc_wrapper.py
120-
@@ -204,6 +204,7 @@ def main():
127+
@@ -250,6 +250,7 @@ def main():
121128
rustc_args = remaining_args[:ldflags_separator]
122129
ldflags = remaining_args[ldflags_separator + 1:rustenv_separator]
123130
rustenv = remaining_args[rustenv_separator + 1:sources_separator]
@@ -201,16 +208,16 @@ index 386258f..e8fdaa9 100755
201208

202209

203210
def main():
204-
@@ -53,6 +53,8 @@ def main():
205-
rustlib_dir = subprocess.check_output(rustc_args).rstrip().decode()
206-
rustlib_dir = os.path.relpath(rustlib_dir)
211+
@@ -61,6 +61,8 @@ def main():
212+
rustlib_dir = os.path.relpath(rustlib_dir, os.path.realpath(os.curdir))
213+
207214

208215
+ lib_output_dir = os.path.join(args.output, 'lib')
209216
+
210217
# Copy the rlibs to a predictable location. Whilst we're doing so,
211218
# also write a .d file so that ninja knows it doesn't need to do this
212219
# again unless the source rlibs change.
213-
@@ -64,7 +66,7 @@ def main():
220+
@@ -72,7 +74,7 @@ def main():
214221
# output rlibs for that purpose. If any of the input rlibs change, ninja
215222
# will run this script again and we'll copy them all afresh.
216223
depfile.write(
@@ -219,7 +226,7 @@ index 386258f..e8fdaa9 100755
219226

220227
def copy_file(infile, outfile):
221228
depfile.write(f" {infile}")
222-
@@ -100,7 +102,7 @@ def main():
229+
@@ -108,7 +110,7 @@ def main():
223230
# the correct file path to our linker invocations, we don't need
224231
# that, and it would prevent us having the predictable filenames
225232
# which we need for statically computable gn dependency rules.
@@ -228,7 +235,7 @@ index 386258f..e8fdaa9 100755
228235

229236
# Use the number of times we've seen this name to disambiguate the output
230237
# filenames. Since we sort the input filenames including the metadata,
231-
@@ -118,14 +120,18 @@ def main():
238+
@@ -126,14 +128,18 @@ def main():
232239
output_filename = f"lib{concise_name}.rlib"
233240

234241
infile = os.path.join(rustlib_dir, f)

meta-chromium/recipes-browser/chromium/files/0013-Reduce-minimum-browser-window-width-to-480px.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ diff --git a/chrome/browser/ui/views/frame/layout/browser_view_layout.h b/chrome
2323
index 493d444..99621d9 100644
2424
--- a/chrome/browser/ui/views/frame/layout/browser_view_layout.h
2525
+++ b/chrome/browser/ui/views/frame/layout/browser_view_layout.h
26-
@@ -95,7 +95,7 @@
26+
@@ -93,7 +93,7 @@
2727
// very small window, even on large monitors (which is why a minimum height is
2828
// not specified). This value is used for the main browser window only, not
2929
// for popups.
3030
- static constexpr int kMainBrowserContentsMinimumWidth = 500;
3131
+ static constexpr int kMainBrowserContentsMinimumWidth = 480;
3232

33-
// The width of the vertical tab strip.
34-
//
33+
BrowserViewLayout(const BrowserViewLayout&) = delete;
34+
BrowserViewLayout& operator=(const BrowserViewLayout&) = delete;
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
Fix zip_ffi_glue build errors
2+
3+
error: let chains are only allowed in Rust 2024 or later
4+
--> ../../components/user_data_importer/utility/parsing_ffi/zip_archive.rs:89:16
5+
|
6+
89 | if let Ok(file) = self.archive.by_index(i)
7+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
8+
9+
error: let chains are only allowed in Rust 2024 or later
10+
--> ../../components/user_data_importer/utility/parsing_ffi/zip_archive.rs:90:20
11+
|
12+
90 | && let Some(outpath) = file.enclosed_name()
13+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
14+
15+
error: let chains are only allowed in Rust 2024 or later
16+
--> ../../components/user_data_importer/utility/parsing_ffi/zip_archive.rs:91:20
17+
|
18+
91 | && let Some(r) = f(file, &outpath)
19+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
20+
error: let chains are only allowed in Rust 2024 or later
21+
--> ../../components/user_data_importer/utility/parsing_ffi/zip_archive.rs:107:16
22+
|
23+
107 | if let Ok(file) = self.archive.by_index(i)
24+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
25+
26+
error: let chains are only allowed in Rust 2024 or later
27+
--> ../../components/user_data_importer/utility/parsing_ffi/zip_archive.rs:108:20
28+
|
29+
108 | && let Some(outpath) = file.enclosed_name()
30+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
31+
32+
error: aborting due to 5 previous errors
33+
34+
Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
35+
Upstream-Status: Inappropriate [rust edition specific]
36+
37+
--- a/components/user_data_importer/utility/BUILD.gn 2026-03-03 00:00:09.000000000 +0100
38+
+++ b/components/user_data_importer/utility/BUILD.gn 2026-03-17 12:35:09.304632524 +0100
39+
@@ -64,6 +64,7 @@
40+
rust_static_library("zip_ffi_glue") {
41+
allow_unsafe = true
42+
crate_root = "parsing_ffi/lib.rs"
43+
+ edition = "2024"
44+
sources = [
45+
"parsing_ffi/history.rs",
46+
"parsing_ffi/json.rs",

0 commit comments

Comments
 (0)