[rpms/chromium] epel9-next: cleanup patches and specfile

[rpms/chromium] epel9-next: cleanup patches and specfile

[Than Ngo]

A new commit has been pushed.

Repo   : rpms/chromium
Branch : epel9-next
Commit : 42ab71af40342f1a68e9ace3174744a97372254e
Author : Than Ngo <than@redhat.com>
Date   : 2024-07-20T13:00:34+02:00
Stats  : +93/-142 in 8 file(s)
URL    : https://src.fedoraproject.org/rpms/chromium/c/42ab71af40342f1a68e9ace3174744a97372254e?branch=epel9-next

Log:
cleanup patches and specfile

---
diff --git a/chromium-120-system-libusb.patch b/chromium-120-system-libusb.patch
deleted file mode 100644
index 0c5bd59..0000000
--- a/chromium-120-system-libusb.patch
+++ /dev/null
@@ -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',

diff --git a/chromium-124-arm64-memory_tagging.patch b/chromium-124-arm64-memory_tagging.patch
deleted file mode 100644
index 3a3766a..0000000
--- a/chromium-124-arm64-memory_tagging.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up chromium-124.0.6367.60/base/allocator/partition_allocator/partition_alloc.gni.me chromium-124.0.6367.60/base/allocator/partition_allocator/partition_alloc.gni
---- chromium-124.0.6367.60/base/allocator/partition_allocator/partition_alloc.gni.me	2024-04-18 15:12:34.007397489 +0200
-+++ chromium-124.0.6367.60/base/allocator/partition_allocator/partition_alloc.gni	2024-04-18 15:13:06.166051954 +0200
-@@ -32,8 +32,7 @@ if (is_nacl) {
- # Increases the size of the empty slot span ring.
- use_large_empty_slot_span_ring = is_mac
- 
--has_memory_tagging =
--    current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android)
-+has_memory_tagging = false
- 
- declare_args() {
-   # Causes all the allocations to be routed via allocator_shim.cc. Usually,

diff --git a/chromium-124-el8-arm64-memory_tagging.patch b/chromium-124-el8-arm64-memory_tagging.patch
new file mode 100644
index 0000000..3a3766a
--- /dev/null
+++ b/chromium-124-el8-arm64-memory_tagging.patch
@@ -0,0 +1,13 @@
+diff -up chromium-124.0.6367.60/base/allocator/partition_allocator/partition_alloc.gni.me chromium-124.0.6367.60/base/allocator/partition_allocator/partition_alloc.gni
+--- chromium-124.0.6367.60/base/allocator/partition_allocator/partition_alloc.gni.me	2024-04-18 15:12:34.007397489 +0200
++++ chromium-124.0.6367.60/base/allocator/partition_allocator/partition_alloc.gni	2024-04-18 15:13:06.166051954 +0200
+@@ -32,8 +32,7 @@ if (is_nacl) {
+ # Increases the size of the empty slot span ring.
+ use_large_empty_slot_span_ring = is_mac
+ 
+-has_memory_tagging =
+-    current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android)
++has_memory_tagging = false
+ 
+ declare_args() {
+   # Causes all the allocations to be routed via allocator_shim.cc. Usually,

diff --git a/chromium-124-el8-libdav1d-aarch64.patch b/chromium-124-el8-libdav1d-aarch64.patch
new file mode 100644
index 0000000..03862e9
--- /dev/null
+++ b/chromium-124-el8-libdav1d-aarch64.patch
@@ -0,0 +1,53 @@
+--- chromium-124.0.6367.60/third_party/dav1d/libdav1d/src/arm/asm.S	2024-04-15 22:34:36.000000000 +0200
++++ chromium-122.0.6261.128/third_party/dav1d/libdav1d/src/arm/asm.S	2024-03-13 00:38:27.000000000 +0100
+@@ -34,50 +34,6 @@
+ #define x18 do_not_use_x18
+ #define w18 do_not_use_w18
+ 
+-#if HAVE_AS_ARCH_DIRECTIVE
+-        .arch AS_ARCH_LEVEL
+-#endif
+-
+-#if HAVE_AS_ARCHEXT_DOTPROD_DIRECTIVE
+-#define ENABLE_DOTPROD  .arch_extension dotprod
+-#define DISABLE_DOTPROD .arch_extension nodotprod
+-#else
+-#define ENABLE_DOTPROD
+-#define DISABLE_DOTPROD
+-#endif
+-#if HAVE_AS_ARCHEXT_I8MM_DIRECTIVE
+-#define ENABLE_I8MM  .arch_extension i8mm
+-#define DISABLE_I8MM .arch_extension noi8mm
+-#else
+-#define ENABLE_I8MM
+-#define DISABLE_I8MM
+-#endif
+-#if HAVE_AS_ARCHEXT_SVE_DIRECTIVE
+-#define ENABLE_SVE  .arch_extension sve
+-#define DISABLE_SVE .arch_extension nosve
+-#else
+-#define ENABLE_SVE
+-#define DISABLE_SVE
+-#endif
+-#if HAVE_AS_ARCHEXT_SVE2_DIRECTIVE
+-#define ENABLE_SVE2  .arch_extension sve2
+-#define DISABLE_SVE2 .arch_extension nosve2
+-#else
+-#define ENABLE_SVE2
+-#define DISABLE_SVE2
+-#endif
+-
+-/* If we do support the .arch_extension directives, disable support for all
+- * the extensions that we may use, in case they were implicitly enabled by
+- * the .arch level. This makes it clear if we try to assemble an instruction
+- * from an unintended extension set; we only allow assmbling such instructions
+- * within regions where we explicitly enable those extensions. */
+-DISABLE_DOTPROD
+-DISABLE_I8MM
+-DISABLE_SVE
+-DISABLE_SVE2
+-
+-
+ /* Support macros for
+  *   - Armv8.3-A Pointer Authentication and
+  *   - Armv8.5-A Branch Target Identification

diff --git a/chromium-124-libdav1d-aarch64.patch b/chromium-124-libdav1d-aarch64.patch
deleted file mode 100644
index 03862e9..0000000
--- a/chromium-124-libdav1d-aarch64.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- chromium-124.0.6367.60/third_party/dav1d/libdav1d/src/arm/asm.S	2024-04-15 22:34:36.000000000 +0200
-+++ chromium-122.0.6261.128/third_party/dav1d/libdav1d/src/arm/asm.S	2024-03-13 00:38:27.000000000 +0100
-@@ -34,50 +34,6 @@
- #define x18 do_not_use_x18
- #define w18 do_not_use_w18
- 
--#if HAVE_AS_ARCH_DIRECTIVE
--        .arch AS_ARCH_LEVEL
--#endif
--
--#if HAVE_AS_ARCHEXT_DOTPROD_DIRECTIVE
--#define ENABLE_DOTPROD  .arch_extension dotprod
--#define DISABLE_DOTPROD .arch_extension nodotprod
--#else
--#define ENABLE_DOTPROD
--#define DISABLE_DOTPROD
--#endif
--#if HAVE_AS_ARCHEXT_I8MM_DIRECTIVE
--#define ENABLE_I8MM  .arch_extension i8mm
--#define DISABLE_I8MM .arch_extension noi8mm
--#else
--#define ENABLE_I8MM
--#define DISABLE_I8MM
--#endif
--#if HAVE_AS_ARCHEXT_SVE_DIRECTIVE
--#define ENABLE_SVE  .arch_extension sve
--#define DISABLE_SVE .arch_extension nosve
--#else
--#define ENABLE_SVE
--#define DISABLE_SVE
--#endif
--#if HAVE_AS_ARCHEXT_SVE2_DIRECTIVE
--#define ENABLE_SVE2  .arch_extension sve2
--#define DISABLE_SVE2 .arch_extension nosve2
--#else
--#define ENABLE_SVE2
--#define DISABLE_SVE2
--#endif
--
--/* If we do support the .arch_extension directives, disable support for all
-- * the extensions that we may use, in case they were implicitly enabled by
-- * the .arch level. This makes it clear if we try to assemble an instruction
-- * from an unintended extension set; we only allow assmbling such instructions
-- * within regions where we explicitly enable those extensions. */
--DISABLE_DOTPROD
--DISABLE_I8MM
--DISABLE_SVE
--DISABLE_SVE2
--
--
- /* Support macros for
-  *   - Armv8.3-A Pointer Authentication and
-  *   - Armv8.5-A Branch Target Identification

diff --git a/chromium-126-el8-ifunc-header.patch b/chromium-126-el8-ifunc-header.patch
new file mode 100644
index 0000000..72368df
--- /dev/null
+++ b/chromium-126-el8-ifunc-header.patch
@@ -0,0 +1,15 @@
+diff -up chromium-126.0.6478.55/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h.me chromium-126.0.6478.55/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h
+--- chromium-126.0.6478.55/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h.me	2024-06-12 13:09:47.539620293 -0400
++++ chromium-126.0.6478.55/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h	2024-06-12 13:12:10.570739701 -0400
+@@ -10,9 +10,11 @@
+ #include "partition_alloc/build_config.h"
+ #include "partition_alloc/partition_alloc_buildflags.h"
+ 
++#if 0
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+ #define HAS_HW_CAPS
+ #endif
++#endif
+ 
+ #if defined(ARCH_CPU_ARM64) && defined(HAS_HW_CAPS)
+ #include <asm/hwcap.h>

diff --git a/chromium-126-ifunc-header.patch b/chromium-126-ifunc-header.patch
deleted file mode 100644
index 72368df..0000000
--- a/chromium-126-ifunc-header.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up chromium-126.0.6478.55/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h.me chromium-126.0.6478.55/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h
---- chromium-126.0.6478.55/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h.me	2024-06-12 13:09:47.539620293 -0400
-+++ chromium-126.0.6478.55/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h	2024-06-12 13:12:10.570739701 -0400
-@@ -10,9 +10,11 @@
- #include "partition_alloc/build_config.h"
- #include "partition_alloc/partition_alloc_buildflags.h"
- 
-+#if 0
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
- #define HAS_HW_CAPS
- #endif
-+#endif
- 
- #if defined(ARCH_CPU_ARM64) && defined(HAS_HW_CAPS)
- #include <asm/hwcap.h>

diff --git a/chromium.spec b/chromium.spec
index 7668763..8a54b03 100644
--- a/chromium.spec
+++ b/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}=' {} +