Notification time stamped 2023-10-31 19:59:01 UTC
From 6253ffe421a5157356d6a0eff43ad7942aea3264 Mon Sep 17 00:00:00 2001
From: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Oct 29 2023 20:47:42 +0000
Subject: Remove old patch
---
diff --git a/icecat-rhbz-2235654.patch b/icecat-rhbz-2235654.patch
deleted file mode 100644
index 0c3780c..0000000
--- a/icecat-rhbz-2235654.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -up firefox-117.0/media/ffvpx/libavcodec/x86/mathops.h.gccfailure
firefox-117.0/media/ffvpx/libavcodec/x86/mathops.h
---- firefox-117.0/media/ffvpx/libavcodec/x86/mathops.h.gccfailure 2023-08-24
20:33:54.000000000 +0200
-+++ firefox-117.0/media/ffvpx/libavcodec/x86/mathops.h 2023-08-30 13:04:56.174949736
+0200
-@@ -35,12 +35,20 @@
- static av_always_inline av_const int MULL(int a, int b, unsigned shift)
- {
- int rt, dummy;
-+ if (__builtin_constant_p(shift))
- __asm__ (
- "imull %3 \n\t"
- "shrdl %4, %%edx, %%eax \n\t"
- :"=a"(rt), "=d"(dummy)
-- :"a"(a), "rm"(b), "ci"((uint8_t)shift)
-+ :"a"(a), "rm"(b), "i"(shift & 0x1F)
- );
-+ else
-+ __asm__ (
-+ "imull %3 \n\t"
-+ "shrdl %4, %%edx, %%eax \n\t"
-+ :"=a"(rt), "=d"(dummy)
-+ :"a"(a), "rm"(b), "c"((uint8_t)shift)
-+ );
- return rt;
- }
-
-@@ -113,19 +121,31 @@ __asm__ volatile(\
- // avoid +32 for shift optimization (gcc should do that ...)
- #define NEG_SSR32 NEG_SSR32
- static inline int32_t NEG_SSR32( int32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("sarl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("sarl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
- #define NEG_USR32 NEG_USR32
- static inline uint32_t NEG_USR32(uint32_t a, int8_t s){
-+ if (__builtin_constant_p(s))
- __asm__ ("shrl %1, %0\n\t"
- : "+r" (a)
-- : "ic" ((uint8_t)(-s))
-+ : "i" (-s & 0x1F)
- );
-+ else
-+ __asm__ ("shrl %1, %0\n\t"
-+ : "+r" (a)
-+ : "c" ((uint8_t)(-s))
-+ );
- return a;
- }
-
diff --git a/icecat.spec b/icecat.spec
index 0b29079..33026fd 100644
--- a/icecat.spec
+++ b/icecat.spec
@@ -176,7 +176,6 @@ Patch220: firefox-nss-version.patch
Patch221: firefox-nss-addon-hack.patch
Patch223: %{name}-glibc-dynstack.patch
Patch224: %{name}-GLIBCXX-fix-for-GCC-12.patch
-Patch227: %{name}-rhbz-2235654.patch
# ARM run-time patch
Patch226: rhbz-1354671.patch
@@ -367,7 +366,6 @@ tar -xf %{SOURCE5}
%patch -P 221 -p 1 -b .firefox-nss-addon-hack
%endif
%patch -P 224 -p 1 -b .glibcxx
-%patch -P 227 -p 1 -b .backup
# ARM run-time patch
%ifarch aarch64
https://src.fedoraproject.org/rpms/icecat/c/6253ffe421a5157356d6a0eff43ad...