From ccaca8ccc5eca0f6e2819742df78527f1a990b76 Mon Sep 17 00:00:00 2001
From: Jan Horak <jhorak@redhat.com>
Date: Mon, 10 Jun 2024 16:35:18 +0200
Subject: [PATCH] Updated nss version, fixed mozilla-1667096 patch

---
 firefox.spec          |  2 +-
 mozilla-1667096.patch | 31 ++++++++++++++++---------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/firefox.spec b/firefox.spec
index c15874c..09967d7 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -144,7 +144,7 @@ ExcludeArch: i686
 %if %{?system_nss}
 %global nspr_version 4.32
 %global nspr_build_version %{nspr_version}
-%global nss_version 3.97
+%global nss_version 3.100
 %global nss_build_version %{nss_version}
 %endif
 
diff --git a/mozilla-1667096.patch b/mozilla-1667096.patch
index 924705f..d26be4d 100644
--- a/mozilla-1667096.patch
+++ b/mozilla-1667096.patch
@@ -1,6 +1,6 @@
-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
+diff -up firefox-127.0/media/ffvpx/libavcodec/codec_list.c.1667096 firefox-127.0/media/ffvpx/libavcodec/codec_list.c
+--- firefox-127.0/media/ffvpx/libavcodec/codec_list.c.1667096	2024-06-06 23:33:57.000000000 +0200
++++ firefox-127.0/media/ffvpx/libavcodec/codec_list.c	2024-06-10 12:42:39.353913204 +0200
 @@ -11,6 +11,9 @@ static const FFCodec * const codec_list[
  #if CONFIG_MP3_DECODER
      &ff_mp3_decoder,
@@ -11,10 +11,10 @@ diff -up firefox-125.0/media/ffvpx/libavcodec/codec_list.c.1667096 firefox-125.0
  #if CONFIG_LIBDAV1D
      &ff_libdav1d_decoder,
  #endif
-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 @@
+diff -up firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c
+--- firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096	2024-06-10 12:42:39.354913201 +0200
++++ firefox-127.0/media/ffvpx/libavcodec/libfdk-aacdec.c	2024-06-10 16:28:30.332367814 +0200
+@@ -0,0 +1,498 @@
 +/*
 + * AAC decoder wrapper
 + * Copyright (c) 2012 Martin Storsjo
@@ -39,6 +39,7 @@ diff -up firefox-125.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-12
 +#include "libavutil/channel_layout.h"
 +#include "libavutil/common.h"
 +#include "libavutil/opt.h"
++#include "libavutil/mem.h"
 +#include "avcodec.h"
 +#include "codec_internal.h"
 +#include "decode.h"
@@ -512,10 +513,10 @@ diff -up firefox-125.0/media/ffvpx/libavcodec/libfdk-aacdec.c.1667096 firefox-12
 +    .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
 +    .p.wrapper_name = "libfdk",
 +};
-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:
+diff -up firefox-127.0/media/ffvpx/libavcodec/moz.build.1667096 firefox-127.0/media/ffvpx/libavcodec/moz.build
+--- firefox-127.0/media/ffvpx/libavcodec/moz.build.1667096	2024-06-06 23:33:58.000000000 +0200
++++ firefox-127.0/media/ffvpx/libavcodec/moz.build	2024-06-10 12:42:39.354913201 +0200
+@@ -151,6 +151,12 @@ else:
    CXXFLAGS += CONFIG["MOZ_LIBVPX_CFLAGS"]
    OS_LIBS += CONFIG["MOZ_LIBVPX_LIBS"]
  
@@ -528,10 +529,10 @@ diff -up firefox-125.0/media/ffvpx/libavcodec/moz.build.1667096 firefox-125.0/me
  SYMBOLS_FILE = 'avcodec.symbols'
  NoVisibilityFlags()
  
-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):
+diff -up firefox-127.0/toolkit/moz.configure.1667096 firefox-127.0/toolkit/moz.configure
+--- firefox-127.0/toolkit/moz.configure.1667096	2024-06-10 12:42:39.312913316 +0200
++++ firefox-127.0/toolkit/moz.configure	2024-06-10 12:42:39.355913199 +0200
+@@ -2412,6 +2412,15 @@ with only_when(compile_environment):
  
      set_config("MOZ_SYSTEM_PNG", True, when="--with-system-png")