From e78a18fe12dad9f8764a154ea836099918398a79 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Mon, 25 Sep 2023 15:14:40 +0200
Subject: [PATCH] Update to 118.0

---
 .gitignore         |  2 ++
 firefox.spec       | 11 +++++----
 rhbz-2235654.patch | 59 ----------------------------------------------
 sources            |  4 ++--
 4 files changed, 10 insertions(+), 66 deletions(-)
 delete mode 100644 rhbz-2235654.patch

diff --git a/.gitignore b/.gitignore
index b05d5e0..fae9006 100644
--- a/.gitignore
+++ b/.gitignore
@@ -597,3 +597,5 @@ firefox-3.6.4.source.tar.bz2
 /firefox-langpacks-117.0-20230828.tar.xz
 /firefox-117.0.1.source.tar.xz
 /firefox-langpacks-117.0.1-20230913.tar.xz
+/firefox-118.0.source.tar.xz
+/firefox-langpacks-118.0-20230925.tar.xz
diff --git a/firefox.spec b/firefox.spec
index 1bfba1a..81d814f 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -159,13 +159,13 @@ ExcludeArch: i686
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        117.0.1
-Release:        2%{?pre_tag}%{?dist}
+Version:        118.0
+Release:        1%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Source0:        https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
 %if %{with langpacks}
-Source1:        firefox-langpacks-%{version}%{?pre_version}-20230913.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20230925.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source10:       firefox-mozconfig
@@ -235,7 +235,6 @@ Patch231:        fedora-customization.patch
 Patch402:        mozilla-1196777.patch
 Patch407:        mozilla-1667096.patch
 Patch408:        D167159.diff
-Patch409:        rhbz-2235654.patch
 
 # PGO/LTO patches
 Patch600:        pgo.patch
@@ -510,7 +509,6 @@ This package contains results of tests executed during build.
 %patch402 -p1 -b .1196777
 %patch407 -p1 -b .1667096
 %patch408 -p1 -b .D167159
-%patch409 -p1 -b .rhbz-2235654
 
 # PGO patches
 %if %{build_with_pgo}
@@ -1073,6 +1071,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Sep 25 2023 Martin Stransky <stransky@redhat.com>- 118.0-1
+- Updated to 118.0
+
 * Thu Sep 14 2023 Adam Williamson <awilliam@redhat.com> - 117.0.1-2
 - Pass --with-clang-path to fix build with clang 17 (rhbz#2239047)
 
diff --git a/rhbz-2235654.patch b/rhbz-2235654.patch
deleted file mode 100644
index 0c3780c..0000000
--- a/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/sources b/sources
index faef187..66c6ff0 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (cbindgen-vendor.tar.xz) = 0d45c1decfd7aaee853748745c9f5a907c0c6a0cf809c2387aac1cdcf680b0844b1ef4d05148e0527de4ff6e4d4666110bea317bd00b7d73a1210eb58a815563
 SHA512 (mochitest-python.tar.gz) = 089b1593068b76f4572af0086eaccf52a6a1299bfffb58593206d19bf021ae381f2380bbfeb4371586cd53706ff6dde3d240238b2caf19b96c57dfc2f4524e36
-SHA512 (firefox-117.0.1.source.tar.xz) = 1583b0ad3b3b17c59bfbfb3e416074766327d0b926ef4f6c6b1e3b2d7cf6a18dec592b7d17fab9493ba1506f3540a02277096d28616dd29b6e7b9e93905f2071
-SHA512 (firefox-langpacks-117.0.1-20230913.tar.xz) = 0481c91bf1d99bf2cb76bb26903b95e23582d57f67b03f356663fbdfdeeec462088ca8b7316c7557b10da0ec7c58c0fb26e3ebe489085043a676b2376f55506b
+SHA512 (firefox-118.0.source.tar.xz) = 7c34c43930bda84d17a241fe7e0f8e6ca262410423ae7e7cc8444224aea2d25a52acc9079064ba57f3350e3573eb23aeaf7a2d98136d17e6fa89a61aaf57155d
+SHA512 (firefox-langpacks-118.0-20230925.tar.xz) = 5a51a9843fba00779e718649154ea484ec3787fffcbb787a2f172bd7a1be99a87588abae17c1b38f9fb76c1d0e27fb453d1766285107a5b363bba047daae2579