v104.0.2-1

2 files changed, 13 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 84d0b979b0d7..b2483d32db6e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = librewolf
 	pkgdesc = Community-maintained fork of Firefox, focused on privacy, security and freedom.
-	pkgver = 104.0
+	pkgver = 104.0.2
 	pkgrel = 1
 	url = https://librewolf.net/
 	install = librewolf.install
@@ -25,8 +25,7 @@ pkgbase = librewolf
 	makedepends = nodejs
 	makedepends = cbindgen
 	makedepends = nasm
-	makedepends = python-setuptools
-	makedepends = python-zstandard
+	makedepends = python
 	makedepends = git
 	makedepends = binutils
 	makedepends = lld
@@ -57,19 +56,17 @@ pkgbase = librewolf
 	options = !debug
 	backup = usr/lib/librewolf/librewolf.cfg
 	backup = usr/lib/librewolf/distribution/policies.json
-	source = https://archive.mozilla.org/pub/firefox/releases/104.0/source/firefox-104.0.source.tar.xz
-	source = https://archive.mozilla.org/pub/firefox/releases/104.0/source/firefox-104.0.source.tar.xz.asc
-	source = https://raw.githubusercontent.com/archlinux/svntogit-packages/1f6f9abcdcb2a03f259602b4671208b15cc6d4b9/trunk/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 = https://github.com/archlinuxarm/PKGBUILDs/raw/20308ce75b0eecf1fae0db7d7ab07fb68b3000dc/extra/firefox/arc4random.diff
 	source = librewolf.desktop
-	source = git+https://gitlab.com/librewolf-community/browser/source.git#commit=ee6c58fd8d0d7f7b58baff70e75873184d3114fb
+	source = git+https://gitlab.com/librewolf-community/browser/source.git#commit=64ade27afdf4fd9da67cdc04b55eefe5542e70be
 	source = git+https://gitlab.com/librewolf-community/settings.git#tag=6.9
 	source = default192x192.png
 	source = 0018-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha256sums = 1a294a651dc6260f9a72a3ab9f10e7792a4ab41a9cfa8527ad3dd9979cdc98ce
+	sha256sums = 72bba06f04e7745f6b02951906413eb1c15a7e253e06e373302162c6219f286a
 	sha256sums = SKIP
-	sha256sums = a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be
 	sha256sums = 714ca50b2ce0cac470dbd5a60e9a0101b28072f08a5e7a9bba94fef2058321c4
 	sha256sums = 21054a5f41f38a017f3e1050ccc433d8e59304864021bef6b99f0d0642ccbe93
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 4aa38199e1f6..9ac7cc818c3c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=librewolf
 _pkgname=LibreWolf
-pkgver=104.0
+pkgver=104.0.2
 pkgrel=1
 pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom."
 arch=(x86_64 aarch64)
@@ -10,8 +10,8 @@ license=(MPL GPL LGPL)
 url="https://librewolf.net/"
 depends=(gtk3 libxt mime-types dbus-glib nss ttf-font libpulse ffmpeg)
 makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb
-             autoconf2.13 rust clang llvm jack nodejs cbindgen nasm
-             python-setuptools python-zstandard git binutils lld dump_syms
+             autoconf2.13 rust clang llvm jack nodejs cbindgen nasm python
+             git binutils lld dump_syms
              'wasi-compiler-rt>13' 'wasi-libc>=1:0+258+30094b6' 'wasi-libc++>13' 'wasi-libc++abi>13' pciutils) # pciutils: only to avoid some PGO warning
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
@@ -25,12 +25,11 @@ options=(!emptydirs !makeflags !strip !lto !debug)
 _arch_git=https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/firefox/trunk
 # _source_tag="${pkgver}-${pkgrel%.*}"
 _source_tag="${pkgver}-${pkgrel}"
-_source_commit='ee6c58fd8d0d7f7b58baff70e75873184d3114fb'
+_source_commit='64ade27afdf4fd9da67cdc04b55eefe5542e70be'
 _settings_tag='6.9'
 # _settings_commit='02212c3f44e7aa68b22c8febd9158580d7e4b74f'
 install='librewolf.install'
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
-        https://raw.githubusercontent.com/archlinux/svntogit-packages/1f6f9abcdcb2a03f259602b4671208b15cc6d4b9/trunk/zstandard-0.18.0.diff
         https://github.com/archlinuxarm/PKGBUILDs/raw/20308ce75b0eecf1fae0db7d7ab07fb68b3000dc/extra/firefox/arc4random.diff
         $pkgname.desktop
         "git+https://gitlab.com/${pkgname}-community/browser/source.git#commit=${_source_commit}"
@@ -39,9 +38,8 @@ source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-
         "0018-bmo-1516081-Disable-watchdog-during-PGO-builds.patch"
         )
 # source_aarch64=()
-sha256sums=('1a294a651dc6260f9a72a3ab9f10e7792a4ab41a9cfa8527ad3dd9979cdc98ce'
+sha256sums=('72bba06f04e7745f6b02951906413eb1c15a7e253e06e373302162c6219f286a'
             'SKIP'
-            'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be'
             '714ca50b2ce0cac470dbd5a60e9a0101b28072f08a5e7a9bba94fef2058321c4'
             '21054a5f41f38a017f3e1050ccc433d8e59304864021bef6b99f0d0642ccbe93'
             'SKIP'
@@ -163,9 +161,6 @@ fi
     patch -Np1 -i ../arc4random.diff
   fi
 
-  # Unbreak build with python-zstandard 0.18.0
-  patch -Np1 -i ../zstandard-0.18.0.diff
-
   # upstream patches from gentoo
 
   # pgo improvements
@@ -282,8 +277,8 @@ 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 PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach # let us hope this is a working _new_ workaround for the pip env issues?
+  export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=pip
+  # export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach # let us hope this is a working _new_ workaround for the pip env issues?
 
   # LTO needs more open files
   ulimit -n 4096