Skip to content

Commit ad322ce

Browse files
committed
chromium: Rebase patch "Fix adler reference for Rust < 1.86"
Chromium 136.0.7103.113 now expects adler2 by default. Rework patch to apply cleanly on the recent update. Signed-off-by: Ariel D'Alessandro <[email protected]>
1 parent 781a8de commit ad322ce

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ SRC_URI:append:libc-musl = "\
6363
file://musl/0015-fix-libc-version-include.patch \
6464
"
6565

66-
SRC_URI:append = "${@oe.utils.version_less_or_equal('RUSTVERSION', '1.85', '', ' file://0016-Fix-adler-reference-for-Rust-1.86-and-later.patch', d)}"
66+
SRC_URI:append = "${@oe.utils.version_less_or_equal('RUSTVERSION', '1.85', ' file://0001-Fix-adler-reference-for-Rust-1.86.patch', '', d)}"
6767

6868
ANY_OF_DISTRO_FEATURES = "opengl vulkan"
6969

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
1-
From 416c6c72c9be8092911b68d0edc2f96a1b0ad349 Mon Sep 17 00:00:00 2001
1+
From 78fd73792c69f9b7ccf62bd648965555b0a7a06a Mon Sep 17 00:00:00 2001
22
From: Alexander Stein <[email protected]>
33
Date: Wed, 3 Sep 2025 11:26:19 +0200
4-
Subject: [PATCH 1/1] Fix adler reference for Rust 1.86 and later
4+
Subject: [PATCH] Fix adler reference for Rust < 1.86
55

6-
Since version 1.86.0 Rust ships adler2. Adjust the reference.
6+
Rust ships adler2 since version 1.86.0. Adjust the reference.
77

8+
Upstream-Status: Inappropriate [specific to our build setup]
89
Signed-off-by: Alexander Stein <[email protected]>
10+
Signed-off-by: Ariel D'Alessandro <[email protected]>
911
---
1012
build/rust/std/BUILD.gn | 2 +-
1113
1 file changed, 1 insertion(+), 1 deletion(-)
1214

1315
diff --git a/build/rust/std/BUILD.gn b/build/rust/std/BUILD.gn
14-
index 38e5ab76457dd..ca5d97ea7ef81 100644
16+
index 7f64198b9f..d29e3466b1 100644
1517
--- a/build/rust/std/BUILD.gn
1618
+++ b/build/rust/std/BUILD.gn
17-
@@ -74,7 +74,7 @@ if (toolchain_has_rust) {
19+
@@ -89,7 +89,7 @@ if (toolchain_has_rust) {
1820
# These are no longer present in the Windows toolchain.
1921
stdlib_files += [
2022
"addr2line",
21-
- "adler",
22-
+ "adler2",
23+
- "adler2",
24+
+ "adler",
2325
"gimli",
2426
"libc",
2527
"memchr",
26-
--
27-
2.43.0
28-

0 commit comments

Comments
 (0)