Date: Tuesday, September 6, 2022 @ 18:43:47 Author: andrewsc Revision: 1294478
upgpkg: firefox-developer-edition 105.0b7-1 - Switched to pip (temporarily) to work around system python bustage - Removed zstandard patch as it isn't being used due to switching to pip per above - Switched to BLAKE2 for checksums - Changed the .desktop filename to fix Wayland application icon issue FS#72379 Modified: firefox-developer-edition/trunk/PKGBUILD Deleted: firefox-developer-edition/trunk/zstandard-0.18.0.diff -----------------------+ PKGBUILD | 29 ++++++++++++----------------- zstandard-0.18.0.diff | 10 ---------- 2 files changed, 12 insertions(+), 27 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-09-06 18:43:42 UTC (rev 1294477) +++ PKGBUILD 2022-09-06 18:43:47 UTC (rev 1294478) @@ -2,16 +2,16 @@ # Contributor: Jan Alexander Steffens (heftig) <hef...@archlinux.org> pkgname=firefox-developer-edition -pkgver=105.0b4 +pkgver=105.0b7 pkgrel=1 pkgdesc="Developer Edition of the popular Firefox web browser" arch=('x86_64') license=('MPL' 'GPL' 'LGPL') -url="https://www.mozilla.org/firefox/channel/#developer" +url="https://www.mozilla.org/firefox/developer" depends=('gtk3' 'libxt' 'mime-types' 'dbus-glib' 'ffmpeg' 'ttf-font' 'libpulse' 'nss') -makedepends=('unzip' 'zip' 'diffutils' 'python-setuptools' 'yasm' 'mesa' 'imake' 'inetutils' +makedepends=('unzip' 'zip' 'diffutils' 'yasm' 'mesa' 'imake' 'inetutils' 'xorg-server-xvfb' 'autoconf2.13' 'rust' 'clang' 'llvm' 'jack' - 'nodejs' 'cbindgen' 'nasm' 'lld' 'python-zstandard' 'dump_syms' + 'nodejs' 'cbindgen' 'nasm' 'lld' 'python' 'dump_syms' 'wasi-compiler-rt' 'wasi-libc' 'wasi-libc++' 'wasi-libc++abi') optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' @@ -24,14 +24,12 @@ source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} firefox-install-dir.patch "$pkgname".desktop - identity-icons-brand.svg - zstandard-0.18.0.diff) -sha512sums=('e0e37808be1f29d67215ae9324aa7ba6c4a585b47dd1b77e86650b24f621eb1b3ae3b47f07f1ecb8679c26e1092680c2762938690e47dd78331637ae44298119' - 'SKIP' - 'b66dbe7f262d036e5a5b895ab5b0dbb03313bca18b0823c001ef2dbaeb1a33169b57db0cf4dfd268499f28913845119902b5d62e8a6a9cc4820eb0ee2f322a1e' - '2ff0cb8e2eb94cee306b488adf6d7f4debbaff6155be3ed3eeee814cdb356e2e60fe38cc29d6c8d10079937fd2c930cfddf283977cf645395d31eaf76c7f0ac2' - 'b579b73176c72a5ecf36e3f63bba08fdb8041ae99d54e5cab906660fed6a9cf2311f7ca1ec1649e451cc6d5a4b1e6060b974b1d7befe9c8df3c5a89c50383c17' - 'c949cf492bc93b6f3f1f827744e0f39e555c518434c8e73e27143a769b0d123fe4ba2cae07b7b7e7b594f8da43383d4fb4cd28b6b52e0d3e7a985afbadfb3d04') + identity-icons-brand.svg) +b2sums=('76c3dad769758e8b62cd9f895cc3ecd0d734176312d61d600908c8cd373d97d59ee7a7b5d9935fd287bf513cfc1d15784119d775c9dc46e507de6b52a017ddd6' + 'SKIP' + 'eb61793257458b20bc7ab5598240bc1901666d7fb7e971941af99ac706d387859642d8fba3130fa31789546b9123c7500edbe6373701ce9fc7d65aef3974c90c' + 'dfb74f902b5b7e4533c6dd91bcade3de809751d2c6d991b5c57c831be3d42759e0d416fc90a71977f17036db5f8b49775b483f5f4032d3022533b8b81f8c9e65' + '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34') validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <rele...@mozilla.com> # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) @@ -51,9 +49,6 @@ cd firefox-${pkgver%b*} 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 @@ -105,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 @@ -193,7 +188,7 @@ "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg" install -Dvm644 ../$pkgname.desktop \ - "$pkgdir/usr/share/applications/$pkgname.desktop" + "$pkgdir/usr/share/applications/${pkgname//-/}.desktop" # Install a wrapper to avoid confusion about binary path install -Dvm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" << END Deleted: zstandard-0.18.0.diff =================================================================== --- zstandard-0.18.0.diff 2022-09-06 18:43:42 UTC (rev 1294477) +++ zstandard-0.18.0.diff 2022-09-06 18:43:47 UTC (rev 1294478) @@ -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