From 24387aba871659d891aeed990957be8a96e22e0b Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Wed, 23 Apr 2025 15:18:11 -0500 Subject: [PATCH] Remove s390x patch This patch is no longer required to build. Also, assign a patch number to the denormal disabler patch, because in RHEL 8 it's an error for more than one patch to lack a patch number. Related: RHEL-84089 --- s390x-build.patch | 13 ------------- webkit2gtk3.spec | 3 +-- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 s390x-build.patch diff --git a/s390x-build.patch b/s390x-build.patch deleted file mode 100644 index 839b74b..0000000 --- a/s390x-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Source/ThirdParty/ANGLE/src/common/mathutil.h b/Source/ThirdParty/ANGLE/src/common/mathutil.h -index 8f4579dc5611..4d981d4427bc 100644 ---- a/Source/ThirdParty/ANGLE/src/common/mathutil.h -+++ b/Source/ThirdParty/ANGLE/src/common/mathutil.h -@@ -550,7 +550,7 @@ inline R roundToNearest(T input) - { - static_assert(std::is_floating_point::value); - static_assert(std::numeric_limits::is_integer); --#if defined(__aarch64__) || defined(_M_ARM64) -+#if defined(__aarch64__) || defined(_M_ARM64) || defined(__s390x__) - // On armv8, this expression is compiled to a dedicated round-to-nearest instruction - return static_cast(std::round(input)); - #else diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 45629e1..f4b3b43 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -27,7 +27,6 @@ Source2: webkitgtk-keys.gpg ## Patch100: compiler-flags.patch -Patch101: s390x-build.patch ## ## Patches to support older or missing build dependencies @@ -50,7 +49,7 @@ Patch301: evolution-sandbox-warning.patch ## Upstream patches to remove, hopefully after next update ## -Patch: denormal-disabler-build.patch +Patch400: denormal-disabler-build.patch BuildRequires: bison BuildRequires: clang