public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Than Ngo <than@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/chromium] epel9-next: Fix FTBFS on epel-10.1 and epel-10.3
Date: Fri, 07 Aug 2026 16:09:01 GMT [thread overview]
Message-ID: <178611894189.1.18391494110184381774.rpms-chromium-30a92a502032@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/chromium
Branch : epel9-next
Commit : 30a92a502032c7a86a5216c4873974e5f8455509
Author : Than Ngo <than@redhat.com>
Date : 2026-05-10T11:41:43+02:00
Stats : +97/-119 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/chromium/c/30a92a502032c7a86a5216c4873974e5f8455509?branch=epel9-next
Log:
Fix FTBFS on epel-10.1 and epel-10.3
---
diff --git a/chromium-147-rustc-1.95.patch b/chromium-147-rustc-1.95.patch
deleted file mode 100644
index abee7b5..0000000
--- a/chromium-147-rustc-1.95.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Fix build error with rustc 1.95 in f45
-
-error[E0425]: cannot find type `LaneCount` in module `core::simd`
- --> ../../third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs:234:15
- |
-234 | core::simd::LaneCount<N>: core::simd::SupportedLaneCount,
- | ^^^^^^^^^ not found in `core::simd`
-error[E0405]: cannot find trait `SupportedLaneCount` in module `core::simd`
- --> ../../third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs:234:41
- |
-234 | core::simd::LaneCount<N>: core::simd::SupportedLaneCount,
- | ^^^^^^^^^^^^^^^^^^ not found in `core::simd`
-error[E0425]: cannot find type `LaneCount` in module `core::simd`
- --> ../../third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs:155:15
- |
-155 | core::simd::LaneCount<N>: core::simd::SupportedLaneCount,
- | ^^^^^^^^^ not found in `core::simd`
-error[E0405]: cannot find trait `SupportedLaneCount` in module `core::simd`
- --> ../../third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs:155:41
- |
-155 | core::simd::LaneCount<N>: core::simd::SupportedLaneCount,
-
-
-diff -up chromium-147.0.7727.116/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs.me chromium-147.0.7727.116/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs
---- chromium-147.0.7727.116/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs.me 2026-04-26 13:19:28.648591553 +0200
-+++ chromium-147.0.7727.116/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs 2026-04-26 13:23:22.967926065 +0200
-@@ -143,25 +143,7 @@ impl_unsafe_marker_for_simd!(
- }
- );
-
--#[rustversion::before(2026-01-27)] // See https://github.com/Lokathor/bytemuck/issues/343
- #[cfg(feature = "nightly_portable_simd")]
--#[cfg_attr(
-- feature = "nightly_docs",
-- doc(cfg(feature = "nightly_portable_simd"))
--)]
--unsafe impl<T, const N: usize> Pod for core::simd::Simd<T, N>
--where
-- T: core::simd::SimdElement + Pod,
-- core::simd::LaneCount<N>: core::simd::SupportedLaneCount,
--{
--}
--
--#[rustversion::since(2026-01-27)] // See https://github.com/Lokathor/bytemuck/issues/343
--#[cfg(feature = "nightly_portable_simd")]
--#[cfg_attr(
-- feature = "nightly_docs",
-- doc(cfg(feature = "nightly_portable_simd"))
--)]
- unsafe impl<T, const N: usize> Pod for core::simd::Simd<T, N>
- where
- T: core::simd::SimdElement + Pod,
-diff -up chromium-147.0.7727.116/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs.me chromium-147.0.7727.116/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs
---- chromium-147.0.7727.116/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs.me 2026-04-26 12:54:16.801715156 +0200
-+++ chromium-147.0.7727.116/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs 2026-04-26 13:23:50.948183197 +0200
-@@ -222,25 +222,7 @@ impl_unsafe_marker_for_simd!(
- }
- );
-
--#[rustversion::before(2026-01-27)] // See https://github.com/Lokathor/bytemuck/issues/343
- #[cfg(feature = "nightly_portable_simd")]
--#[cfg_attr(
-- feature = "nightly_docs",
-- doc(cfg(feature = "nightly_portable_simd"))
--)]
--unsafe impl<T, const N: usize> Zeroable for core::simd::Simd<T, N>
--where
-- T: core::simd::SimdElement + Zeroable,
-- core::simd::LaneCount<N>: core::simd::SupportedLaneCount,
--{
--}
--
--#[rustversion::since(2026-01-27)] // See https://github.com/Lokathor/bytemuck/issues/343
--#[cfg(feature = "nightly_portable_simd")]
--#[cfg_attr(
-- feature = "nightly_docs",
-- doc(cfg(feature = "nightly_portable_simd"))
--)]
- unsafe impl<T, const N: usize> Zeroable for core::simd::Simd<T, N>
- where
- T: core::simd::SimdElement + Zeroable,
diff --git a/chromium-148-el9-rust-1.88-build-error.patch b/chromium-148-el9-rust-1.88-build-error.patch
deleted file mode 100644
index 8a50ab8..0000000
--- a/chromium-148-el9-rust-1.88-build-error.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix build error with rust-1.88 on el9
-
-error[E0599]: no method named `file_as_c_str` found for reference `&Location<'_>` in the current scope
- --> ../../base/logging/logger.rs:133:39
- |
-133 | info.location().map(|loc| loc.file_as_c_str()).unwrap_or(c"<unknown file>"),
- | ^^^^^^^^^^^^^ method not found in `&Location<'_>`
-
-diff -up chromium-148.0.7778.96/base/logging/logger.rs.me chromium-148.0.7778.96/base/logging/logger.rs
---- chromium-148.0.7778.96/base/logging/logger.rs.me 2026-05-07 22:18:41.995966833 +0200
-+++ chromium-148.0.7778.96/base/logging/logger.rs 2026-05-07 22:47:11.740773933 +0200
-@@ -128,9 +128,18 @@ mod ffi {
- }
-
- fn panic_hook(info: &PanicHookInfo<'_>) {
-+ let file_storage;
-+ let file_name: &CStr = match info.location() {
-+ Some(loc) => {
-+ file_storage = CString::new(loc.file()).unwrap();
-+ file_storage.as_c_str()
-+ }
-+ None => c"<unknown file>",
-+ };
-+
- print_rust_log(
- &format_args!("{info}"),
-- info.location().map(|loc| loc.file_as_c_str()).unwrap_or(c"<unknown file>"),
-+ file_name,
- info.location().map(|loc| loc.line()),
- LOGGING_FATAL,
- false,
diff --git a/chromium-148-rust-1.88-build-error.patch b/chromium-148-rust-1.88-build-error.patch
new file mode 100644
index 0000000..8a50ab8
--- /dev/null
+++ b/chromium-148-rust-1.88-build-error.patch
@@ -0,0 +1,31 @@
+Fix build error with rust-1.88 on el9
+
+error[E0599]: no method named `file_as_c_str` found for reference `&Location<'_>` in the current scope
+ --> ../../base/logging/logger.rs:133:39
+ |
+133 | info.location().map(|loc| loc.file_as_c_str()).unwrap_or(c"<unknown file>"),
+ | ^^^^^^^^^^^^^ method not found in `&Location<'_>`
+
+diff -up chromium-148.0.7778.96/base/logging/logger.rs.me chromium-148.0.7778.96/base/logging/logger.rs
+--- chromium-148.0.7778.96/base/logging/logger.rs.me 2026-05-07 22:18:41.995966833 +0200
++++ chromium-148.0.7778.96/base/logging/logger.rs 2026-05-07 22:47:11.740773933 +0200
+@@ -128,9 +128,18 @@ mod ffi {
+ }
+
+ fn panic_hook(info: &PanicHookInfo<'_>) {
++ let file_storage;
++ let file_name: &CStr = match info.location() {
++ Some(loc) => {
++ file_storage = CString::new(loc.file()).unwrap();
++ file_storage.as_c_str()
++ }
++ None => c"<unknown file>",
++ };
++
+ print_rust_log(
+ &format_args!("{info}"),
+- info.location().map(|loc| loc.file_as_c_str()).unwrap_or(c"<unknown file>"),
++ file_name,
+ info.location().map(|loc| loc.line()),
+ LOGGING_FATAL,
+ false,
diff --git a/chromium-148-rust-1.95-bytemuck-ftbfs.patch b/chromium-148-rust-1.95-bytemuck-ftbfs.patch
new file mode 100644
index 0000000..b911b71
--- /dev/null
+++ b/chromium-148-rust-1.95-bytemuck-ftbfs.patch
@@ -0,0 +1,60 @@
+Fix build error with rustc 1.95
+
+error[E0425]: cannot find type `LaneCount` in module `core::simd`
+ --> ../../third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs:234:15
+ |
+234 | core::simd::LaneCount<N>: core::simd::SupportedLaneCount,
+ | ^^^^^^^^^ not found in `core::simd`
+error[E0405]: cannot find trait `SupportedLaneCount` in module `core::simd`
+ --> ../../third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs:234:41
+ |
+234 | core::simd::LaneCount<N>: core::simd::SupportedLaneCount,
+ | ^^^^^^^^^^^^^^^^^^ not found in `core::simd`
+error[E0425]: cannot find type `LaneCount` in module `core::simd`
+ --> ../../third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs:155:15
+ |
+155 | core::simd::LaneCount<N>: core::simd::SupportedLaneCount,
+ | ^^^^^^^^^ not found in `core::simd`
+error[E0405]: cannot find trait `SupportedLaneCount` in module `core::simd`
+ --> ../../third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs:155:41
+ |
+155 | core::simd::LaneCount<N>: core::simd::SupportedLaneCount,
+
+diff -up chromium-148.0.7778.96/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs.me chromium-148.0.7778.96/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs
+--- chromium-148.0.7778.96/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs.me 2026-04-28 23:05:57.000000000 +0200
++++ chromium-148.0.7778.96/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/pod.rs 2026-05-09 20:39:28.808258788 +0200
+@@ -152,7 +152,6 @@ impl_unsafe_marker_for_simd!(
+ unsafe impl<T, const N: usize> Pod for core::simd::Simd<T, N>
+ where
+ T: core::simd::SimdElement + Pod,
+- core::simd::LaneCount<N>: core::simd::SupportedLaneCount,
+ {
+ }
+
+@@ -165,6 +164,7 @@ where
+ unsafe impl<T, const N: usize> Pod for core::simd::Simd<T, N>
+ where
+ T: core::simd::SimdElement + Pod,
++ core::simd::LaneCount<N>: core::simd::SupportedLaneCount,
+ {
+ }
+
+diff -up chromium-148.0.7778.96/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs.me chromium-148.0.7778.96/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs
+--- chromium-148.0.7778.96/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs.me 2026-04-28 23:05:57.000000000 +0200
++++ chromium-148.0.7778.96/third_party/rust/chromium_crates_io/vendor/bytemuck-v1/src/zeroable.rs 2026-05-09 20:39:28.808258788 +0200
+@@ -231,7 +231,6 @@ impl_unsafe_marker_for_simd!(
+ unsafe impl<T, const N: usize> Zeroable for core::simd::Simd<T, N>
+ where
+ T: core::simd::SimdElement + Zeroable,
+- core::simd::LaneCount<N>: core::simd::SupportedLaneCount,
+ {
+ }
+
+@@ -244,6 +243,7 @@ where
+ unsafe impl<T, const N: usize> Zeroable for core::simd::Simd<T, N>
+ where
+ T: core::simd::SimdElement + Zeroable,
++ core::simd::LaneCount<N>: core::simd::SupportedLaneCount,
+ {
+ }
+
diff --git a/chromium.spec b/chromium.spec
index bf2d866..3bd22b4 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -344,7 +344,8 @@ Patch136: chromium-133-workaround-system-ffmpeg-whitelist.patch
Patch137: chromium-147-system-ffmpeg.patch
# file conflict with old kernel on el8/el9
Patch141: chromium-118-dma_buf_export_sync_file-conflict.patch
-
+# Fix FTBFS with rustc-1.88 on el9 and epel10.1
+Patch142: chromium-148-rust-1.88-build-error.patch
# fix ftbfs caused by old rustc-1.88 on el9 and 10.1
Patch143: chromium-148-rust-1.88-enable-unstable_features.patch
Patch144: chromium-146-rust-1.88-undefined-symbol.patch
@@ -352,8 +353,6 @@ Patch145: chromium-148-use-system-rustc.patch
# Fix FTBFS with python-3.9 on el9
Patch146: chromium-148-el9-python-3.9-build-error.patch
-# Fix FTBFS with rustc-1.88 on el9
-Patch147: chromium-148-el9-rust-1.88-build-error.patch
# add correct path for Qt6Gui header and libs
Patch150: chromium-124-qt6.patch
@@ -444,7 +443,7 @@ Patch357: chromium-134-type-mismatch-error.patch
Patch358: chromium-144-rust-clanglib.patch
# fix FTBFS with rustc 1.95
-Patch359: chromium-147-rustc-1.95.patch
+Patch359: chromium-148-rust-1.95-bytemuck-ftbfs.patch
# PowerPC64 LE support
# Timothy Pearson's patchset
@@ -1114,14 +1113,14 @@ Qt6 UI for chromium.
%endif
%if (0%{?rhel} && 0%{?rhel} < 10) || (0%{?rhel} == 10 && 0%{?rhel_minor_version} < 2)
+%patch -P142 -p1 -b .rust-1.88-build-error
%patch -P143 -p1 -b .rust-1.88-enable-unstable_features
-%patch -P144 -p1 -b .rustc-1.88-undefined-symbol
+%patch -P144 -p1 -b .rust-1.88-undefined-symbol
%endif
%patch -P145 -p1 -R -b .use-system-rustc
%if 0%{?rhel} == 9
%patch -P146 -p1 -b .el9-python-3.9-build-error
-%patch -P147 -p1 -b .el9-rust-1.88-build-error
%endif
%patch -P150 -p1 -b .qt6
@@ -1179,7 +1178,7 @@ Qt6 UI for chromium.
%patch -P358 -p1 -b .rust-clang_lib
-%if 0%{?fedora} > 41 || 0%{?rhel} > 10
+%if 0%{?fedora} > 41 || (0%{?rhel} == 10 && 0%{?rhel_minor_version} > 2)
%patch -P359 -p1 -b .ftbfs-with-rustc-1.95
%endif
reply other threads:[~2026-08-07 16:09 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178611894189.1.18391494110184381774.rpms-chromium-30a92a502032@fedoraproject.org \
--to=than@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox