[rpms/chromium] epel9-next: - Remove old patches for clang18 as epel-8/9/10 and fedora already have clang >=19.x

[rpms/chromium] epel9-next: - Remove old patches for clang18 as epel-8/9/10 and fedora already have clang >=19.x

[Than Ngo]

            A new commit has been pushed.

            Repo   : rpms/chromium
            Branch : epel9-next
            Commit : 0441c746f053c6e6d49d67259e2d8a0f45064055
            Author : Than Ngo <than@redhat.com>
            Date   : 2025-05-28T11:58:10+02:00
            Stats  : +33/-44 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/chromium/c/0441c746f053c6e6d49d67259e2d8a0f45064055?branch=epel9-next

            Log:
            - Remove old patches for clang18 as epel-8/9/10 and fedora already have clang >=19.x
- Fix FTBFS caused by an unknown argument (clang < 20.x)

---
diff --git a/chromium-132-el8-clang18-build-error.patch b/chromium-132-el8-clang18-build-error.patch
deleted file mode 100644
index 05b2603..0000000
--- a/chromium-132-el8-clang18-build-error.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up chromium-132.0.6834.57/pdf/pdfium/pdfium_api_wrappers.cc.me chromium-132.0.6834.57/pdf/pdfium/pdfium_api_wrappers.cc
---- chromium-132.0.6834.57/pdf/pdfium/pdfium_api_wrappers.cc.me	2025-01-10 11:17:44.598459092 +0100
-+++ chromium-132.0.6834.57/pdf/pdfium/pdfium_api_wrappers.cc	2025-01-10 11:18:55.910222909 +0100
-@@ -147,7 +147,7 @@ std::u16string GetPageObjectMarkName(FPD
- 
-   // Number of characters, including the NUL.
-   const size_t expected_size = base::checked_cast<size_t>(buflen_bytes / 2);
--  PDFiumAPIStringBufferAdapter adapter(&name, expected_size,
-+  PDFiumAPIStringBufferAdapter<std::u16string> adapter(&name, expected_size,
-                                        /*check_expected_size=*/true);
-   unsigned long actual_buflen_bytes = 0;  // NOLINT(runtime/int)
-   bool result =

diff --git a/chromium-133-clang18-template.patch b/chromium-133-clang18-template.patch
deleted file mode 100644
index f95aa57..0000000
--- a/chromium-133-clang18-template.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up chromium-133.0.6943.53/chrome/browser/compose/compose_session.cc.me chromium-133.0.6943.53/chrome/browser/compose/compose_session.cc
---- chromium-133.0.6943.53/chrome/browser/compose/compose_session.cc.me	2025-02-10 14:16:34.810693753 +0100
-+++ chromium-133.0.6943.53/chrome/browser/compose/compose_session.cc	2025-02-10 14:16:39.747791800 +0100
-@@ -543,7 +543,7 @@ void ComposeSession::RequestWithSession(
-   // execution in case request fails.
-   compose::LogComposeRequestReason(request_reason);
- 
--  optimization_guide::ModelExecutionSessionCallbackWithLogging callback =
-+  optimization_guide::ModelExecutionSessionCallbackWithLogging<optimization_guide::proto::ComposeLoggingData> callback =
-       base::BindRepeating(&ComposeSession::ModelExecutionCallback,
-                           weak_ptr_factory_.GetWeakPtr(),
-                           std::move(request_timer), request_id_, request_reason,

diff --git a/chromium-136-cnnpack-clang18-crash-x86_64.patch b/chromium-136-cnnpack-clang18-crash-x86_64.patch
deleted file mode 100644
index f725834..0000000
--- a/chromium-136-cnnpack-clang18-crash-x86_64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up chromium-136.0.7103.59/third_party/xnnpack/BUILD.gn.than chromium-136.0.7103.59/third_party/xnnpack/BUILD.gn
---- chromium-136.0.7103.59/third_party/xnnpack/BUILD.gn.than	2025-04-30 17:40:49.303107833 +0200
-+++ chromium-136.0.7103.59/third_party/xnnpack/BUILD.gn	2025-04-30 17:51:06.934912263 +0200
-@@ -28,6 +28,7 @@ config("xnnpack_config") {
-   cflags = [
-     "-Wno-unused-function",
-     "-Wno-deprecated-comma-subscript",
-+    "-O0",
-   ]
- 
-   defines = [

diff --git a/chromium-137-clang++-unknown-argument.patch b/chromium-137-clang++-unknown-argument.patch
new file mode 100644
index 0000000..6255729
--- /dev/null
+++ b/chromium-137-clang++-unknown-argument.patch
@@ -0,0 +1,27 @@
+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.spec b/chromium.spec
index fe3d7ce..c1b0827 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -329,8 +329,6 @@ Patch307: chromium-134-el8-atk-compiler-error.patch
 # Fix build errors due to old clang18 in el8
 Patch308: chromium-136-unsupport-clang-flags.patch
 Patch309: chromium-132-el8-unsupport-rustc-flags.patch
-Patch310: chromium-132-el8-clang18-build-error.patch
-Patch311: chromium-133-clang18-template.patch
 
 # enable fstack-protector-strong
 Patch312: chromium-123-fstack-protector-strong.patch
@@ -349,8 +347,8 @@ Patch315: chromium-134-rust-libadler2.patch
 # add -ftrivial-auto-var-init=zero and -fwrapv
 Patch316: chromium-122-clang-build-flags.patch
 
-# Workaround for clang crash due to old clang-18.x on x86_64 el9/fedora40
-Patch317: chromium-136-cnnpack-clang18-crash-x86_64.patch
+# Fix FTBFS, clang++: error: unknown argument: '-fextend-variable-liveness=none'
+Patch317: chromium-137-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
@@ -1048,12 +1046,7 @@ Qt6 UI for chromium.
 %patch -P307 -p1 -b .el8-atk-compiler-error
 %patch -P308 -p1 -b .unsupport-clang-flags
 %patch -P309 -p1 -b .el8-unsupport-rustc-flags
-%patch -P310 -p1 -b .el8-clang18-build-error
-%patch -P311 -p1 -b .clang18-template
 %patch -P314 -p1 -b .rust-skrifa-build-error
-%ifarch x86_64
-%patch -P317 -p1 -b .xnnpack-clang18-crash-x86_64
-%endif
 %endif
 
 %patch -P312 -p1 -b .fstack-protector-strong
@@ -1069,6 +1062,10 @@ Qt6 UI for chromium.
 %endif
 %patch -P316 -p1 -b .clang-build-flags
 
+%if 0%{?fedora} > 41 || 0%{?rhel} > 9
+%patch -P317 -p1 -b .clang++-unsupported-argument
+%endif
+
 %if %{disable_bti}
 %patch -P352 -p1 -b .workaround_for_crash_on_BTI_capable_system
 %endif