122.0-1

3 files changed, 24 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc3afb646c7e..e9df761209e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,10 @@
 pkgbase = firefox-vaapi
 	pkgdesc = Standalone web browser from mozilla.org (with VA-API patches)
-	pkgver = 121.0.1
+	pkgver = 122.0
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
 	arch = x86_64
-	license = GPL
-	license = LGPL
-	license = MPL
+	license = MPL-2.0
 	makedepends = cbindgen
 	makedepends = clang
 	makedepends = diffutils
@@ -44,15 +42,15 @@ pkgbase = firefox-vaapi
 	optdepends = pulseaudio: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
 	optdepends = xdg-desktop-portal: Screensharing with Wayland
-	provides = firefox=121.0.1
+	provides = firefox=122.0
 	conflicts = firefox
 	options = !debug
 	options = !emptydirs
 	options = !lto
 	options = !makeflags
 	options = !strip
-	source = https://archive.mozilla.org/pub/firefox/releases/121.0.1/source/firefox-121.0.1.source.tar.xz
-	source = https://archive.mozilla.org/pub/firefox/releases/121.0.1/source/firefox-121.0.1.source.tar.xz.asc
+	source = https://archive.mozilla.org/pub/firefox/releases/122.0/source/firefox-122.0.source.tar.xz
+	source = https://archive.mozilla.org/pub/firefox/releases/122.0/source/firefox-122.0.source.tar.xz.asc
 	source = firefox.desktop
 	source = identity-icons-brand.svg
 	source = 0001-wayland-proxy.patch
@@ -60,20 +58,20 @@ pkgbase = firefox-vaapi
 	source = 0003-enable-vaapi.patch
 	source = 0004-remove-nvidia-blocklist.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha256sums = b3a4216e01eaeb9a7c6ef4659d8dcd956fbd90a78a8279ee3a598881e63e49ce
+	sha256sums = b84815a90e147965e4c0b50599c85b1022ab0fce42105e5ef45c630dcca5dec3
 	sha256sums = SKIP
 	sha256sums = 1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044
 	sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
 	sha256sums = bbec9e3ed1fe1372f587383e8ca86bb28e4dd90874dc146450e6ecdc8d30f387
-	sha256sums = 2b439551262f6b1f341ff8156ad447b5196d5d5d1bf1d8f3a9f9910895d6c1de
+	sha256sums = 7303e0375154935149063f5273d387842af9ca22668192512b9839182c45d1da
 	sha256sums = 00c449422246283cd7e0bdc65d216fce4a42f755ad881106a08fb7d97eab1679
 	sha256sums = 75d3c213f3717cfc3f72acd4e3b6d029d373916f9ff9a1e8a3e2d7b0958760ed
-	b2sums = c9931d38bb9c612000409ed54b2fbb190cabcb714cd559152f2f645a8a3a82934874d31e40fc298dca765dac94e4e0927b125e14cee325484ba0f9b1ed2cdc55
+	b2sums = 7252cd58fef9f5fcb504c8c9f885567109c05e6ec92157459cc384edc6935adb206e3be0b805aeaa37dbd72656c3243db1291b745dd0f705f37a61319a4dc820
 	b2sums = SKIP
 	b2sums = d07557840097dd48a60c51cc5111950781e1c6ce255557693bd11306c7a9258b2a82548329762148f117b2295145f9e66e0483a18e2fe09c5afcffed2e4b8628
 	b2sums = 63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34
 	b2sums = 4daf6c7d670f94d782408cd6f7fa7c6a96e109d6d368f5e41b0353e6f81f9a12f0f32b72efb734814652df42e63941312edc54446e874ce84e82862fbdee8a33
-	b2sums = 896de88f76d37ad35d34084706c70170883e8b27630714ce326e00e327257c19e5ebee84cec45f3ab5db66becb6a7b5fb925f3b37b17f5b636d3517da07b914d
+	b2sums = 0222e9f7abfa6f9546d72a6775e7c6d5f9eb30a613196b9b8ae42a8996144ff222e6d4a98b28cc20a8e4afba17d458b184f4b45e06619d76cce18750ce654ee4
 	b2sums = f84752e04c7e69b69158b9514a5227a2b71b60ccbbe5acb437d9830bfa2e725fe6784e1603890722a114abda424f9cafc007e9934310f21483b6540bc19da905
 	b2sums = 87ecd8a3891a9a171173a97cf3b2b5f978be9ec876bb257d9f5e037f21dc5bd91167eabeb1c3cc181260b82cb2774c7b38ad73e1d807cc49b6d95617e2fb5d55
 
diff --git a/0002-wayland-proxy.patch b/0002-wayland-proxy.patch
index c76bc21924e0..b60531455bb2 100644
--- a/0002-wayland-proxy.patch
+++ b/0002-wayland-proxy.patch
@@ -1,7 +1,7 @@
-diff --color --unified --recursive --text firefox-121.0.orig/toolkit/xre/nsAppRunner.cpp firefox-121.0.new/toolkit/xre/nsAppRunner.cpp
---- firefox-121.0.orig/toolkit/xre/nsAppRunner.cpp	2024-01-09 02:00:34.503779191 +0100
-+++ firefox-121.0.new/toolkit/xre/nsAppRunner.cpp	2024-01-09 02:01:28.333190186 +0100
-@@ -340,13 +340,24 @@
+diff --color --unified --recursive --text --new-file firefox-122.0.orig/toolkit/xre/nsAppRunner.cpp firefox-122.0.new/toolkit/xre/nsAppRunner.cpp
+--- firefox-122.0.orig/toolkit/xre/nsAppRunner.cpp	2024-01-27 16:54:31.509971123 +0100
++++ firefox-122.0.new/toolkit/xre/nsAppRunner.cpp	2024-01-27 16:56:06.694387771 +0100
+@@ -344,13 +344,24 @@
  #  ifdef MOZ_WAYLAND
  #    include <gdk/gdkwayland.h>
  #    include "mozilla/widget/nsWaylandDisplay.h"
