[arch-commits] Commit in firefox-developer-edition/trunk (3 files)

[Andrew Crerar]

    Date: Monday, June 13, 2022 @ 15:56:25
  Author: andrewsc
Revision: 1237735

upgpkg: firefox-developer-edition 102.0b7-1

- Removed python-psutil makedep and associated patch
- Added patch to remove ROOT_CLIP_CHAIN const definition as cbindgen >= 0.24.1
  attempts to redefine it during compilation. This patch can be removed once
  firefox beta 103 lands as mozcentral already calls for its removal.
  See the following for more details:
    - https://bugzilla.mozilla.org/show_bug.cgi?id=1773070
    - https://phabricator.services.mozilla.com/D148537
    - https://hg.mozilla.org/integration/autoland/rev/51947744ce12

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

------------------+
 PKGBUILD         |   14 +++++++-------
 clip-chain.patch |   12 ++++++++++++
 psutil.patch     |   10 ----------
 3 files changed, 19 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-13 15:52:28 UTC (rev 1237734)
+++ PKGBUILD	2022-06-13 15:56:25 UTC (rev 1237735)
@@ -2,7 +2,7 @@
 # Contributor: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 
 pkgname=firefox-developer-edition
-pkgver=102.0b4
+pkgver=102.0b7
 pkgrel=1
 pkgdesc="Developer Edition of the popular Firefox web browser"
 arch=('x86_64')
@@ -10,8 +10,8 @@
 url="https://www.mozilla.org/firefox/channel/#developer"
 depends=('gtk3' 'libxt' 'mime-types' 'dbus-glib' 'ffmpeg' 'ttf-font' 'libpulse' 'nss')
 makedepends=('unzip' 'zip' 'diffutils' 'python-setuptools' 'yasm' 'mesa' 'imake' 'inetutils'
-             'xorg-server-xvfb' 'autoconf2.13' 'rust' 'clang' 'llvm' 'jack' 'nodejs'
-             'python-psutil' 'cbindgen' 'nasm' 'lld' 'python-zstandard' 'dump_syms'
+             'xorg-server-xvfb' 'autoconf2.13' 'rust' 'clang' 'llvm' 'jack'
+             'nodejs' 'cbindgen' 'nasm' 'lld' 'python-zstandard' 'dump_syms'
              'wasi-compiler-rt' 'wasi-libc' 'wasi-libc++' 'wasi-libc++abi')
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
@@ -25,13 +25,13 @@
         firefox-install-dir.patch
         "$pkgname".desktop
         identity-icons-brand.svg
-        psutil.patch)
-sha512sums=('9338683c7ebde189192e4c826d0068e34ff3d5434a83c0dbd201e1fad0fa084ff367ba30cbbc83a0c7d6a6458a24f74bd843c1b7a7a23fbfeccedab3acad2a3c'
+        clip-chain.patch)
+sha512sums=('78bbdf16dcc39f52c0cbab8c34dacb94dd822aac4db23e0efc5db2c29ba0adba2383b0312f0f6f7788e257c013e85bfd395ec9220f08e20c790cec5d18683753'
             'SKIP'
             'b66dbe7f262d036e5a5b895ab5b0dbb03313bca18b0823c001ef2dbaeb1a33169b57db0cf4dfd268499f28913845119902b5d62e8a6a9cc4820eb0ee2f322a1e'
             '2ff0cb8e2eb94cee306b488adf6d7f4debbaff6155be3ed3eeee814cdb356e2e60fe38cc29d6c8d10079937fd2c930cfddf283977cf645395d31eaf76c7f0ac2'
             'b579b73176c72a5ecf36e3f63bba08fdb8041ae99d54e5cab906660fed6a9cf2311f7ca1ec1649e451cc6d5a4b1e6060b974b1d7befe9c8df3c5a89c50383c17'
-            'd445a6964958de41687eb0f33addee1f382b3e5c8cbb9d568ccaf11e230ef11baa08f166c79750de24958c0f38e4e934c7a04e676b96053cdbdb917653d6a5cd')
+            'df0f1295ae03d9be2401a87d1896bee681c760dfde05d07190a7875d141264fd2d5ace6c6cca4318fb08f60bd8e489ae3a75e244bd7ba5615a7479bb720204eb')
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release at mozilla.com>
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -50,7 +50,7 @@
   mkdir mozbuild
   cd firefox-${pkgver%b*}
   patch -Np1 -i ../firefox-install-dir.patch
-  patch -Np1 -i ../psutil.patch
+  patch -Np1 -i ../clip-chain.patch
 
   echo -n "$_google_api_key" > google-api-key
   echo -n "$_mozilla_api_key" > mozilla-api-key

Added: clip-chain.patch
===================================================================
--- clip-chain.patch	                        (rev 0)
+++ clip-chain.patch	2022-06-13 15:56:25 UTC (rev 1237735)
@@ -0,0 +1,12 @@
+diff --git a/gfx/webrender_bindings/webrender_ffi.h b/gfx/webrender_bindings/webrender_ffi.h
+--- a/gfx/webrender_bindings/webrender_ffi.h
++++ b/gfx/webrender_bindings/webrender_ffi.h
+@@ -73,8 +73,6 @@
+ struct WrPipelineIdAndEpoch;
+ using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>;
+ 
+-const uint64_t ROOT_CLIP_CHAIN = ~0;
+-
+ }  // namespace wr
+ }  // namespace mozilla
+ 

Deleted: psutil.patch
===================================================================
--- psutil.patch	2022-06-13 15:52:28 UTC (rev 1237734)
+++ psutil.patch	2022-06-13 15:56:25 UTC (rev 1237735)
@@ -1,10 +0,0 @@
-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