[pkgsrc/trunk]: pkgsrc/lang/mozjs78 Fix PR pkg/56137 : lang/mozjs78: error: f...

[prlw1 <prlw1%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/aec8cf088c08
branches:  trunk
changeset: 451804:aec8cf088c08
user:      prlw1 <prlw1%pkgsrc.org@localhost>
date:      Sun May 02 07:25:12 2021 +0000

description:
Fix PR pkg/56137 : lang/mozjs78: error: failed to resolve patches
c.f., https://phabricator.services.mozilla.com/D100485

diffstat:

 lang/mozjs78/Makefile                       |   4 ++--
 lang/mozjs78/distinfo                       |   6 ++++--
 lang/mozjs78/patches/patch-.cargo_config.in |  17 +++++++++++++++++
 lang/mozjs78/patches/patch-Cargo.lock       |  15 +++++++++++++++
 lang/mozjs78/patches/patch-Cargo.toml       |   6 ++++--
 5 files changed, 42 insertions(+), 6 deletions(-)

diffs (92 lines):

diff -r a957c33cc0d5 -r aec8cf088c08 lang/mozjs78/Makefile
--- a/lang/mozjs78/Makefile     Sat May 01 21:52:12 2021 +0000
+++ b/lang/mozjs78/Makefile     Sun May 02 07:25:12 2021 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2021/04/21 11:40:27 adam Exp $
+# $NetBSD: Makefile,v 1.18 2021/05/02 07:25:12 prlw1 Exp $
 
 DISTNAME=      mozjs78_78.4.0.orig
 PKGNAME=       ${DISTNAME:S/_/-/:S/.orig//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  http://deb.debian.org/debian/pool/main/m/mozjs78/
 EXTRACT_SUFX=  .tar.xz
diff -r a957c33cc0d5 -r aec8cf088c08 lang/mozjs78/distinfo
--- a/lang/mozjs78/distinfo     Sat May 01 21:52:12 2021 +0000
+++ b/lang/mozjs78/distinfo     Sun May 02 07:25:12 2021 +0000
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.11 2021/04/22 15:50:51 ryoon Exp $
+$NetBSD: distinfo,v 1.12 2021/05/02 07:25:12 prlw1 Exp $
 
 SHA1 (mozjs78_78.4.0.orig.tar.xz) = b2c1c241f70310d545f8a3c05b9c8c11676e56a8
 RMD160 (mozjs78_78.4.0.orig.tar.xz) = cef93b6116eff9f04beeaf3dda0a42cd811d0b18
 SHA512 (mozjs78_78.4.0.orig.tar.xz) = 05a0dd27cd8f330c69bf798f9025dd560e76a1a14628af4caeeae4f7573aef9371e19edb8a8e4cd28e92e189eb3a159b4ffedb1b1bd4b806e065de433cca6ffd
 Size (mozjs78_78.4.0.orig.tar.xz) = 58319040 bytes
-SHA1 (patch-Cargo.toml) = 842e7519d5d2b6daa9ad8de2e0714c779e5c65ec
+SHA1 (patch-.cargo_config.in) = 4ff4f59d8a614ad0abcc90f34fdf21461938c7f8
+SHA1 (patch-Cargo.lock) = e6096719b2df8d3eaaac777686ea83a7f1a0515d
+SHA1 (patch-Cargo.toml) = bb57fc798a7c34332fd6cae52a9c9d5dfe84f6c5
 SHA1 (patch-build_moz.configure_rust.configure) = 149301b4a8fb81f6c64d90672b3137ae6d68461f
 SHA1 (patch-build_moz.configure_toolchain.configure) = 930ed1aec1da8c10c80d8f31dfc5acbf2db31c5f
 SHA1 (patch-js_moz.configure) = f3d762b293761e359ac7c389059aa228949a6f0b
diff -r a957c33cc0d5 -r aec8cf088c08 lang/mozjs78/patches/patch-.cargo_config.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/mozjs78/patches/patch-.cargo_config.in       Sun May 02 07:25:12 2021 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-.cargo_config.in,v 1.1 2021/05/02 07:25:12 prlw1 Exp $
+
+Fix build, c.f., https://phabricator.services.mozilla.com/D100485
+
+--- .cargo//config.in.orig     2020-11-04 10:51:54.000000000 +0000
++++ .cargo//config.in
+@@ -3,9 +3,9 @@
+ # Please do not edit.
+ 
+ [source."https://github.com/shravanrn/nix/";]
+-branch = "r0.13.1"
+ git = "https://github.com/shravanrn/nix/";
+ replace-with = "vendored-sources"
++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
+ 
+ [source."https://github.com/mozilla/rkv";]
+ git = "https://github.com/mozilla/rkv";
diff -r a957c33cc0d5 -r aec8cf088c08 lang/mozjs78/patches/patch-Cargo.lock
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/mozjs78/patches/patch-Cargo.lock     Sun May 02 07:25:12 2021 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Cargo.lock,v 1.1 2021/05/02 07:25:12 prlw1 Exp $
+
+Fix build, c.f., https://phabricator.services.mozilla.com/D100485
+
+--- Cargo.lock.orig    2020-11-04 10:51:54.000000000 +0000
++++ Cargo.lock
+@@ -3200,7 +3200,7 @@ dependencies = [
+ [[package]]
+ name = "nix"
+ version = "0.13.1"
+-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e";
++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e";
+ dependencies = [
+  "bitflags",
+  "cc",
diff -r a957c33cc0d5 -r aec8cf088c08 lang/mozjs78/patches/patch-Cargo.toml
--- a/lang/mozjs78/patches/patch-Cargo.toml     Sat May 01 21:52:12 2021 +0000
+++ b/lang/mozjs78/patches/patch-Cargo.toml     Sun May 02 07:25:12 2021 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-Cargo.toml,v 1.1 2021/04/22 15:50:51 ryoon Exp $
+$NetBSD: patch-Cargo.toml,v 1.2 2021/05/02 07:25:12 prlw1 Exp $
+
+Fix build, c.f., https://phabricator.services.mozilla.com/D100485
 
 --- Cargo.toml.orig    2020-11-04 10:52:09.000000000 +0000
 +++ Cargo.toml
@@ -9,7 +11,7 @@
 -nix = { git = "https://github.com/shravanrn/nix/";, branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
 -spirv_cross = { git = "https://github.com/kvark/spirv_cross";, branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
 +nix = { git = "https://github.com/shravanrn/nix/";, rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
-+spirv_cross = { git = "https://github.com/kvark/spirv_cross";, rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
++spirv_cross = { git = "https://github.com/kvark/spirv_cross";, branch = "wgpu3" }
  # failure's backtrace feature might break our builds, see bug 1608157.
  failure = { git = "https://github.com/badboy/failure";, rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
  failure_derive = { git = "https://github.com/badboy/failure";, rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }