[arch-commits] Commit in firefox-developer-edition/trunk (PKGBUILD psutil.patch)

[Andrew Crerar]

    Date: Wednesday, April 6, 2022 @ 17:26:29
  Author: andrewsc
Revision: 1181602

upgpkg: firefox-developer-edition 100.0b2-1

- Added psutil.patch to satisfy assertion made by mach for system
  python-psutil (Arch is a minor ver. ahead of upstream's upper
  minor ver. bound, currently)
- Use new MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE env var. in place of
  the now deprecated MACH_USE_SYSTEM_PYTHON env var.
- Continue to use host system's Python packages at build time (as indiciated
  by the new env var. above)

Added:
  firefox-developer-edition/trunk/psutil.patch
Modified:
  firefox-developer-edition/trunk/PKGBUILD

--------------+
 PKGBUILD     |   13 ++++++++-----
 psutil.patch |   10 ++++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-06 15:36:59 UTC (rev 1181601)
+++ PKGBUILD	2022-04-06 17:26:29 UTC (rev 1181602)
@@ -2,7 +2,7 @@
 # Contributor: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 
 pkgname=firefox-developer-edition
-pkgver=99.0b8
+pkgver=100.0b2
 pkgrel=1
 pkgdesc="Developer Edition of the popular Firefox web browser"
 arch=('x86_64')
@@ -24,12 +24,14 @@
 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)
-sha512sums=('0f7b5017c38e45114dd56220fb87b2529736970099a08d7bbe115907af0dfa0d91c93842e8879a6103350eb9b9d2aa8b8ab0bd7974813e98bdd6d0936cc13422'
+        identity-icons-brand.svg
+        psutil.patch)
+sha512sums=('8355193bdaf97555284bf2670a2925981aae113dac439d572d9236cf434ef3800122f49b4e49b6549ed66402c720cb44f4125eb2ce53f009b1ff2c130be27519'
             'SKIP'
             'b66dbe7f262d036e5a5b895ab5b0dbb03313bca18b0823c001ef2dbaeb1a33169b57db0cf4dfd268499f28913845119902b5d62e8a6a9cc4820eb0ee2f322a1e'
             '2ff0cb8e2eb94cee306b488adf6d7f4debbaff6155be3ed3eeee814cdb356e2e60fe38cc29d6c8d10079937fd2c930cfddf283977cf645395d31eaf76c7f0ac2'
-            'b579b73176c72a5ecf36e3f63bba08fdb8041ae99d54e5cab906660fed6a9cf2311f7ca1ec1649e451cc6d5a4b1e6060b974b1d7befe9c8df3c5a89c50383c17')
+            'b579b73176c72a5ecf36e3f63bba08fdb8041ae99d54e5cab906660fed6a9cf2311f7ca1ec1649e451cc6d5a4b1e6060b974b1d7befe9c8df3c5a89c50383c17'
+            'd445a6964958de41687eb0f33addee1f382b3e5c8cbb9d568ccaf11e230ef11baa08f166c79750de24958c0f38e4e934c7a04e676b96053cdbdb917653d6a5cd')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release at mozilla.com>
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -48,6 +50,7 @@
   mkdir mozbuild
   cd firefox-${pkgver%b*}
   patch -Np1 -i ../firefox-install-dir.patch
+  patch -Np1 -i ../psutil.patch
 
   echo -n "$_google_api_key" > google-api-key
   echo -n "$_mozilla_api_key" > mozilla-api-key
@@ -100,7 +103,7 @@
   export MOZ_NOSPAM=1
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
   export MOZ_ENABLE_FULL_SYMBOLS=1
-  export MACH_USE_SYSTEM_PYTHON=1
+  export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
 
   # LTO needs more open files
   ulimit -n 4096

Added: psutil.patch
===================================================================
--- psutil.patch	                        (rev 0)
+++ psutil.patch	2022-04-06 17:26:29 UTC (rev 1181602)
@@ -0,0 +1,10 @@
+diff --git a/python/sites/mach.txt b/python/sites/mach.txt
+--- a/python/sites/mach.txt
++++ b/python/sites/mach.txt
+@@ -133,5 +133,5 @@
+ # Mach gracefully handles the case where `psutil` is unavailable.
+ # 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:psutil>=5.4.2,<=5.9.0:telemetry will be missing some data
+ pypi-optional:zstandard>=0.11.1,<=0.17.0:zstd archives will not be possible to extract