extra/firefox to 112.0-1

extra/firefox/0002-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch

@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: stransky <stransky@redhat.com>
-Date: Thu, 9 Mar 2023 13:16:19 +0000
-Subject: [PATCH] Bug 1820416 Use correct FFVPX headers from ffmpeg 6.0
- r=padenot
-
-Differential Revision: https://phabricator.services.mozilla.com/D172116
----
- dom/media/platforms/ffmpeg/ffvpx/moz.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dom/media/platforms/ffmpeg/ffvpx/moz.build b/dom/media/platforms/ffmpeg/ffvpx/moz.build
-index 188b866fc9de..cda0960787a5 100644
---- a/dom/media/platforms/ffmpeg/ffvpx/moz.build
-+++ b/dom/media/platforms/ffmpeg/ffvpx/moz.build
-@@ -20,7 +20,7 @@ SOURCES += [
- ]
- LOCAL_INCLUDES += [
-     "..",
--    "../ffmpeg59/include",
-+    "../ffmpeg60/include",
-     "/media/mozva",
- ]
- 

extra/firefox/PKGBUILD

@@ -10,7 +10,7 @@
 highmem=1
 
 pkgname=firefox
-pkgver=111.0.1
+pkgver=112.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 url="https://www.mozilla.org/firefox/"
@@ -69,26 +69,20 @@ source=(
   https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
   $pkgname.desktop
   identity-icons-brand.svg
-  0001-Bug-1819374-Squashed-ffmpeg-6.0-update.patch
-  0002-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch
   build-arm-libopus.patch
 )
 validpgpkeys=(
   '14F26682D0916CDD81E37B6D61B7B526D98F0353'  # Mozilla Software Releases <release@mozilla.com>
 )
-sha256sums=('84a4f3aba62df6e0451cdd28f8f1e59840d77c4062311947b0e59325c2ebdce8'
+sha256sums=('eb19185f7bfa5c3b0c73edaa57160b44bf3bb2139db83539809607486b8075d9'
             'SKIP'
             '298eae9de76ec53182f38d5c549d0379569916eebf62149f9d7f4a7edef36abf'
             'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
-            '802f9271a5f7c0ab581baae8c46fd5b29598025ee93bb2dac6b456f8e0ae6acc'
-            'be9ba079a931d5e881ce38430d418cc834e8c6b157af6c79ea267998caece806'
             '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
-b2sums=('ccc545a72677f168c0adaf2fe0dd3243fbb8243e4332f703b0de575163a6fe98709c6393752e3a35e3be21ad5a4b9da974b6dbbe36d203ae7c5d95eadd2e98f1'
+b2sums=('6233ee202d000ddd5b0a2eafff09226abf2cf097ea3e1184442ad34e92f6fd408f1891a2063e459d419ba074218596f48c95c860246d4c46d2a4fca3df27a78a'
         'SKIP'
         'e18f2c22e394ca3b6758bc130245b254947e4d15921be3da443d6d7c3c4b0d22ead1b39fbc10a4f896edd19e2a1dffbd1cbb34dc4beb0621a6ddb70ccc53b3a7'
         '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34'
-        'bf6796cb3815bc97d938a2cb18754fdc6b35e40a2c6ee34fc1e9878ba9e9c83c26c79ae61e779dc6540b9ec5126a385aff65e00e56aa19841f0846fc030e1d0a'
-        'be47c370c1b765921a6ffbb0eeaceaabc26483629b2ebd73c38f36b3ac418d1746fa021b5d444264641ff7c0c13e688a752758bd75c84e0297aceeaec0062ff2'
         '6e5980e56343a23bce4fcda58f6abc8f2debca0c278c87b09e53abb17ff15849c26e8df3bbff2388985f8fe5a4e9be9982c602ef7159546f0ae335fca1000a41')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -108,13 +102,6 @@ prepare() {
   mkdir mozbuild
   cd firefox-$pkgver
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1819374
-  patch -Np1 -i ../0001-Bug-1819374-Squashed-ffmpeg-6.0-update.patch
-
-  # https://bugs.archlinux.org/task/77796
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1820416
-  patch -Np1 -i ../0002-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch
-
   echo -n "$_google_api_key" >google-api-key
   echo -n "$_mozilla_api_key" >mozilla-api-key