CVS commit: pkgsrc/www/firefox91

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Sat Dec 10 09:25:58 UTC 2022

Modified Files:
        pkgsrc/www/firefox91: Makefile distinfo
Added Files:
        pkgsrc/www/firefox91/patches:
            patch-gfx_wgpu_wgpu-core_src_device_mod.rs

Log Message:
Fix build with rust 1.64.0 and its stricter borrow checker

(Most excellent patch from adam@ - we get firefox91 back!)

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/www/firefox91/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/www/firefox91/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox91/patches/patch-gfx_wgpu_wgpu-core_src_device_mod.rs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox91/Makefile
diff -u pkgsrc/www/firefox91/Makefile:1.28 pkgsrc/www/firefox91/Makefile:1.29
--- pkgsrc/www/firefox91/Makefile:1.28  Wed Nov 23 16:21:19 2022
+++ pkgsrc/www/firefox91/Makefile       Sat Dec 10 09:25:58 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2022/11/23 16:21:19 adam Exp $
+# $NetBSD: Makefile,v 1.29 2022/12/10 09:25:58 abs Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            91.13
@@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR=       .0esr
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox91-/}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/www/firefox91/distinfo
diff -u pkgsrc/www/firefox91/distinfo:1.17 pkgsrc/www/firefox91/distinfo:1.18
--- pkgsrc/www/firefox91/distinfo:1.17  Tue Sep  6 15:38:35 2022
+++ pkgsrc/www/firefox91/distinfo       Sat Dec 10 09:25:58 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2022/09/06 15:38:35 nia Exp $
+$NetBSD: distinfo,v 1.18 2022/12/10 09:25:58 abs Exp $
 
 BLAKE2s (firefox-91.13.0esr.source.tar.xz) = a531749a2d4610eac5ec648e6d6dfbf6b990c09b03c9d2a1c252c66c8cff90b6
 SHA512 (firefox-91.13.0esr.source.tar.xz) = 38b4cc52de21e76d6061e6ba175e1cbfd888a16070aa951f5a44283f2db9d7e94f2504621f0da78feac6e71491a6d0e7038f63dd0ae112dcad700eb02e9aa516
@@ -18,6 +18,7 @@ SHA1 (patch-gfx_cairo_cairo_src_cairo-ty
 SHA1 (patch-gfx_skia_skia_src_core_SkCpu.cpp) = 36218819254f3681b9c717d652ea78c9f20d49ad
 SHA1 (patch-gfx_thebes_gfxPlatform.cpp) = f6f8996f0818a1b890698c7cc5054d49cb1e8924
 SHA1 (patch-gfx_webrender__bindings_webrender__ffi.h) = 44e73ff006ca1a4bbd42e15a09d7577bfa774353
+SHA1 (patch-gfx_wgpu_wgpu-core_src_device_mod.rs) = 69d16b6e1527b88b8e8d1c56b11d216fe664c826
 SHA1 (patch-gfx_wr_swgl_build.rs) = df6ebfaabb4d27994e59a9d0eaf12c7cf08415fb
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658

Added files:

Index: pkgsrc/www/firefox91/patches/patch-gfx_wgpu_wgpu-core_src_device_mod.rs
diff -u /dev/null pkgsrc/www/firefox91/patches/patch-gfx_wgpu_wgpu-core_src_device_mod.rs:1.1
--- /dev/null   Sat Dec 10 09:25:58 2022
+++ pkgsrc/www/firefox91/patches/patch-gfx_wgpu_wgpu-core_src_device_mod.rs     Sat Dec 10 09:25:58 2022
@@ -0,0 +1,23 @@
+$NetBSD: patch-gfx_wgpu_wgpu-core_src_device_mod.rs,v 1.1 2022/12/10 09:25:58 abs Exp $
+
+Fix build with rust 1.64.0 and its stricter borrow checker
+
+--- gfx/wgpu/wgpu-core/src/device/mod.rs.orig  2022-08-15 18:04:39.000000000 +0000
++++ gfx/wgpu/wgpu-core/src/device/mod.rs
+@@ -1486,6 +1486,7 @@ impl<B: GfxBackend> Device<B> {
+ 
+         // `BTreeMap` has ordered bindings as keys, which allows us to coalesce
+         // the descriptor writes into a single transaction.
++        let mut desc_set; // early declaration so it's dropped after write_map
+         let mut write_map = BTreeMap::new();
+         let mut used_buffer_ranges = Vec::new();
+         for entry in desc.entries.iter() {
+@@ -1779,7 +1780,7 @@ impl<B: GfxBackend> Device<B> {
+             self.desc_allocator
+                 .lock()
+                 .allocate(&self.raw, &layout.raw, &layout.desc_count, 1)?;
+-        let mut desc_set = desc_sets.pop().unwrap();
++        desc_set = desc_sets.pop().unwrap();
+ 
+         // Set the descriptor set's label for easier debugging.
+         if let Some(label) = desc.label.as_ref() {