@@ -26,7 +26,7 @@ diff --color --unified --recursive --text firefox-121.0.orig/toolkit/xre/nsAppRu
  #ifdef FUZZING
  #  include "FuzzerRunner.h"
  
-@@ -2788,6 +2799,9 @@
+@@ -2792,6 +2803,9 @@
            gRemoteService = nullptr;
          }
  #endif
@@ -36,7 +36,7 @@ diff --color --unified --recursive --text firefox-121.0.orig/toolkit/xre/nsAppRu
          return LaunchChild(false, true);
        }
      } else {
-@@ -2902,6 +2916,9 @@
+@@ -2906,6 +2920,9 @@
      gRemoteService = nullptr;
    }
  #endif
@@ -46,7 +46,7 @@ diff --color --unified --recursive --text firefox-121.0.orig/toolkit/xre/nsAppRu
    return LaunchChild(false, true);
  }
  
-@@ -4707,6 +4724,23 @@
+@@ -4711,6 +4728,23 @@
      const char* display_name = nullptr;
      bool saveDisplayArg = false;
  
@@ -70,7 +70,7 @@ diff --color --unified --recursive --text firefox-121.0.orig/toolkit/xre/nsAppRu
      // display_name is owned by gdk.
      display_name = gdk_get_display_arg_name();
      // if --display argument is given make sure it's
-@@ -4716,7 +4750,6 @@
+@@ -4720,7 +4754,6 @@
        saveDisplayArg = true;
      }
  
@@ -78,7 +78,7 @@ diff --color --unified --recursive --text firefox-121.0.orig/toolkit/xre/nsAppRu
      // On Wayland disabled builds read X11 DISPLAY env exclusively
      // and don't care about different displays.
      if (!waylandEnabled && !display_name) {
-@@ -5918,6 +5951,7 @@
+@@ -5954,6 +5987,7 @@
    if (!gfxPlatform::IsHeadless()) {
  #  ifdef MOZ_WAYLAND
      WaylandDisplayRelease();
diff --git a/PKGBUILD b/PKGBUILD
index 7cdbd6c85362..75a8cb92179f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,16 +5,12 @@
 
 pkgname=firefox-vaapi
 _pkgname=firefox
-pkgver=121.0.1
+pkgver=122.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org (with VA-API patches)"
 url="https://www.mozilla.org/firefox/"
 arch=(x86_64)
-license=(
-  GPL
-  LGPL
-  MPL
-)
+license=(MPL-2.0)
 depends=(
   dbus
   ffmpeg
@@ -81,20 +77,20 @@ validpgpkeys=(
   # https://blog.mozilla.org/security/2023/05/11/updated-gpg-key-for-signing-firefox-releases/
   14F26682D0916CDD81E37B6D61B7B526D98F0353
 )
-sha256sums=('b3a4216e01eaeb9a7c6ef4659d8dcd956fbd90a78a8279ee3a598881e63e49ce'
+sha256sums=('b84815a90e147965e4c0b50599c85b1022ab0fce42105e5ef45c630dcca5dec3'
             'SKIP'
             '1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044'
             'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
             'bbec9e3ed1fe1372f587383e8ca86bb28e4dd90874dc146450e6ecdc8d30f387'
-            '2b439551262f6b1f341ff8156ad447b5196d5d5d1bf1d8f3a9f9910895d6c1de'
+            '7303e0375154935149063f5273d387842af9ca22668192512b9839182c45d1da'
             '00c449422246283cd7e0bdc65d216fce4a42f755ad881106a08fb7d97eab1679'
             '75d3c213f3717cfc3f72acd4e3b6d029d373916f9ff9a1e8a3e2d7b0958760ed')
-b2sums=('c9931d38bb9c612000409ed54b2fbb190cabcb714cd559152f2f645a8a3a82934874d31e40fc298dca765dac94e4e0927b125e14cee325484ba0f9b1ed2cdc55'
+b2sums=('7252cd58fef9f5fcb504c8c9f885567109c05e6ec92157459cc384edc6935adb206e3be0b805aeaa37dbd72656c3243db1291b745dd0f705f37a61319a4dc820'
         'SKIP'
         'd07557840097dd48a60c51cc5111950781e1c6ce255557693bd11306c7a9258b2a82548329762148f117b2295145f9e66e0483a18e2fe09c5afcffed2e4b8628'
         '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34'
         '4daf6c7d670f94d782408cd6f7fa7c6a96e109d6d368f5e41b0353e6f81f9a12f0f32b72efb734814652df42e63941312edc54446e874ce84e82862fbdee8a33'
-        '896de88f76d37ad35d34084706c70170883e8b27630714ce326e00e327257c19e5ebee84cec45f3ab5db66becb6a7b5fb925f3b37b17f5b636d3517da07b914d'
+        '0222e9f7abfa6f9546d72a6775e7c6d5f9eb30a613196b9b8ae42a8996144ff222e6d4a98b28cc20a8e4afba17d458b184f4b45e06619d76cce18750ce654ee4'
         'f84752e04c7e69b69158b9514a5227a2b71b60ccbbe5acb437d9830bfa2e725fe6784e1603890722a114abda424f9cafc007e9934310f21483b6540bc19da905'
         '87ecd8a3891a9a171173a97cf3b2b5f978be9ec876bb257d9f5e037f21dc5bd91167eabeb1c3cc181260b82cb2774c7b38ad73e1d807cc49b6d95617e2fb5d55')