$ git diff --patch-with-stat --summary 08fa28bb03bc546baaaf204365d621551e697df8..ce9bb48471d5921b3f08cd45ad0b580986d1333f

 .abf.yml                          | 140 +++++++++++++++++++-------------------
 build-aarch64-skia.patch          |  54 +++++----------
 build-nspr.patch                  |  28 --------
 firefox-67.0-webrtc-compile.patch |  11 ---
 firefox-91-buildfixes.patch       |  21 ------
 firefox.spec                      |  35 ++++------
 mozilla-107.0.1-kde.patch         |  12 ++--
 mozilla-1667096.patch             |  32 ++++-----
 mozilla-1890593.patch             |  17 +++++
 9 files changed, 140 insertions(+), 210 deletions(-)
 delete mode 100644 build-nspr.patch
 delete mode 100644 firefox-67.0-webrtc-compile.patch
 delete mode 100644 firefox-91-buildfixes.patch
 create mode 100644 mozilla-1890593.patch

diff --git a/.abf.yml b/.abf.yml
index d2522d6..7f8b347 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,71 +1,71 @@
 sources:
-  af.xpi: 472d92176c99771ce601de10e4acdf652d2c88d6
-  ar.xpi: b25a018fd4a7e8883fbb8ffd65d06b374b9cd921
-  ast.xpi: fe12a46d9e178873001389510da878706ec44f5c
-  bg.xpi: 193ac83f5d809e57d2e06a9b7eb4da4d7680cc65
-  bn.xpi: 9f296cad1c79db7185a9f70352d2ea2e2329f389
-  br.xpi: 8aba43f8315ce24e74920d6eb9f9c8e43e004768
-  bs.xpi: e9e57235cf2bc51559a10f793fa404e00705898c
-  ca.xpi: 143c22306ca001359abc23883a40fb69d588e2c2
-  cs.xpi: 6cc0ca0d7e5387e40a691696cf4bf0df6c08da7c
-  cy.xpi: 015100f4514f681e261d9a05d658d37c7370ee0c
-  da.xpi: dc76ba6c4e093f4b26a936c5a6e4be8016e8e089
-  de.xpi: 9dd4de4bd0b0f89ae0f73a54cca272184096888d
-  el.xpi: ae102d61516b5a82a60abe4ff6468f2a9ede812c
-  en-GB.xpi: 7436c4ae64b71b094198b299a2c44a8b4120d696
-  eo.xpi: ea7374278c38b25a7af7d68ff490d8efec5e6ae6
-  es-AR.xpi: 55e822b15c6e818aae2aa7ce51d81b1ede92e46a
-  es-CL.xpi: 6311a824aed557773b5856d0796c12359310a523
-  es-ES.xpi: a3d4f67f53eb541bd21694aa868d725dce81934e
-  es-MX.xpi: 56dfaf0aaf5013dd3dd53537317c3242ff91124b
-  et.xpi: 5b0edada43c28669b769f8441ab69c5ddaee3285
-  eu.xpi: dcb48ad16ce27d181b9b9d2cd3c3a37a019ad42e
-  fa.xpi: 9d25ab0bfe01b3162887badc61d7015e521d0661
-  fi.xpi: dfacc821e999c0ae41347d211e1f50f95e613dfa
-  firefox-122.0.source.tar.xz: ff10b78b8254c8337f932b1f639a8f78c2ff2140
-  fr.xpi: c1ac35690c9f1850a2dbcba5250312882d72dd29
-  fy-NL.xpi: f9d5b5f8be38bfa4f1c8b131a3af9186e2088295
-  ga-IE.xpi: 6cf97dd73dd687e819790e12d2e95ccd8cd8be47
-  gd.xpi: e7c848a3ae6e5798c048a64e0f085472015ad097
-  gl.xpi: 9941b8f37fa0d934b78f250d5532bfab64e54bbd
-  gu-IN.xpi: c60837c3922ac2169bb0d234a3905abf7299bf35
-  he.xpi: 6664d6f67fcb6a1f2c85b9cd9b270cddd205461b
-  hi-IN.xpi: a35d13640f5301035eefbe9a96b70bcefd832fe4
-  hr.xpi: 9b0827a21a5139e75f069e39863b4b0c6c5d72bf
-  hu.xpi: 36485ab60a57d48288fab1989ed7c8d7ea9114ed
-  hy-AM.xpi: ebb2af25627cc7c99b573f5b7285597f8847546d
-  id.xpi: 114a46105eec67efb9491a251830ad56a192b36a
-  is.xpi: dca9e53eab24461b8e197313cf0d659ef0a6773e
-  it.xpi: 25dc229cd2a66d42790f012cfe4833373e24682e
-  ja.xpi: 4647b5a8c005a29fb8ee89ba39b3263e15989417
-  kk.xpi: a7bc4f28d6fc5ae3fb2e7feed8c7484b0f1bb4f0
-  km.xpi: a5d7dfd233fbe9d3090a03165d4a1a04c464c49b
-  kn.xpi: 69c9bd70ef13e4cbcc6db5b4d14b96812bc880b0
-  ko.xpi: 07d84f76b986f98810e9973e73bf41c6601dd1a8
-  lt.xpi: 93a27113202283dec1e3aaf616a9ebaf43611a1d
-  lv.xpi: ec262652f7c4cf38ca1cfdc0a080c89ee68db749
-  mk.xpi: 5b5d30a8e21bdab0eb603e517578578634fbfbd2
-  mr.xpi: 0b76154f78742660a66292f911c9821c79817c97
-  nb-NO.xpi: 38eaad6ee368c1990839ec67834e0f719605124b
-  nl.xpi: 943aa5e6b352da1d0b43561d29e37c6898a6077b
-  nn-NO.xpi: 0a11abc329789cb2ec3b4ba46de687059b8331b1
-  pa-IN.xpi: 91a400669e140910402d7bee9f5c38aaf7076366
-  pl.xpi: 5e78612886fcc6545bb0bb128a778098e26bdd03
-  pt-BR.xpi: 73cd641b10216af99c230901c238fa88de79b6aa
-  pt-PT.xpi: 6ea8754fc95df92ceae49ed4b6ecc2d0043ca66c
-  ro.xpi: a96b6f47007a42d39244ca50cd9c7dca23d1e986
-  ru.xpi: f43417c1c4aec98bfb6222fea080df443050c96f
-  si.xpi: 0e42da2eb070fa09b489d72d0a1314895e639176
-  sk.xpi: 7df8d10eea5d338eee27d9e3bc196dd90723a88c
-  sl.xpi: 02b6e8a2ef96d70cd08bfb0772049e461e4c5e84
-  sq.xpi: cbfa072c1ec8dcbf2704563b9d95629e82884300
-  sr.xpi: ed377412f37ce0165ec2ad3e10988462e862c084
-  sv-SE.xpi: 2a85ddf499a47c97eeb0da0db0d613fa3b6b540e
-  ta.xpi: 9204a1dccfdb71b9bedcd8c0b6e177c965979a1f
-  te.xpi: ef1c05df9161275019e7b112954cf61d96579c44
-  th.xpi: 97e1e2311d0191111340ebdb04d68e924bf754b0
-  tr.xpi: d1d7bc8c7c845d2d9318ac01a86b2511f99d850f
-  uk.xpi: 97efcbf37393539ae68a01578e4b5cfe831144c1
-  vi.xpi: cdf181b8a4ba4842c0476073ff8b2f3df23824a0
-  zh-CN.xpi: ec2f03b7920a50d0c7dbb6168db628885caec890
-  zh-TW.xpi: 8fe230ad9971f9e801f5d353217c98c785ede4c7
+  af.xpi: 0138434a9c799ce62379325e6d0f7af1bd5b439c
+  ar.xpi: 874b118486b64ad8900ae2ca03c448199679a8e1
+  ast.xpi: 95c4e967088f0bb76e86429df4bbf4494291b6c2
+  bg.xpi: 06f115ddb17403f962072f51abbdec9787e65a3e
+  bn.xpi: b7110196470ec2c4fe731c131d90c5e1fc50d92e
+  br.xpi: 8c9fad6cd804e70205411dc9171d87f49da69875
+  bs.xpi: f6835fb7436ad2097c4a79b2a8d249fc9b8e748e
+  ca.xpi: b881a9ad80e912d4b1d3cacc11eb21a731fcc492
+  cs.xpi: 86efa3ea24f01caf07760ebafe2be1cd6010e085
+  cy.xpi: b7705bad4ae9a0ee91523eccabf67e68ab673dab
+  da.xpi: 928d2c1d3e0274a17257f49c571b096636eefab4
+  de.xpi: 249870d7f36a189eb788e6d8cc68dc20f0841f08
+  el.xpi: 07f391bc2a6ba96f6853b58a668f2e3b14772f30
+  en-GB.xpi: 8fb79bc54f128fccd0cb314cfdb7a97cb279f8c1
+  eo.xpi: 6a3eb021d4a742ff65a39cc9f2eb0e40749d7f5e
+  es-AR.xpi: 9236e53a7a8129c7d96bb99e462a4ae8a9ac7838
+  es-CL.xpi: 2bed903f2b124e584ad0a24be155c03d540554f6
+  es-ES.xpi: 70c05f5dcc3ff386df63834fe7cc19ea745d20be
+  es-MX.xpi: 0e9e5731528108260e56b79a82a67b8a394d6713
+  et.xpi: 090f497b9b1d247507270fbad0aeb2c764ce3375
+  eu.xpi: 1d6b53861e1dc4aac57ffd41bde37b861c3a5e58
+  fa.xpi: fc9ffc5a3362929c7fa7966a491e9a28ae57d25e
+  fi.xpi: c0a6e51873bfa6fcfdfb1f0670c8928248b4c8a9
+  firefox-125.0.1.source.tar.xz: d545688ecd628fac8d84de762480475ba06894d9
+  fr.xpi: b308d4354adba6015cadf596f5bb5060588a1a0b
+  fy-NL.xpi: 272bed8a1ba76a8966b2438083ba2e7dc76bacbb
+  ga-IE.xpi: 911b05e43473734823122514a32b54a72b97cde6
+  gd.xpi: a2932042a481d19dc0125ab2bae8439b5ce7de26
+  gl.xpi: e7c7b125bd11fc4e0e9e5671b0cfeaedc35e3d5f
+  gu-IN.xpi: 6909f7cccbbc83cdb9d05924f427d722c1f3065d
+  he.xpi: 293f457272234c935561ca154349cf999adbf6a8
+  hi-IN.xpi: 4f4cd4abf6689882384df963df7240dd6d46e899
+  hr.xpi: 8e0b75072a1beda352cd9fcc83de0a9708365555
+  hu.xpi: 64715f30c3f06f3f4dd7a18d1fbee2805c80258e
+  hy-AM.xpi: cbef68e6191608dc8fd69e71bfb291aa293d4af6
+  id.xpi: fc1215065667e3854ac8bdb4085bd55ecf1ccd46
+  is.xpi: 376ee94b453a3c78f95f311040a08e267fb63e5c
+  it.xpi: 365a06a45f25d9604df6230e8bacb711e20ac3d6
+  ja.xpi: 4487269640d38befc74a972130c977a60b7f5167
+  kk.xpi: b3c6ee2ae1c2f58f062eb1c45faf42a6a4b6b1a5
+  km.xpi: 19ddf6d5f4a5bc921a2e79b0ddded08873fb0c7c
+  kn.xpi: 1c0c50208c5c782aeea2c016e3273e5564081f48
+  ko.xpi: 86d0f90084a2e9ad62de53b0e2a2a41506368037
+  lt.xpi: 3247a9d7fdadff59555efbdbee2ec1a12fa8a052
+  lv.xpi: c6a2495d6bc4b7c74d7dbd5c81a8ac84afd88e75
+  mk.xpi: e58090fdf93bb6c846f595ff9fcc58117e354a9f
+  mr.xpi: 46da2ccdac79b6b5ff74dc644042a3cf8b696a72
+  nb-NO.xpi: 06a0358f461e2b997e0edd02cf008f63964f2ea4
+  nl.xpi: cf38c53ae2701fd62162203844f0a97ac2d9515c
+  nn-NO.xpi: 4889734151769aeeccb68b373afdae8013a1f179
+  pa-IN.xpi: edf5d5d274a64b09f32bef6099dc074798afdad9
+  pl.xpi: f4b12a120e2a7c8af3ab2ebf759ca1ac5f6a2e9c
+  pt-BR.xpi: 5e33b88b7b67beacb38fe1193b86b3259d2847d6
+  pt-PT.xpi: 1cfe8a9bab9dc8e31733f33af9fec3c953c6e085
+  ro.xpi: 83af31f5783a2264bc84d61ab82758d57f1fcb5d
+  ru.xpi: 533c4f548ed1b166359b17220cbe7c636108bd1c
+  si.xpi: 7dfda4e26e228e77200853c6a9735061e73c2417
+  sk.xpi: bcffdcac19e21cb7ba51cca3098cb13ece4445a2
+  sl.xpi: 142e12d9c0f109db0eb85672fb9c60a69feb6723
+  sq.xpi: 44a1f1467785ef43d7e6d49e024781a6d3160b0a
+  sr.xpi: 096fc91e295d7153ae9bbc4e58ded26887859941
+  sv-SE.xpi: 3f194817fff2d3eb9524bd9edf338ea6ae5fb756
+  ta.xpi: c2f623102a0ebd6dc538c756d743b08f28b9e659
+  te.xpi: a84eaf36d737d71e7e15cdf261ab14711c120876
+  th.xpi: 47f8dac7ac7207e6da385954977eaf2e1475de0c
+  tr.xpi: 68ef68b76b411132c8fa849f8da39789a730757d
+  uk.xpi: 3cd71a22c9dca7ea8c438e8053ac08b7d63f0898
+  vi.xpi: 9283c0b86d5fccd2830d379946a83006f07edc1f
+  zh-CN.xpi: 362e392ee294e480392b4f83ccd76ca596f329c7
+  zh-TW.xpi: 63d61fd07bb1403f21ca0aceaf7bd4a6f13fcd73
diff --git a/build-aarch64-skia.patch b/build-aarch64-skia.patch
index a63e3e8..342836f 100644
--- a/build-aarch64-skia.patch
+++ b/build-aarch64-skia.patch
@@ -1,40 +1,7 @@
-diff -up firefox-72.0/gfx/skia/skia/include/private/SkHalf.h.aarch64-skia firefox-72.0/gfx/skia/skia/include/private/SkHalf.h
---- firefox-72.0/gfx/skia/skia/include/private/SkHalf.h.aarch64-skia	2020-01-02 22:33:02.000000000 +0100
-+++ firefox-72.0/gfx/skia/skia/include/private/SkHalf.h	2020-01-03 09:00:37.537296105 +0100
-@@ -40,7 +40,7 @@ static inline Sk4h SkFloatToHalf_finite_
- 
- static inline Sk4f SkHalfToFloat_finite_ftz(uint64_t rgba) {
-     Sk4h hs = Sk4h::Load(&rgba);
--#if !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
-+#if 0 // !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
-     float32x4_t fs;
-     asm ("fcvtl %[fs].4s, %[hs].4h   \n"   // vcvt_f32_f16(...)
-         : [fs] "=w" (fs)                   // =w: write-only NEON register
-@@ -62,7 +62,7 @@ static inline Sk4f SkHalfToFloat_finite_
- }
- 
- static inline Sk4h SkFloatToHalf_finite_ftz(const Sk4f& fs) {
--#if !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
-+#if 0 // !defined(SKNX_NO_SIMD) && defined(SK_CPU_ARM64)
-     float32x4_t vec = fs.fVec;
-     asm ("fcvtn %[vec].4h, %[vec].4s  \n"   // vcvt_f16_f32(vec)
-         : [vec] "+w" (vec));                // +w: read-write NEON register
-diff -up firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h
---- firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia	2020-01-03 09:00:37.538296107 +0100
-+++ firefox-72.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h	2020-01-03 10:11:41.259219508 +0100
-@@ -1087,7 +1087,7 @@ SI F from_half(U16 h) {
- }
- 
- SI U16 to_half(F f) {
--#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
-+#if 0 //defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
-     && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
-     return vcvt_f16_f32(f);
- 
-diff -up firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.aarch64-skia firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h
---- firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.aarch64-skia	2020-01-03 09:00:37.538296107 +0100
-+++ firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h	2020-01-03 10:11:53.513250979 +0100
-@@ -183,8 +183,6 @@ SI F F_from_Half(U16 half) {
+diff -up firefox-114.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h.aarch64-skia firefox-114.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h
+--- firefox-114.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h.aarch64-skia	2023-06-02 03:15:22.000000000 +0200
++++ firefox-114.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h	2023-06-05 10:18:46.942777997 +0200
+@@ -189,8 +189,6 @@ SI F F_from_Half(U16 half) {
  SI U16 Half_from_F(F f) {
  #if defined(USING_NEON_FP16)
      return bit_pun<U16>(f);
@@ -43,3 +10,16 @@ diff -up firefox-72.0/gfx/skia/skia/third_party/skcms/src/Transform_inl.h.aarch6
  #elif defined(USING_AVX512F)
      return (U16)_mm512_cvtps_ph((__m512 )f, _MM_FROUND_CUR_DIRECTION );
  #elif defined(USING_AVX_F16C)
+diff -up firefox-114.0/gfx/skia/skia/src/base/SkHalf.h.aarch64-skia firefox-114.0/gfx/skia/skia/src/base/SkHalf.h
+diff -up firefox-114.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia firefox-114.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h
+--- firefox-114.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia	2023-06-05 10:18:46.941777963 +0200
++++ firefox-114.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h	2023-06-05 10:20:44.924843847 +0200
+@@ -1128,7 +1128,7 @@ SI F from_half(U16 h) {
+ }
+ 
+ SI U16 to_half(F f) {
+-#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
++#if 0 //defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \
+     && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
+     return sk_bit_cast<U16>(vcvt_f16_f32(f));
+ 
diff --git a/build-nspr.patch b/build-nspr.patch
deleted file mode 100644
index acb67af..0000000
--- a/build-nspr.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -up firefox-80.0/dom/system/IOUtils.cpp.nspr-build firefox-80.0/dom/system/IOUtils.cpp
---- firefox-80.0/dom/system/IOUtils.cpp.nspr-build	2020-08-19 17:38:00.895018639 +0200
-+++ firefox-80.0/dom/system/IOUtils.cpp	2020-08-19 17:38:09.965978725 +0200
-@@ -14,9 +14,9 @@
- #include "mozilla/Services.h"
- #include "mozilla/Span.h"
- #include "mozilla/TextUtils.h"
--#include "nspr/prio.h"
--#include "nspr/private/pprio.h"
--#include "nspr/prtypes.h"
-+#include "prio.h"
-+#include "private/pprio.h"
-+#include "prtypes.h"
- #include "nsDirectoryServiceDefs.h"
- #include "nsIFile.h"
- #include "nsIGlobalObject.h"
-diff -up firefox-80.0/dom/system/IOUtils.h.nspr-build firefox-80.0/dom/system/IOUtils.h
---- firefox-80.0/dom/system/IOUtils.h.nspr-build	2020-08-17 22:13:15.000000000 +0200
-+++ firefox-80.0/dom/system/IOUtils.h	2020-08-19 17:20:33.332711771 +0200
-@@ -14,7 +14,7 @@
- #include "mozilla/dom/TypedArray.h"
- #include "mozilla/ErrorResult.h"
- #include "mozilla/MozPromise.h"
--#include "nspr/prio.h"
-+#include "prio.h"
- #include "nsIAsyncShutdown.h"
- #include "nsISerialEventTarget.h"
- #include "nsLocalFile.h"
diff --git a/firefox-67.0-webrtc-compile.patch b/firefox-67.0-webrtc-compile.patch
deleted file mode 100644
index 11ee2e3..0000000
--- a/firefox-67.0-webrtc-compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up firefox-67.0/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc.omv~ firefox-67.0/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc
---- firefox-67.0/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc.omv~	2019-05-27 21:10:21.190087292 +0200
-+++ firefox-67.0/media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc	2019-05-27 21:10:51.665087602 +0200
-@@ -7,6 +7,7 @@
-  *  in the file PATENTS.  All contributing project authors may
-  *  be found in the AUTHORS file in the root of the source tree.
-  */
-+#define SIOCGSTAMP 0x8906
- #include "rtc_base/physicalsocketserver.h"
- 
- #if defined(_MSC_VER) && _MSC_VER < 1300
diff --git a/firefox-91-buildfixes.patch b/firefox-91-buildfixes.patch
deleted file mode 100644
index 8a71c30..0000000
--- a/firefox-91-buildfixes.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up firefox-91.0/security/sandbox/linux/launch/SandboxLaunch.cpp.omv~ firefox-91.0/security/sandbox/linux/launch/SandboxLaunch.cpp
---- firefox-91.0/security/sandbox/linux/launch/SandboxLaunch.cpp.omv~	2021-08-17 22:34:09.599506604 +0200
-+++ firefox-91.0/security/sandbox/linux/launch/SandboxLaunch.cpp	2021-08-17 22:34:24.493563307 +0200
-@@ -17,6 +17,8 @@
- 
- #include <utility>
- 
-+#include "../../../../mfbt/ArrayUtils.h"
-+
- #include "LinuxCapabilities.h"
- #include "LinuxSched.h"
- #include "SandboxChrootProto.h"
-@@ -516,7 +518,7 @@ MOZ_NEVER_INLINE MOZ_ASAN_BLACKLIST stat
- #ifdef __hppa__
-   void* stackPtr = miniStack;
- #else
--  void* stackPtr = ArrayEnd(miniStack);
-+  void* stackPtr = ArrayEnd<uint8_t>(miniStack);
- #endif
-   return clone(CloneCallee, stackPtr, aFlags, aCtx);
- }
diff --git a/firefox.spec b/firefox.spec
index 9c4e323..988b012 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -34,7 +34,12 @@
 # currently enabled as updating all rust deps would take eons
 #global use_bundled_cbindgen  1
 
+# pgo seems to cause segfault on znver1
+%ifarch znver1
+%bcond_with pgo
+%else
 %bcond_without pgo
+%endif
 
 %if %omvver > 4050000
 %define build_py python3
@@ -237,8 +242,8 @@ Summary:	Next generation web browser
 Name:		firefox
 # IMPORTANT: When updating, you MUST also update the l10n files by running
 # download.sh after editing the version number
-Version:	122.0
-Release:	%{?beta:0.%{beta}.}2
+Version:	125.0.1
+Release:	%{?beta:0.%{beta}.}1
 License:	MPLv1+
 Group:		Networking/WWW
 Url:		http://www.mozilla.com/firefox/
@@ -276,14 +281,15 @@ Patch17:	firefox-112.0.1-no-static-libstdc++.patch
 
 Patch50:    	https://src.fedoraproject.org/rpms/firefox/raw/rawhide/f/firefox-enable-vaapi.patch
 Patch51:	https://src.fedoraproject.org/rpms/firefox/raw/rawhide/f/0001-GLIBCXX-fix-for-GCC-12.patch
-#Patch52:	https://src.fedoraproject.org/rpms/firefox/raw/rawhide/f/build-aarch64-skia.patch
+Patch52:	https://src.fedoraproject.org/rpms/firefox/raw/rawhide/f/build-aarch64-skia.patch
 Patch57:	https://src.fedoraproject.org/rpms/firefox/raw/rawhide/f/firefox-112.0-commasplit.patch
 Patch58:	https://src.fedoraproject.org/rpms/firefox/raw/rawhide/f/firefox-gcc-13-build.patch
 Patch61:	https://src.fedoraproject.org/rpms/firefox/raw/rawhide/f/mozilla-1196777.patch
 Patch62:	https://src.fedoraproject.org/rpms/firefox/raw/rawhide/f/mozilla-1516803.patch
 #Patch64:	https://src.fedoraproject.org/rpms/firefox/raw/rawhide/f/mozilla-1667096.patch
 Patch65:	https://src.fedoraproject.org/rpms/firefox/raw/rawhide/f/mozilla-1669639.patch
-#Patch66:	firefox-115.4.0-icu-74.patch
+Patch66:	firefox-115.4.0-icu-74.patch
+Patch67:	mozilla-1890593.patch
 
 BuildRequires:	doxygen
 BuildRequires:	makedepend
@@ -328,7 +334,7 @@ BuildRequires:	pkgconfig(glib-2.0)
 BuildRequires:	pkgconfig(gl)
 BuildRequires:	pkgconfig(libdrm)
 BuildRequires:	pkgconfig(gtk+-3.0)
-BuildRequires:	pkgconfig(icu-i18n) >= 72.1
+BuildRequires:	pkgconfig(icu-i18n) >= 74.1
 BuildRequires:	pkgconfig(hunspell)
 BuildRequires:	pkgconfig(libffi)
 BuildRequires:	pkgconfig(libIDL-2.0)
@@ -338,7 +344,7 @@ BuildRequires:	pkgconfig(libproxy-1.0)
 BuildRequires:	pkgconfig(libpulse)
 BuildRequires:	pkgconfig(libstartup-notification-1.0)
 BuildRequires:	pkgconfig(nspr) >= 4.32.0
-BuildRequires:	pkgconfig(nss) >= 3.94
+BuildRequires:	pkgconfig(nss) >= 3.97
 BuildRequires:	pkgconfig(ogg)
 BuildRequires:	pkgconfig(opus)
 BuildRequires:	pkgconfig(libpulse)
@@ -453,17 +459,12 @@ ac_add_options --enable-release
 ac_add_options --update-channel=%{update_channel}
 ac_add_options --enable-update-channel=%{update_channel}
 ac_add_options --with-distribution-id=org.openmandriva
-%ifarch %{ix86}
-ac_add_options --enable-linker=bfd
-ac_add_options --disable-optimize
-%else
 ac_add_options --enable-optimize="-O3"
-%endif
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-zlib
 ac_add_options --enable-necko-wifi
-%ifarch %{ix86} %{x86_64}
+%ifarch %{x86_64}
 ac_add_options --enable-av1
 %endif
 ac_add_options --without-system-libevent
@@ -515,16 +516,8 @@ EOF
 %build
 %global optflags %{optflags} -g0 -fno-exceptions
 
-%ifarch %ix86
-%global optflags %{optflags} -g0 -fno-exceptions -Wno-format-security
-%global ldflags %{ldflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-# still requires gcc
-export CXX=g++
-export CC=gcc
-%else
 %global optflags %{optflags} -Wno-error=c++11-narrowing-const-reference 
 %global optflags %{optflags} -Qunused-arguments -g0 -fno-lto
-%endif
 
 #(tpg) do not use serverbuild or serverbuild_hardened macros
 # because compile will fail of missing -fPIC  :)
@@ -573,7 +566,7 @@ rm -rf third_party/python/{aiohttp,colorama,jsonschema,multidict,pip,pip_tools,p
 %endif
 
 %if %{with pgo}
-GDK_BACKEND=x11 xvfb-run %build_py ./mach build -v  2>&1 | cat -
+GDK_BACKEND=x11 xvfb-run %build_py ./mach build -v  2>&1 | cat - || exit 1
 %else
 %build_py ./mach build -v
 %endif
diff --git a/mozilla-107.0.1-kde.patch b/mozilla-107.0.1-kde.patch
index 72e2f54..b3907d0 100644
--- a/mozilla-107.0.1-kde.patch
+++ b/mozilla-107.0.1-kde.patch
@@ -188,9 +188,9 @@ diff -up firefox-116.0/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp.2~
 +}
 +
 +
- NS_IMPL_COMPONENT_FACTORY(nsUnixSystemProxySettings) {
-   auto result = MakeRefPtr<nsUnixSystemProxySettings>();
-   result->Init();
+ NS_IMETHODIMP
+ nsUnixSystemProxySettings::GetSystemWPADSetting(bool* aSystemWPADSetting) {
+   *aSystemWPADSetting = false;
 diff -up firefox-116.0/toolkit/xre/moz.build.2~ firefox-116.0/toolkit/xre/moz.build
 --- firefox-116.0/toolkit/xre/moz.build.2~	2023-07-27 20:36:18.000000000 +0200
 +++ firefox-116.0/toolkit/xre/moz.build	2023-08-01 10:19:34.790552382 +0200
@@ -995,8 +995,8 @@ diff -up firefox-116.0/widget/gtk/nsFilePicker.cpp.2~ firefox-116.0/widget/gtk/n
  
    nsAutoCString filter, name;
 @@ -352,6 +357,29 @@ nsFilePicker::Open(nsIFilePickerShownCal
-   // Can't show two dialogs concurrently with the same filepicker
-   if (mFileChooser) return NS_ERROR_NOT_AVAILABLE;
+     return NS_OK;
+   }
  
 +  // KDE file picker is not handled via callback
 +  if( nsKDEUtils::kdeSupport()) {
@@ -1357,7 +1357,7 @@ diff -up firefox-116.0/xpcom/components/moz.build.2~ firefox-116.0/xpcom/compone
 --- firefox-116.0/xpcom/components/moz.build.2~	2023-07-27 20:36:18.000000000 +0200
 +++ firefox-116.0/xpcom/components/moz.build	2023-08-01 10:19:34.791552392 +0200
 @@ -71,6 +71,7 @@ LOCAL_INCLUDES += [
-     "/js/xpconnect/loader",
+     "/js/xpconnect/src",
      "/layout/build",
      "/modules/libjar",
 +    "/toolkit/xre",
diff --git a/mozilla-1667096.patch b/mozilla-1667096.patch
index 85dd729..924705f 100644
--- a/mozilla-1667096.patch
+++ b/mozilla-1667096.patch
@@ -1,6 +1,6 @@
-diff -up firefox-108.0/media/ffvpx/libavcodec/codec_list.c.1667096 firefox-108.0/media/ffvpx/libavcodec/codec_list.c
---- firefox-108.0/media/ffvpx/libavcodec/codec_list.c.1667096	2022-12-05 21:18:00.000000000 +0100
-+++ firefox-108.0/media/ffvpx/libavcodec/codec_list.c	2022-12-08 08:29:54.513562296 +0100
+diff -up firefox-125.0/media/ffvpx/libavcodec/codec_list.c.1667096 firefox-125.0/media/ffvpx/libavcodec/codec_list.c
+--- firefox-125.0/media/ffvpx/libavcodec/codec_list.c.1667096	2024-04-08 22:17:52.000000000 +0200
++++ firefox-125.0/media/ffvpx/libavcodec/codec_list.c	2024-04-09 10:40:58.727006437 +0200
 @@ -11,6 +11,9 @@ static const FFCodec * const codec_list[
  #if CONFIG_MP3_DECODER
      &ff_mp3_decoder,
@@ -11,9 +11,9 @@ diff -up firefox-108.0/media/ffvpx/libavcodec/codec_list.c.1667096 firefox-108.0
  #if CONFIG_LIBDAV1D
      &ff_libdav1d_decoder,
  #endif
-diff -up firefox-108.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-108.0/media/ffvpx/libavcodec/libfdk-aacdec.c
---- firefox-108.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096	2022-12-08 08:29:54.514562328 +0100
-+++ firefox-108.0/media/ffvpx/libavcodec/libfdk-aacdec.c	2022-09-03 18:20:04.000000000 +0200
+diff -up firefox-125.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-125.0/media/ffvpx/libavcodec/libfdk-aacdec.c
+--- firefox-125.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096	2024-04-09 10:40:58.727006437 +0200
++++ firefox-125.0/media/ffvpx/libavcodec/libfdk-aacdec.c	2024-04-09 10:40:58.727006437 +0200
 @@ -0,0 +1,497 @@
 +/*
 + * AAC decoder wrapper
@@ -512,12 +512,12 @@ diff -up firefox-108.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-10
 +    .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
 +    .p.wrapper_name = "libfdk",
 +};
-diff -up firefox-108.0/media/ffvpx/libavcodec/moz.build.1667096 firefox-108.0/media/ffvpx/libavcodec/moz.build
---- firefox-108.0/media/ffvpx/libavcodec/moz.build.1667096	2022-12-05 21:18:01.000000000 +0100
-+++ firefox-108.0/media/ffvpx/libavcodec/moz.build	2022-12-08 08:29:54.514562328 +0100
-@@ -130,6 +130,12 @@ if CONFIG['MOZ_LIBAV_FFT']:
-         'avfft.c',
-     ]
+diff -up firefox-125.0/media/ffvpx/libavcodec/moz.build.1667096 firefox-125.0/media/ffvpx/libavcodec/moz.build
+--- firefox-125.0/media/ffvpx/libavcodec/moz.build.1667096	2024-04-09 10:40:58.727006437 +0200
++++ firefox-125.0/media/ffvpx/libavcodec/moz.build	2024-04-09 10:57:10.584104658 +0200
+@@ -146,6 +146,12 @@ else:
+   CXXFLAGS += CONFIG["MOZ_LIBVPX_CFLAGS"]
+   OS_LIBS += CONFIG["MOZ_LIBVPX_LIBS"]
  
 +if CONFIG['MOZ_FDK_AAC']:
 +    SOURCES += [
@@ -528,10 +528,10 @@ diff -up firefox-108.0/media/ffvpx/libavcodec/moz.build.1667096 firefox-108.0/me
  SYMBOLS_FILE = 'avcodec.symbols'
  NoVisibilityFlags()
  
-diff -up firefox-108.0/toolkit/moz.configure.1667096 firefox-108.0/toolkit/moz.configure
---- firefox-108.0/toolkit/moz.configure.1667096	2022-12-05 21:21:08.000000000 +0100
-+++ firefox-108.0/toolkit/moz.configure	2022-12-08 08:29:54.514562328 +0100
-@@ -2134,6 +2134,15 @@ with only_when(compile_environment):
+diff -up firefox-125.0/toolkit/moz.configure.1667096 firefox-125.0/toolkit/moz.configure
+--- firefox-125.0/toolkit/moz.configure.1667096	2024-04-09 10:40:58.711005876 +0200
++++ firefox-125.0/toolkit/moz.configure	2024-04-09 10:40:58.728006472 +0200
+@@ -2395,6 +2395,15 @@ with only_when(compile_environment):
  
      set_config("MOZ_SYSTEM_PNG", True, when="--with-system-png")
  
diff --git a/mozilla-1890593.patch b/mozilla-1890593.patch
new file mode 100644
index 0000000..b130518
--- /dev/null
+++ b/mozilla-1890593.patch
@@ -0,0 +1,17 @@
+diff --git a/toolkit/system/unixproxy/nsLibProxySettings.cpp b/toolkit/system/unixproxy/nsLibProxySettings.cpp
+index 4f6f43fb76e96..f2c7824554266 100644
+--- a/toolkit/system/unixproxy/nsLibProxySettings.cpp
++++ b/toolkit/system/unixproxy/nsLibProxySettings.cpp
+@@ -99,6 +99,12 @@ nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString& aSpec,
+   return NS_OK;
+ }
+ 
++NS_IMETHODIMP
++nsUnixSystemProxySettings::GetSystemWPADSetting(bool* aSystemWPADSetting) {
++  *aSystemWPADSetting = false;
++  return NS_OK;
++}
++
+ NS_IMPL_COMPONENT_FACTORY(nsUnixSystemProxySettings) {
+   return do_AddRef(new nsUnixSystemProxySettings()).downcast<nsISupports>();
+ }