104.0.2-1

3 files changed, 12 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 32384b9e8c6c..61f7f9464cd8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-appmenu
 	pkgdesc = Firefox from extra with appmenu patch
-	pkgver = 104.0.1
+	pkgver = 104.0.2
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
 	arch = x86_64
@@ -23,8 +23,7 @@ pkgbase = firefox-appmenu
 	makedepends = nodejs
 	makedepends = cbindgen
 	makedepends = nasm
-	makedepends = python-setuptools
-	makedepends = python-zstandard
+	makedepends = python
 	makedepends = lld
 	makedepends = dump_syms
 	makedepends = wasi-compiler-rt
@@ -46,16 +45,15 @@ pkgbase = firefox-appmenu
 	optdepends = speech-dispatcher: Text-to-Speech
 	optdepends = hunspell-en_US: Spell checking, American English
 	optdepends = xdg-desktop-portal: Screensharing with Wayland
-	provides = firefox=104.0.1
+	provides = firefox=104.0.2
 	conflicts = firefox
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
 	options = !lto
 	options = !debug
-	source = https://archive.mozilla.org/pub/firefox/releases/104.0.1/source/firefox-104.0.1.source.tar.xz
-	source = https://archive.mozilla.org/pub/firefox/releases/104.0.1/source/firefox-104.0.1.source.tar.xz.asc
-	source = zstandard-0.18.0.diff
+	source = https://archive.mozilla.org/pub/firefox/releases/104.0.2/source/firefox-104.0.2.source.tar.xz
+	source = https://archive.mozilla.org/pub/firefox/releases/104.0.2/source/firefox-104.0.2.source.tar.xz.asc
 	source = arc4random.diff
 	source = firefox.desktop
 	source = identity-icons-brand.svg
@@ -63,7 +61,7 @@ pkgbase = firefox-appmenu
 	source = unity-menubar.patch
 	source = fix_csd_window_buttons.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha256sums = f23f4198bd9ba1bbb7420a622080301adb924fafbd6d83b00b1e6cc687e75f4e
+	sha256sums = 72bba06f04e7745f6b02951906413eb1c15a7e253e06e373302162c6219f286a
 	sha256sums = SKIP
 	sha256sums = a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be
 	sha256sums = 714ca50b2ce0cac470dbd5a60e9a0101b28072f08a5e7a9bba94fef2058321c4
diff --git a/PKGBUILD b/PKGBUILD
index 56689143ebaf..8ac1f0077ba8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=firefox-appmenu
 _pkgname=firefox
-pkgver=104.0.1
+pkgver=104.0.2
 pkgrel=1
 pkgdesc="Firefox from extra with appmenu patch"
 arch=(x86_64)
@@ -15,9 +15,9 @@ license=(MPL GPL LGPL)
 url="https://www.mozilla.org/firefox/"
 depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse libdbusmenu-gtk3)
 makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb
-             autoconf2.13 rust clang llvm jack nodejs cbindgen nasm
-             python-setuptools python-zstandard lld dump_syms
-             wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi)
+             autoconf2.13 rust clang llvm jack nodejs cbindgen nasm python
+             lld dump_syms wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi
+             )
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'pulseaudio: Audio support'
@@ -28,16 +28,14 @@ provides=("firefox=$pkgver")
 conflicts=("firefox")
 options=(!emptydirs !makeflags !strip !lto !debug)
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
-        zstandard-0.18.0.diff
         arc4random.diff
         $_pkgname.desktop
         identity-icons-brand.svg
         fix-wayland-build.patch
         unity-menubar.patch
         fix_csd_window_buttons.patch)
-sha256sums=('f23f4198bd9ba1bbb7420a622080301adb924fafbd6d83b00b1e6cc687e75f4e'
+sha256sums=('72bba06f04e7745f6b02951906413eb1c15a7e253e06e373302162c6219f286a'
             'SKIP'
-            'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be'
             '714ca50b2ce0cac470dbd5a60e9a0101b28072f08a5e7a9bba94fef2058321c4'
             '34514a657d6907a159594c51e674eeb81297c431ec26a736417c2fdb995c2c0c'
             'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
@@ -62,9 +60,6 @@ prepare() {
   mkdir mozbuild
   cd firefox-$pkgver
 
-  # Unbreak build with python-zstandard 0.18.0
-  patch -Np1 -i ../zstandard-0.18.0.diff
-
   # Unbreak build with glibc 2.36
   patch -Np1 -i ../arc4random.diff
 
@@ -128,7 +123,7 @@ build() {
   export MOZ_NOSPAM=1
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
   export MOZ_ENABLE_FULL_SYMBOLS=1
-  export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
+  export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=pip
 
   # LTO needs more open files
   ulimit -n 4096
diff --git a/zstandard-0.18.0.diff b/zstandard-0.18.0.diff
deleted file mode 100644
index 5dfa30557dcf..000000000000
--- a/zstandard-0.18.0.diff
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git i/python/sites/mach.txt w/python/sites/mach.txt
-index 01f4f8c23da3b..85cfaf2b273ac 100644
---- i/python/sites/mach.txt
-+++ w/python/sites/mach.txt
-@@ -134,4 +134,4 @@ pypi-optional:glean-sdk==50.1.0:telemetry will not be collected
- # We aren't (yet) able to pin packages in automation, so we have to
- # support down to the oldest locally-installed version (5.4.2).
- pypi-optional:psutil>=5.4.2,<=5.8.0:telemetry will be missing some data
--pypi-optional:zstandard>=0.11.1,<=0.17.0:zstd archives will not be possible to extract
-+pypi-optional:zstandard>=0.11.1,<=0.18.0:zstd archives will not be possible to extract