[rpms/chromium] epel9-next: - FTBFS, Refreshed chromium-clang++-unknown-argument.patch

[Than Ngo <than@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/chromium
            Branch : epel9-next
            Commit : 30e01f66d04db8663adad277991a9439a534083a
            Author : Than Ngo <than@redhat.com>
            Date   : 2025-06-25T09:11:52+02:00
            Stats  : +17/-31 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/chromium/c/30e01f66d04db8663adad277991a9439a534083a?branch=epel9-next

            Log:
            - FTBFS, Refreshed chromium-clang++-unknown-argument.patch
- FTBFS, Refreshed memory-allocator-dcheck-assert-fix.patch

---
diff --git a/chromium-137-clang++-unknown-argument.patch b/chromium-137-clang++-unknown-argument.patch
deleted file mode 100644
index 6255729..0000000
--- a/chromium-137-clang++-unknown-argument.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -up chromium-137.0.7151.55/build/config/compiler/BUILD.gn.me chromium-137.0.7151.55/build/config/compiler/BUILD.gn
---- chromium-137.0.7151.55/build/config/compiler/BUILD.gn.me	2025-05-28 11:19:37.795916619 +0200
-+++ chromium-137.0.7151.55/build/config/compiler/BUILD.gn	2025-05-28 11:22:56.845410531 +0200
-@@ -623,13 +623,6 @@ config("compiler") {
-         default_toolchain != "//build/toolchain/cros:target") {
-       cflags += [ "-Wa,--crel,--allow-experimental-crel" ]
-     }
--
--    # TODO(crbug.com/413427035): Remove once
--    # https://github.com/llvm/llvm-project/pull/136867/ is landed.
--    if (!is_win && !llvm_android_mainline &&
--        default_toolchain != "//build/toolchain/cros:target") {
--      cflags += [ "-fextend-variable-liveness=none" ]
--    }
-   }
- 
-   # C11/C++11 compiler flags setup.
-@@ -2053,9 +2046,6 @@ config("default_warnings") {
- 
-         # TODO(crbug.com/40284799): Fix and re-enable.
-         "-Wno-thread-safety-reference-return",
--
--        # TODO(crbug.com/376641662): Fix and re-enable.
--        "-Wno-nontrivial-memcall",
-       ]
- 
-       cflags_cc += [

diff --git a/chromium-138-clang++-unknown-argument.patch b/chromium-138-clang++-unknown-argument.patch
new file mode 100644
index 0000000..00209fd
--- /dev/null
+++ b/chromium-138-clang++-unknown-argument.patch
@@ -0,0 +1,13 @@
+diff -up chromium-137.0.7151.55/build/config/compiler/BUILD.gn.me chromium-137.0.7151.55/build/config/compiler/BUILD.gn
+--- chromium-137.0.7151.55/build/config/compiler/BUILD.gn.me	2025-05-28 11:19:37.795916619 +0200
++++ chromium-137.0.7151.55/build/config/compiler/BUILD.gn	2025-05-28 11:22:56.845410531 +0200
+@@ -2053,9 +2046,6 @@ config("default_warnings") {
+ 
+         # TODO(crbug.com/40284799): Fix and re-enable.
+         "-Wno-thread-safety-reference-return",
+-
+-        # TODO(crbug.com/376641662): Fix and re-enable.
+-        "-Wno-nontrivial-memcall",
+       ]
+ 
+       cflags_cc += [

diff --git a/chromium.spec b/chromium.spec
index 63953e2..88e310c 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -326,8 +326,8 @@ Patch315: chromium-134-rust-libadler2.patch
 # add -ftrivial-auto-var-init=zero and -fwrapv
 Patch316: chromium-122-clang-build-flags.patch
 
-# Fix FTBFS, clang++: error: unknown argument: '-fextend-variable-liveness=none'
-Patch317: chromium-137-clang++-unknown-argument.patch
+# unknown warning option -Wno-nontrivial-memcall
+Patch317: chromium-138-clang++-unknown-argument.patch
 
 # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2239523
 # https://bugs.chromium.org/p/chromium/issues/detail?id=1145581#c60

diff --git a/memory-allocator-dcheck-assert-fix.patch b/memory-allocator-dcheck-assert-fix.patch
index 002f5db..5b02e1d 100644
--- a/memory-allocator-dcheck-assert-fix.patch
+++ b/memory-allocator-dcheck-assert-fix.patch
@@ -6,7 +6,7 @@ Index: chromium-127.0.6533.88/base/allocator/partition_allocator/src/partition_a
         partition_page_count <= kMaxPartitionPagesPerRegularSlotSpan;
         partition_page_count++) {
      size_t candidate_size = partition_page_count * PartitionPageSize();
-+    if (candidate_size > kMaxBucketed) {
++    if (candidate_size > BucketIndexLookup::kMaxBucketSize) {
 +      break;
 +    }
      size_t waste = candidate_size % slot_size;
@@ -16,7 +16,7 @@ Index: chromium-127.0.6533.88/base/allocator/partition_allocator/src/partition_a
        size_t system_page_count =
            partition_page_count * NumSystemPagesPerPartitionPage() - slack;
        size_t candidate_size = system_page_count * SystemPageSize();
-+      if (candidate_size > kMaxBucketed) {
++      if (candidate_size > BucketIndexLookup::kMaxBucketSize) {
 +        continue;
 +      }
        size_t waste = candidate_size % slot_size;