summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig)2022-09-01 11:29:18 +0000
committerJan Alexander Steffens (heftig)2022-09-01 11:29:30 +0000
commit303c68f78982c77d5eca42134f057074723588a4 (patch)
tree527e71fc8e1366173229d39e2d1ba4d4e73e30d1
parent4d3a872c14ac5ef594bb4df50bb052cc16573714 (diff)
downloadaur-303c68f78982c77d5eca42134f057074723588a4.tar.gz
106.0a1+20220901.1+haf1fc1e6eb24-1: Switch to pip; system python packages broke the build again
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD14
-rw-r--r--zstandard-0.18.0.diff10
3 files changed, 6 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c6945e7230d..c70b65592da 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = firefox-nightly
pkgdesc = Development version of the popular Firefox web browser
- pkgver = 105.0a1+20220811.1+hd9acc6dde178
+ pkgver = 106.0a1+20220901.1+haf1fc1e6eb24
pkgrel = 1
url = https://www.mozilla.org/firefox/channel/#nightly
arch = x86_64
@@ -23,8 +23,7 @@ pkgbase = firefox-nightly
makedepends = nodejs
makedepends = cbindgen
makedepends = nasm
- makedepends = python-setuptools
- makedepends = python-zstandard
+ makedepends = python
makedepends = lld
makedepends = dump_syms
makedepends = wasi-compiler-rt
@@ -53,13 +52,11 @@ pkgbase = firefox-nightly
options = !debug
source = hg+https://hg.mozilla.org/mozilla-central
source = firefox-install-dir.patch
- source = zstandard-0.18.0.diff
source = firefox-nightly.desktop
source = identity-icons-brand.svg
validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
sha256sums = SKIP
sha256sums = c80937969086550237b0e89a02330d438ce17c3764e43cc5d030cb21c2abce5f
- sha256sums = a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be
sha256sums = 7d90a9abacb5cc9870a31323ef31e361f620538c56609001d6d9e789b99b5e97
sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
diff --git a/PKGBUILD b/PKGBUILD
index 4daade821da..a1f550ecfb8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Jakub Schmidtke <sjakub@gmail.com>
pkgname=firefox-nightly
-pkgver=105.0a1+20220811.1+hd9acc6dde178
+pkgver=106.0a1+20220901.1+haf1fc1e6eb24
pkgrel=1
pkgdesc="Development version of the popular Firefox web browser"
arch=(x86_64)
@@ -11,9 +11,8 @@ license=(MPL GPL LGPL)
url="https://www.mozilla.org/firefox/channel/#nightly"
depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse)
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
mercurial)
optdepends=('networkmanager: Location detection via available WiFi networks'
'libnotify: Notification integration'
@@ -25,11 +24,9 @@ options=(!emptydirs !makeflags !strip !lto !debug)
_repo=https://hg.mozilla.org/mozilla-central
source=("hg+$_repo"
firefox-install-dir.patch
- zstandard-0.18.0.diff
$pkgname.desktop identity-icons-brand.svg)
sha256sums=('SKIP'
'c80937969086550237b0e89a02330d438ce17c3764e43cc5d030cb21c2abce5f'
- 'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be'
'7d90a9abacb5cc9870a31323ef31e361f620538c56609001d6d9e789b99b5e97'
'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9')
validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
@@ -72,9 +69,6 @@ prepare() {
cd mozilla-central
patch -Np1 -i ../firefox-install-dir.patch
- # 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
@@ -122,7 +116,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 5dfa30557dc..00000000000
--- 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