[rpms/chromium] epel9-next: Backport fix for build failure with clang-21

[rpms/chromium] epel9-next: Backport fix for build failure with clang-21

[Tom Stellard]

A new commit has been pushed.

Repo   : rpms/chromium
Branch : epel9-next
Commit : 81b49fd649dbebe3f7de3e7ff2126fc9b64b50ea
Author : Tom Stellard <tstellar@redhat.com>
Date   : 2025-08-04T23:05:03+00:00
Stats  : +52/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/chromium/c/81b49fd649dbebe3f7de3e7ff2126fc9b64b50ea?branch=epel9-next

Log:
Backport fix for build failure with clang-21

---
diff --git a/b0ff8c3b258a8816c05bdebf472dbba719d3c491.patch b/b0ff8c3b258a8816c05bdebf472dbba719d3c491.patch
new file mode 100644
index 0000000..e19b0f6
--- /dev/null
+++ b/b0ff8c3b258a8816c05bdebf472dbba719d3c491.patch
@@ -0,0 +1,45 @@
+From b0ff8c3b258a8816c05bdebf472dbba719d3c491 Mon Sep 17 00:00:00 2001
+From: Hans Wennborg <hans@chromium.org>
+Date: Tue, 10 Jun 2025 09:51:47 -0700
+Subject: [PATCH] Don't return an enum from EnumSizeTraits::Count
+
+`Enum::kMaxValue + 1` may be outside the representable range of the
+enum, which Clang will treat as an error in constexpr contexts (see
+bug).
+
+Bug: 423841920
+Change-Id: I629402cf93bd8419a71f94ff9ed9340d4f88a706
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6633292
+Auto-Submit: Hans Wennborg <hans@chromium.org>
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Commit-Queue: Hans Wennborg <hans@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#1471871}
+---
+ base/metrics/histogram_macros_internal.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/base/metrics/histogram_macros_internal.h b/base/metrics/histogram_macros_internal.h
+index 39b232bc1023b8..daa5515c2ab357 100644
+--- a/base/metrics/histogram_macros_internal.h
++++ b/base/metrics/histogram_macros_internal.h
+@@ -28,16 +28,16 @@ namespace base::internal {
+ template <typename Enum>
+   requires(std::is_enum_v<Enum>)
+ struct EnumSizeTraits {
+-  static constexpr Enum Count() {
++  static constexpr uintmax_t Count() {
+     if constexpr (requires { Enum::kMaxValue; }) {
+       // Since the UMA histogram macros expect a value one larger than the max
+       // defined enumerator value, add one.
+-      return static_cast<Enum>(base::to_underlying(Enum::kMaxValue) + 1);
++      return static_cast<uintmax_t>(base::to_underlying(Enum::kMaxValue) + 1);
+     } else {
+       static_assert(
+           sizeof(Enum) == 0,
+           "enumerator must define kMaxValue enumerator to use this macro!");
+-      return Enum();
++      return 0;
+     }
+   }
+ };

diff --git a/chromium.spec b/chromium.spec
index 17189ff..e6f98cf 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -245,7 +245,7 @@
 
 Name:	chromium
 Version: 138.0.7204.183
-Release: 1%{?dist}
+Release: 2%{?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)
@@ -442,6 +442,9 @@ Patch510: 0001-Remove-unused-OpenSSL-config.patch
 Patch511: 0002-Fix-Missing-OPENSSL_NO_ENGINE-Guard.patch
 %endif
 
+# https://github.com/chromium/chromium/commit/b0ff8c3b258a8816c05bdebf472dbba719d3c491
+Patch512: b0ff8c3b258a8816c05bdebf472dbba719d3c491.patch
+
 # upstream patches
 
 # Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
@@ -1741,6 +1744,9 @@ fi
 %endif
 
 %changelog
+* Mon Aug 04 2025 Tom Stellard <tstellar@redhat.com> - 138.0.7204.183-2
+- Backport fix for build failure with clang-21
+
 * Wed Jul 30 2025 Than Ngo <than@redhat.com> - 138.0.7204.183-1
 - Update to 138.0.7204.183
   * CVE-2025-8292: Use after free in Media Stream