cleanup patches and specfile

chromium-120-system-libusb.patch

@@ -1,42 +0,0 @@
-diff -up chromium-120.0.6099.35/build/linux/unbundle/libusb.gn.system-libusb chromium-120.0.6099.35/build/linux/unbundle/libusb.gn
---- chromium-120.0.6099.35/build/linux/unbundle/libusb.gn.system-libusb	2023-11-22 20:31:32.000000000 +0100
-+++ chromium-120.0.6099.35/build/linux/unbundle/libusb.gn	2023-11-26 11:46:14.559263668 +0100
-@@ -1,3 +1,27 @@
-+# Copyright 2016 The Chromium Authors. All rights reserved.
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+import("//build/config/linux/pkg_config.gni")
-+import("//build/shim_headers.gni")
-+
-+pkg_config("system_libusb") {
-+  packages = [ "libusb-1.0" ]
-+}
-+
-+shim_headers("libusb_shim") {
-+  root_path = "src/libusb"
-+  headers = [
-+    "libusb.h",
-+  ]
-+}
-+
-+source_set("libusb") {
-+  deps = [
-+    ":libusb_shim",
-+  ]
-+  public_configs = [ ":system_libusb" ]
-+}
- import("//build/config/linux/pkg_config.gni")
- import("//build/shim_headers.gni")
- 
-diff -up chromium-120.0.6099.35/build/linux/unbundle/replace_gn_files.py.system-libusb chromium-120.0.6099.35/build/linux/unbundle/replace_gn_files.py
---- chromium-120.0.6099.35/build/linux/unbundle/replace_gn_files.py.system-libusb	2023-11-26 11:46:14.559263668 +0100
-+++ chromium-120.0.6099.35/build/linux/unbundle/replace_gn_files.py	2023-11-26 12:05:20.542665877 +0100
-@@ -56,6 +56,7 @@ REPLACEMENTS = {
-   'libevent': 'third_party/libevent/BUILD.gn',
-   'libjpeg': 'third_party/libjpeg.gni',
-   'libpng': 'third_party/libpng/BUILD.gn',
-+  'libusb': 'third_party/libusb/BUILD.gn',
-   'libsecret' : 'third_party/libsecret/BUILD.gn',
-   'libusb': 'third_party/libusb/BUILD.gn',
-   'libvpx': 'third_party/libvpx/BUILD.gn',

chromium.spec

@@ -372,10 +372,14 @@ Patch141: chromium-118-dma_buf_export_sync_file-conflict.patch
 # add correct path for Qt6Gui header and libs
 Patch150: chromium-124-qt6.patch
 
-# disable memory tagging in epel7 and epel8 on aarch64 due to new feature IFUNC-Resolver
-# not supported in old glibc < 2.30, error: fatal error: 'sys/ifunc.h' file not found
-Patch305: chromium-124-arm64-memory_tagging.patch
-Patch306: chromium-126-ifunc-header.patch
+# disable memory tagging (epel8 on aarch64) due to new feature IFUNC-Resolver
+# it is not supported in old glibc < 2.30, error: fatal error: 'sys/ifunc.h' file not found
+Patch305: chromium-124-el8-arm64-memory_tagging.patch
+Patch306: chromium-126-el8-ifunc-header.patch
+# build error: unknown architectural extension on aarch64 (epel8)
+Patch307: chromium-124-el8-libdav1d-aarch64.patch
+# 64kpage support on aarch64 (el8)
+Patch308: chromium-124-el8-support-64kpage.patch
 
 # enable fstack-protector-strong
 Patch312: chromium-123-fstack-protector-strong.patch
@@ -383,9 +387,6 @@ Patch312: chromium-123-fstack-protector-strong.patch
 # add -ftrivial-auto-var-init=zero and -fwrapv
 Patch316: chromium-122-clang-build-flags.patch
 
-# build error: unknown architectural extension on aarch64 (epel and < f39)
-Patch317: chromium-124-libdav1d-aarch64.patch
-
 # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2239523
 # https://bugs.chromium.org/p/chromium/issues/detail?id=1145581#c60
 # Disable BTI until this is fixed upstream.
@@ -1037,7 +1038,6 @@ Qt6 UI for chromium.
 ### Chromium Fedora Patches ###
 %patch -P0 -p1 -b .sandboxpie
 %patch -P1 -p1 -b .etc
-%patch -P2 -p1 -b .system-libusb
 %patch -P5 -p1 -b .nozlibmangle
 %patch -P6 -p1 -b .nounrar
 %patch -P8 -p1 -b .widevine-other-locations
@@ -1090,17 +1090,16 @@ Qt6 UI for chromium.
 
 %if 0%{?rhel} == 8
 %ifarch aarch64
-%patch -P305 -p1 -b .memory_tagging
-%patch -P306 -p1 -b .ifunc-header
-%patch -P317 -p1 -b .libdav1d-aarch64
+%patch -P305 -p1 -b .el8-memory_tagging
+%patch -P306 -p1 -b .el8-ifunc-header
+%patch -P307 -p1 -b .el8-libdav1d-aarch64
+%patch -P308 -p1 -b .el8-support-64kpage.patch
 %endif
 %endif
 
 %patch -P312 -p1 -b .fstack-protector-strong
 
-%if 0%{?rhel} >= 8 || 0%{?fedora}
 %patch -P316 -p1 -b .clang-build-flags
-%endif
 
 %if %{disable_bti}
 %patch -P352 -p1 -b .workaround_for_crash_on_BTI_capable_system
@@ -1178,12 +1177,6 @@ Qt6 UI for chromium.
 %patch -P413 -p1 -b .fix-unknown-warning-option-messages
 %endif
 
-%%ifarch aarch64
-%if 0%{?rhel} == 8
-%patch -P500 -p1 -b .el8-support-64kpage.patch
-%endif
-%endif
-
 # Change shebang in all relevant files in this directory and all subdirectories
 # See `man find` for how the `-exec command {} +` syntax works
 find -type f \( -iname "*.py" \) -exec sed -i '1s=^#! */usr/bin/\(python\|env python\)[23]\?=#!%{chromium_pybin}=' {} +