Update to Firefox 122.0 (x86_64/i686) + improvements

4 files changed, 48 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d87cca09dbd0..729a87927d06 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-opensuse-bin
 	pkgdesc = Standalone web browser from mozilla.org with openSUSE patches
-	pkgver = 121.0.1
+	pkgver = 122.0
 	pkgrel = 1
 	url = https://en.opensuse.org/Firefox
 	arch = x86_64
@@ -28,7 +28,9 @@ pkgbase = firefox-opensuse-bin
 	optdepends = xdg-desktop-portal: Screensharing with Wayland
 	provides = firefox
 	conflicts = firefox
-	source = https://download.opensuse.org/repositories/mozilla/openSUSE_Tumbleweed/x86_64/MozillaFirefox-121.0.1-1.3.x86_64.rpm
-	sha256sums = 65837e4a79e88dcff4479b5dabab52c2f2303bacbaadcb8fec609ff221c48e7c
+	source = https://download.opensuse.org/repositories/mozilla/openSUSE_Tumbleweed/x86_64/MozillaFirefox-122.0-3.2.x86_64.rpm
+	source = file://vendor.js
+	sha256sums = 3bfebe1bc30896b40353ffe10c66ee3aabd6f64f77547ef1c671bb7fb5490bef
+	sha256sums = 50879baa1b25f003489a41f5bf2d0ca7ae76c971d34c30728229a832799eed9e
 
 pkgname = firefox-opensuse-bin
diff --git a/PKGBUILD b/PKGBUILD
index 1102633c02bd..d51d71d581ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Package info
 _pkgname=firefox
 pkgname=$_pkgname-opensuse-bin
-pkgver=121.0.1
+pkgver=122.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org with openSUSE patches"
 arch=(x86_64 pentium4 i686 aarch64)
@@ -37,48 +37,34 @@ provides=($_pkgname)
 conflicts=($_pkgname)
 
 # RPM
+_opensuse="Tumbleweed"
 case $CARCH in
   pentium4) _arch=i686 ;;
   *) _arch=$CARCH ;;
 esac
 case $_arch in
   x86_64 | i686) # Use mozilla repo
-    _opensuse="Tumbleweed"
-    _rpmrel="1.3"
-    source=("https://download.opensuse.org/repositories/mozilla/openSUSE_$_opensuse/$_arch/MozillaFirefox-$pkgver-$_rpmrel.$_arch.rpm")
+    _rpmver="$pkgver-3.2"
+    source=("https://download.opensuse.org/repositories/mozilla/openSUSE_$_opensuse/$_arch/MozillaFirefox-$_rpmver.$_arch.rpm")
     ;;
   *) # Use official repo
-    _opensuse="tumbleweed"
-    _rpmrel="1.1"
-    source=("https://download.opensuse.org/ports/$_arch/$_opensuse/repo/oss/$_arch/MozillaFirefox-$pkgver-$_rpmrel.$_arch.rpm")
+    _rpmver="121.0.1-1.1"
+    source=("https://download.opensuse.org/ports/$_arch/${_opensuse,,}/repo/oss/$_arch/MozillaFirefox-$_rpmver.$_arch.rpm")
     ;;
 esac
+source+=("file://vendor.js")
 case $_arch in
-  x86_64) sha256sums=("65837e4a79e88dcff4479b5dabab52c2f2303bacbaadcb8fec609ff221c48e7c") ;;
-  i686) sha256sums=("d3444fd683a6c7ea663c9f62f255929c9fcfac6ac177b2ce562c7285c55c346f") ;;
+  x86_64) sha256sums=("3bfebe1bc30896b40353ffe10c66ee3aabd6f64f77547ef1c671bb7fb5490bef") ;;
+  i686) sha256sums=("13e9d4f121d89ee581a7839d1be5c5bcff434f1cd0902bbddc8dd451e8f1a2c5") ;;
   aarch64) sha256sums=("a7b9bd5ccba5f66058b987c11c07d3c65cf7667a4b5a5760c5187fe2678d68d9") ;;
   *) sha256sums=(SKIP) ;;
 esac
+sha256sums+=("50879baa1b25f003489a41f5bf2d0ca7ae76c971d34c30728229a832799eed9e")
 
 # Build package
 package() {
-  find $srcdir/ -mindepth 1 -maxdepth 1 -type d | xargs cp -r -t "$pkgdir"
+  mv "$srcdir/usr" "$pkgdir/usr"
   mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib"
 
-  install -Dvm644 /dev/stdin "$pkgdir/usr/lib/$_pkgname/browser/defaults/preferences/vendor.js" <<END
-// Use LANG environment variable to choose locale
-pref("intl.locale.requested", "");
-
-// Use system-provided dictionaries
-pref("spellchecker.dictionary_path", "/usr/share/hunspell");
-
-// Disable default browser checking.
-pref("browser.shell.checkDefaultBrowser", false);
-
-// Don't disable extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-
-// Enable GNOME Shell search provider
-pref("browser.gnome-search-provider.enabled", true);
-END
+  install -Dvm644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/browser/defaults/preferences/vendor.js"
 }
diff --git a/getsums.sh b/getsums.sh
new file mode 100755
index 000000000000..ecc80bc32cb8
--- /dev/null
+++ b/getsums.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+opensuse="Tumbleweed"
+mozillarpm="122.0-3.2"
+stdrpm="121.0.1-1.1"
+
+echo "case \$_arch in"
+for arch in x86_64 i686
+do
+  echo "  $arch) sha256sums=(\"$(curl -L "https://download.opensuse.org/repositories/mozilla/openSUSE_$opensuse/$arch/MozillaFirefox-$mozillarpm.$arch.rpm" 2> /dev/null | sha256sum | awk '{print $1}')\") ;;"
+done
+for arch in aarch64
+do
+  echo "  $arch) sha256sums=(\"$(curl -L "https://download.opensuse.org/ports/$arch/${opensuse,,}/repo/oss/$arch/MozillaFirefox-$stdrpm.$arch.rpm" 2> /dev/null | sha256sum | awk '{print $1}')\") ;;"
+done
+echo "  *) sha256sums=(SKIP) ;;"
+echo "esac"
diff --git a/vendor.js b/vendor.js
new file mode 100644
index 000000000000..50d0069c8665
--- /dev/null
+++ b/vendor.js
@@ -0,0 +1,14 @@
+// Use LANG environment variable to choose locale
+pref("intl.locale.requested", "");
+
+// Use system-provided dictionaries
+pref("spellchecker.dictionary_path", "/usr/share/hunspell");
+
+// Disable default browser checking.
+pref("browser.shell.checkDefaultBrowser", false);
+
+// Don't disable extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+
+// Enable GNOME Shell search provider
+pref("browser.gnome-search-provider.enabled", true);