Date: Monday, September 5, 2022 @ 21:48:06 Author: heftig Revision: 455093
Switch to pip; system python packages broke the build again Modified: firefox/trunk/PKGBUILD Deleted: firefox/trunk/zstandard-0.18.0.diff -----------------------+ PKGBUILD | 14 +++++--------- zstandard-0.18.0.diff | 10 ---------- 2 files changed, 5 insertions(+), 19 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-09-05 20:14:02 UTC (rev 455092) +++ PKGBUILD 2022-09-05 21:48:06 UTC (rev 455093) @@ -11,9 +11,9 @@ url="https://www.mozilla.org/firefox/"; 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 + ) optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'pulseaudio: Audio support' @@ -22,11 +22,10 @@ '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 arc4random.diff + arc4random.diff $pkgname.desktop identity-icons-brand.svg) sha256sums=('f23f4198bd9ba1bbb7420a622080301adb924fafbd6d83b00b1e6cc687e75f4e' 'SKIP' - 'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be' '714ca50b2ce0cac470dbd5a60e9a0101b28072f08a5e7a9bba94fef2058321c4' '298eae9de76ec53182f38d5c549d0379569916eebf62149f9d7f4a7edef36abf' 'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9') @@ -48,9 +47,6 @@ 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 @@ -104,7 +100,7 @@ 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 Deleted: zstandard-0.18.0.diff =================================================================== --- zstandard-0.18.0.diff 2022-09-05 20:14:02 UTC (rev 455092) +++ zstandard-0.18.0.diff 2022-09-05 21:48:06 UTC (rev 455093) @@ -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
