diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD index 20d9797d4..7647b97e9 100644 --- a/extra/firefox/PKGBUILD +++ b/extra/firefox/PKGBUILD @@ -10,7 +10,7 @@ highmem=1 pkgname=firefox -pkgver=101.0.1 +pkgver=102.0 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org" arch=(x86_64) @@ -28,10 +28,12 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'xdg-desktop-portal: Screensharing with Wayland') 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 build-arm-libopus.patch $pkgname.desktop identity-icons-brand.svg) -sha256sums=('b4c76e8bdf81f473f3e56b2f69dbe5119bba5cab38e36ab0f3f38cf0cdc4a9c2' +sha256sums=('01797f04bd8d65f4c7f628d7ce832bf52a0874433886e4d0d78ef33c1ca66abf' 'SKIP' + 'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be' '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9' '298eae9de76ec53182f38d5c549d0379569916eebf62149f9d7f4a7edef36abf' 'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9') @@ -54,6 +56,9 @@ prepare() { mkdir mozbuild cd firefox-$pkgver + # Unbreak build with python-zstandard 0.18.0 + patch -Np1 -i ../zstandard-0.18.0.diff + echo -n "$_google_api_key" >google-api-key echo -n "$_mozilla_api_key" >mozilla-api-key diff --git a/extra/firefox/zstandard-0.18.0.diff b/extra/firefox/zstandard-0.18.0.diff new file mode 100644 index 000000000..5dfa30557 --- /dev/null +++ b/extra/firefox/zstandard-0.18.0.diff @@ -0,0 +1,10 @@ +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