[rpms/chromium] epel9-next: Fix FTBFS caused by rust-1.88 on EL9

[rpms/chromium] epel9-next: Fix FTBFS caused by rust-1.88 on EL9

[Than Ngo]

A new commit has been pushed.

Repo   : rpms/chromium
Branch : epel9-next
Commit : 6f66ead77dacbdd3b1623bfe30057d41b2aa4005
Author : Than Ngo <than@redhat.com>
Date   : 2025-11-14T21:11:22+01:00
Stats  : +46/-46 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/chromium/c/6f66ead77dacbdd3b1623bfe30057d41b2aa4005?branch=epel9-next

Log:
Fix FTBFS caused by rust-1.88 on EL9

---
diff --git a/chromium-142-el9-rust-no-alloc-shim-is-unstable.patch b/chromium-142-el9-rust-no-alloc-shim-is-unstable.patch
new file mode 100644
index 0000000..8c5a339
--- /dev/null
+++ b/chromium-142-el9-rust-no-alloc-shim-is-unstable.patch
@@ -0,0 +1,22 @@
+Fix build errors:
+
+error[E0428]: the name `__rust_alloc_error_handler_should_panic_v2` is defined multiple times
+   --> ../../build/rust/allocator/lib.rs:101:5
+
+error: undefined symbol: __rust_no_alloc_shim_is_unstable
+
+diff -up chromium-141.0.7390.37/build/rust/allocator/lib.rs.rust-no-alloc-shim-is-unstable chromium-141.0.7390.37/build/rust/allocator/lib.rs
+--- chromium-141.0.7390.37/build/rust/allocator/lib.rs.rust-no-alloc-shim-is-unstable	2025-09-23 22:21:14.000000000 +0200
++++ chromium-141.0.7390.37/build/rust/allocator/lib.rs	2025-09-27 15:14:54.661952048 +0200
+@@ -103,6 +103,11 @@ mod both_allocators {
+     #[linkage = "weak"]
+     static __rust_alloc_error_handler_should_panic: u8 = 0;
+ 
++    // Mangle the symbol name as rustc (1.84) expects on EL9
++    #[no_mangle]
++    #[linkage = "weak"]
++    static __rust_no_alloc_shim_is_unstable: u8 = 0;
++
+     // Mangle the symbol name as rustc expects.
+     #[rustc_std_internal_symbol]
+     #[allow(non_upper_case_globals)]

diff --git a/chromium-142-el9-rust_alloc_error_handler_should_panic.patch b/chromium-142-el9-rust_alloc_error_handler_should_panic.patch
index 5b07869..032c4a2 100644
--- a/chromium-142-el9-rust_alloc_error_handler_should_panic.patch
+++ b/chromium-142-el9-rust_alloc_error_handler_should_panic.patch
@@ -1,20 +1,17 @@
-Fix FTBFS due to old rust compiler on EL9
-
-error: undefined symbol: __rust_alloc_error_handler_should_panic
-
-
-diff -up chromium-142.0.7444.52/build/rust/allocator/lib.rs.me chromium-142.0.7444.52/build/rust/allocator/lib.rs
---- chromium-142.0.7444.52/build/rust/allocator/lib.rs.me	2025-10-31 12:29:40.849457901 +0100
-+++ chromium-142.0.7444.52/build/rust/allocator/lib.rs	2025-10-31 12:30:37.753590615 +0100
-@@ -101,6 +101,11 @@ mod both_allocators {
-     #[linkage = "weak"]
-     static __rust_no_alloc_shim_is_unstable: u8 = 0;
+diff -up chromium-142.0.7444.162/build/rust/allocator/lib.rs.el9-rust_alloc_error_handler_should_panic chromium-142.0.7444.162/build/rust/allocator/lib.rs
+--- chromium-142.0.7444.162/build/rust/allocator/lib.rs.el9-rust_alloc_error_handler_should_panic	2025-11-12 09:39:31.616713829 +0100
++++ chromium-142.0.7444.162/build/rust/allocator/lib.rs	2025-11-14 11:43:32.115426831 +0100
+@@ -96,6 +96,13 @@ mod both_allocators {
+         0
+     }
  
-+    // Mangle the symbol name as rustc (1.84) expects on EL9
-+    #[no_mangle]
++    // Mangle the symbol name as rustc (1.88) expects on EL9
++    #[rustc_std_internal_symbol]
 +    #[linkage = "weak"]
-+    static __rust_alloc_error_handler_should_panic: u8 = 0;
++    fn __rust_alloc_error_handler_should_panic() -> u8 {
++        0
++    }
 +
-     // Mangle the symbol name as rustc expects.
-     #[rustc_std_internal_symbol]
-     #[allow(non_upper_case_globals)]
+     // Mangle the symbol name as rustc (1.84) expects on EL9
+     #[no_mangle]
+     #[linkage = "weak"]

diff --git a/chromium-rust-no-alloc-shim-is-unstable.patch b/chromium-rust-no-alloc-shim-is-unstable.patch
deleted file mode 100644
index 8c5a339..0000000
--- a/chromium-rust-no-alloc-shim-is-unstable.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix build errors:
-
-error[E0428]: the name `__rust_alloc_error_handler_should_panic_v2` is defined multiple times
-   --> ../../build/rust/allocator/lib.rs:101:5
-
-error: undefined symbol: __rust_no_alloc_shim_is_unstable
-
-diff -up chromium-141.0.7390.37/build/rust/allocator/lib.rs.rust-no-alloc-shim-is-unstable chromium-141.0.7390.37/build/rust/allocator/lib.rs
---- chromium-141.0.7390.37/build/rust/allocator/lib.rs.rust-no-alloc-shim-is-unstable	2025-09-23 22:21:14.000000000 +0200
-+++ chromium-141.0.7390.37/build/rust/allocator/lib.rs	2025-09-27 15:14:54.661952048 +0200
-@@ -103,6 +103,11 @@ mod both_allocators {
-     #[linkage = "weak"]
-     static __rust_alloc_error_handler_should_panic: u8 = 0;
- 
-+    // Mangle the symbol name as rustc (1.84) expects on EL9
-+    #[no_mangle]
-+    #[linkage = "weak"]
-+    static __rust_no_alloc_shim_is_unstable: u8 = 0;
-+
-     // Mangle the symbol name as rustc expects.
-     #[rustc_std_internal_symbol]
-     #[allow(non_upper_case_globals)]

diff --git a/chromium.spec b/chromium.spec
index d9452f5..18f6a36 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -245,7 +245,7 @@
 
 Name:	chromium
 Version: 142.0.7444.162
-Release: 2%{?dist}
+Release: 1%{?dist}
 Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
 Url: http://www.chromium.org/Home
 License: BSD-3-Clause AND LGPL-2.1-or-later AND Apache-2.0 AND IJG AND MIT AND GPL-2.0-or-later AND ISC AND OpenSSL AND (MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-only)
@@ -338,11 +338,11 @@ Patch309: chromium-132-el8-unsupport-rustc-flags.patch
 # Fix rhbz#2387446, FTBFS with rust-1.89.0
 Patch310: chromium-139-rust-FTBFS-suppress-warnings.patch
 
-# Fix FTBFS: undefined symbol: __rust_no_alloc_shim_is_unstable
-Patch311: chromium-rust-no-alloc-shim-is-unstable.patch
-
 # enable fstack-protector-strong
-Patch312: chromium-123-fstack-protector-strong.patch
+Patch311: chromium-123-fstack-protector-strong.patch
+
+# Fix FTBFS: undefined symbol: __rust_no_alloc_shim_is_unstable on EL9
+Patch312: chromium-142-el9-rust-no-alloc-shim-is-unstable.patch
 
 # Fix FTBFS on EL9
 # - error: undefined symbol: __rust_alloc_error_handler_should_panic
@@ -1036,9 +1036,12 @@ Qt6 UI for chromium.
 %endif
 
 %patch -P310 -p1 -b .rust-FTBFS-suppress-warnings
-%patch -P311 -p1 -b .rust-no-alloc-shim-is-unstable
-%patch -P312 -p1 -b .fstack-protector-strong
+%patch -P311 -p1 -b .fstack-protector-strong
+
+%if 0%{?rhel} == 9
+%patch -P312 -p1 -b .el9-rust-no-alloc-shim-is-unstable
 %patch -P313 -p1 -b .el9-rust_alloc_error_handler_should_panic
+%endif
 
 %if 0%{?rhel} && 0%{?rhel} < 10
 %patch -P354 -p1 -b .split-threshold-for-reg-with-hint