From c36da4b4fca4949c3a56540db16322a737d6b2fc Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 24 Jan 2024 14:01:06 +0000
Subject: [PATCH] extra/firefox to 122.0-1

---
 extra/firefox/.SRCINFO | 13 +++++--------
 extra/firefox/PKGBUILD | 19 ++++++-------------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/extra/firefox/.SRCINFO b/extra/firefox/.SRCINFO
index 95f770fd2..224031b01 100644
--- a/extra/firefox/.SRCINFO
+++ b/extra/firefox/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox
 	pkgdesc = Standalone web browser from mozilla.org
-	pkgver = 121.0.1
+	pkgver = 122.0
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
 	arch = x86_64
@@ -10,7 +10,6 @@ pkgbase = firefox
 	makedepends = cbindgen
 	makedepends = clang
 	makedepends = diffutils
-	makedepends = dump_syms
 	makedepends = imake
 	makedepends = inetutils
 	makedepends = jack
@@ -44,21 +43,19 @@ pkgbase = firefox
 	optdepends = pulseaudio: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
 	optdepends = xdg-desktop-portal: Screensharing with Wayland
-	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
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha256sums = b3a4216e01eaeb9a7c6ef4659d8dcd956fbd90a78a8279ee3a598881e63e49ce
+	sha256sums = b84815a90e147965e4c0b50599c85b1022ab0fce42105e5ef45c630dcca5dec3
 	sha256sums = SKIP
 	sha256sums = 1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044
 	sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
-	b2sums = c9931d38bb9c612000409ed54b2fbb190cabcb714cd559152f2f645a8a3a82934874d31e40fc298dca765dac94e4e0927b125e14cee325484ba0f9b1ed2cdc55
+	b2sums = 7252cd58fef9f5fcb504c8c9f885567109c05e6ec92157459cc384edc6935adb206e3be0b805aeaa37dbd72656c3243db1291b745dd0f705f37a61319a4dc820
 	b2sums = SKIP
 	b2sums = d07557840097dd48a60c51cc5111950781e1c6ce255557693bd11306c7a9258b2a82548329762148f117b2295145f9e66e0483a18e2fe09c5afcffed2e4b8628
 	b2sums = 63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34
diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD
index d01f58aa4..4ec823eca 100644
--- a/extra/firefox/PKGBUILD
+++ b/extra/firefox/PKGBUILD
@@ -10,7 +10,7 @@
 highmem=1
 
 pkgname=firefox
-pkgver=121.0.1
+pkgver=122.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 url="https://www.mozilla.org/firefox/"
@@ -35,7 +35,6 @@ makedepends=(
   cbindgen
   clang
   diffutils
-  dump_syms
   imake
   inetutils
   jack
@@ -60,11 +59,9 @@ optdepends=(
   'xdg-desktop-portal: Screensharing with Wayland'
 )
 options=(
-  !debug
   !emptydirs
   !lto
   !makeflags
-  !strip
 )
 source=(
   https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
@@ -76,11 +73,11 @@ validpgpkeys=(
   # https://blog.mozilla.org/security/2023/05/11/updated-gpg-key-for-signing-firefox-releases/
   14F26682D0916CDD81E37B6D61B7B526D98F0353
 )
-sha256sums=('b3a4216e01eaeb9a7c6ef4659d8dcd956fbd90a78a8279ee3a598881e63e49ce'
+sha256sums=('b84815a90e147965e4c0b50599c85b1022ab0fce42105e5ef45c630dcca5dec3'
             'SKIP'
             '1f241fdc619f92a914c75aece7c7c717401d7467c9a306458e106b05f34e5044'
             'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9')
-b2sums=('c9931d38bb9c612000409ed54b2fbb190cabcb714cd559152f2f645a8a3a82934874d31e40fc298dca765dac94e4e0927b125e14cee325484ba0f9b1ed2cdc55'
+b2sums=('7252cd58fef9f5fcb504c8c9f885567109c05e6ec92157459cc384edc6935adb206e3be0b805aeaa37dbd72656c3243db1291b745dd0f705f37a61319a4dc820'
         'SKIP'
         'd07557840097dd48a60c51cc5111950781e1c6ce255557693bd11306c7a9258b2a82548329762148f117b2295145f9e66e0483a18e2fe09c5afcffed2e4b8628'
         '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34')
@@ -115,6 +112,7 @@ ac_add_options --enable-release
 #ac_add_options --enable-optimize="-O2"
 #ac_add_options --enable-rust-simd
 ac_add_options --enable-linker=lld
+ac_add_options --disable-install-strip
 ac_add_options --disable-bootstrap
 ac_add_options --without-wasm-sandboxed-libraries
 
@@ -177,7 +175,6 @@ build() {
   export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=pip
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
   export MOZ_BUILD_DATE="$(date -u${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH} +%Y%m%d%H%M%S)"
-  export MOZ_ENABLE_FULL_SYMBOLS=1
   export MOZ_NOSPAM=1
 
   # malloc_usable_size is used in various parts of the codebase
@@ -189,9 +186,6 @@ build() {
 
   echo "Building optimized browser..."
   ./mach build
-
-  echo "Building symbol archive..."
-  ./mach buildsymbols
 }
 
 package() {
@@ -244,7 +238,7 @@ END
     "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg"
 
   install -Dvm644 ../$pkgname.desktop \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
+    "$pkgdir/usr/share/applications/${pkgname//-/}.desktop"
 
   # Install a wrapper to avoid confusion about binary path
   install -Dvm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" <<END
@@ -265,12 +259,11 @@ END
   local sprovider="$pkgdir/usr/share/gnome-shell/search-providers/$pkgname.search-provider.ini"
   install -Dvm644 /dev/stdin "$sprovider" <<END
 [Shell Search Provider]
-DesktopId=$pkgname.desktop
+DesktopId=${pkgname//-/}.desktop
 BusName=org.mozilla.${pkgname//-/}.SearchProvider
 ObjectPath=/org/mozilla/${pkgname//-/}/SearchProvider
 Version=2
 END
 }
 
-
 # vim:set sw=2 sts=-1 et: