[rpms/chromium] epel9-next: Fix build error caused by old rustc on el9

[rpms/chromium] epel9-next: Fix build error caused by old rustc on el9

[Than Ngo]

A new commit has been pushed.

Repo   : rpms/chromium
Branch : epel9-next
Commit : c285730bf0a6318c7ca6ff8a691f36c5267fe8ef
Author : Than Ngo <than@redhat.com>
Date   : 2025-12-04T14:39:50+01:00
Stats  : +43/-41 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/chromium/c/c285730bf0a6318c7ca6ff8a691f36c5267fe8ef?branch=epel9-next

Log:
Fix build error caused by old rustc 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
deleted file mode 100644
index 8c5a339..0000000
--- a/chromium-142-el9-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-142-el9-rust_alloc_error_handler_should_panic.patch b/chromium-142-el9-rust_alloc_error_handler_should_panic.patch
deleted file mode 100644
index 032c4a2..0000000
--- a/chromium-142-el9-rust_alloc_error_handler_should_panic.patch
+++ /dev/null
@@ -1,17 +0,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.88) expects on EL9
-+    #[rustc_std_internal_symbol]
-+    #[linkage = "weak"]
-+    fn __rust_alloc_error_handler_should_panic() -> u8 {
-+        0
-+    }
-+
-     // Mangle the symbol name as rustc (1.84) expects on EL9
-     #[no_mangle]
-     #[linkage = "weak"]

diff --git a/chromium-143-el9-rust-no-alloc-shim-is-unstable.patch b/chromium-143-el9-rust-no-alloc-shim-is-unstable.patch
new file mode 100644
index 0000000..4154fb0
--- /dev/null
+++ b/chromium-143-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
++    #[unsafe(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-143-el9-rust_alloc_error_handler_should_panic.patch b/chromium-143-el9-rust_alloc_error_handler_should_panic.patch
new file mode 100644
index 0000000..190f1ab
--- /dev/null
+++ b/chromium-143-el9-rust_alloc_error_handler_should_panic.patch
@@ -0,0 +1,17 @@
+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.88) expects on EL9
++    #[rustc_std_internal_symbol]
++    #[linkage = "weak"]
++    fn __rust_alloc_error_handler_should_panic() -> u8 {
++        0
++    }
++
+     // Mangle the symbol name as rustc (1.84) expects on EL9
+     #[unsafe(no_mangle)]
+     #[linkage = "weak"]

diff --git a/chromium.spec b/chromium.spec
index 5557436..af92db3 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -348,11 +348,13 @@ Patch310: chromium-139-rust-FTBFS-suppress-warnings.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
+# Error: unsafe attribute used without unsafe
+#    --> ../../build/rust/allocator/lib.rs:107:7
+Patch312: chromium-143-el9-rust-no-alloc-shim-is-unstable.patch
 
 # Fix FTBFS on EL9
 # - error: undefined symbol: __rust_alloc_error_handler_should_panic
-Patch313: chromium-142-el9-rust_alloc_error_handler_should_panic.patch
+Patch313: chromium-143-el9-rust_alloc_error_handler_should_panic.patch
 
 # old rust version causes build error on el8:
 # error[E0599]: no method named `is_none_or` found for enum `Option` in the current scope