RFC: common/build-style/cargo.sh: use --locked for build and check as well

common/build-style/cargo.sh

@@ -5,14 +5,14 @@
 do_build() {
 	: ${make_cmd:=cargo auditable}
 
-	${make_cmd} build --release --target ${RUST_TARGET} ${configure_args}
+	${make_cmd} build --release --locked --target ${RUST_TARGET} ${configure_args}
 }
 
 do_check() {
 	: ${make_cmd:=cargo auditable}
 
-	${make_check_pre} ${make_cmd} test --release --target ${RUST_TARGET} ${configure_args} \
-		${make_check_args}
+	${make_check_pre} ${make_cmd} test --release --locked --target ${RUST_TARGET} \
+		${configure_args} ${make_check_args}
 }
 
 do_install() {

srcpkgs/alert-after/template

@@ -1,7 +1,7 @@
 # Template file for 'alert-after'
 pkgname=alert-after
 version=1.5.1
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="dbus-devel"

srcpkgs/blindfold/template

@@ -1,7 +1,7 @@
 # Template file for 'blindfold'
 pkgname=blindfold
 version=1.0.6
-revision=2
+revision=3
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
@@ -12,6 +12,12 @@ homepage="https://github.com/Eoin-McMahon/blindfold"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=eff539920d4efa5c0fc35067c40347ceb8b01a922f443460a28e8c5e0b3237ca
 
+post_patch() {
+	# Upstream does not ship a lockfile yet:
+	# https://github.com/Eoin-McMahon/blindfold/issues/23
+	cargo generate-lockfile
+}
+
 post_install() {
 	vlicense LICENSE
 }

srcpkgs/cargo-update/template

@@ -1,7 +1,7 @@
 # Template file for 'cargo-update'
 pkgname=cargo-update
 version=13.0.0
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config go-md2man"
 makedepends="libcurl-devel libgit2-devel libssh2-devel openssl-devel"
@@ -18,6 +18,13 @@ if [ "$XBPS_TARGET_MACHINE" == "i686" ]; then
 	make_check_args="-- --skip ops::assert_index_path"
 fi
 
+post_patch() {
+	# Upstream does not ship a lockfile and is very vocal about that being
+	# the right way:
+	# https://github.com/nabijaczleweli/cargo-update/issues/50
+	cargo generate-lockfile
+}
+
 post_install() {
 	vlicense LICENSE
 	vdoc README.md

srcpkgs/desed/template

@@ -1,11 +1,17 @@
 # Template file for 'desed'
 pkgname=desed
 version=1.2.1
-revision=1
+revision=2
 build_style=cargo
 short_desc="Demystify and debug sed scripts"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/SoptikHa2/desed"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=bee8c60d58f11472c036277b0318bdceb5520cce5a61965bc028b26ccbdeb706
+
+post_patch() {
+	# Upstream does not ship a lockfile yet:
+	# https://github.com/SoptikHa2/desed/issues/27
+	cargo generate-lockfile
+}

srcpkgs/exa/patches/0001-Update-lockfile-854.patch

@@ -0,0 +1,129 @@
+From 90b97753adb630513d68be7e66410e2b149ea446 Mon Sep 17 00:00:00 2001
+From: Haren S <harens@macports.org>
+Date: Mon, 26 Apr 2021 22:37:32 +0100
+Subject: [PATCH] Update lockfile (#854)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Update lockfile (exa now requires Rust 1.45.2 or higher)
+
+Co-authored-by: Mélanie Chauvel <perso@hack-libre.org>
+---
+ .travis.yml |  2 +-
+ Cargo.lock  | 22 +++++++++++-----------
+ README.md   |  6 +++---
+ 3 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index cc98081..1f08108 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -1,6 +1,6 @@
+ language: rust
+ rust:
+-  - 1.42.0
++  - 1.45.2
+   - stable
+   - beta
+   - nightly
+diff --git a/Cargo.lock b/Cargo.lock
+index df94188..6a0665d 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -57,7 +57,7 @@ dependencies = [
+
+ [[package]]
+ name = "exa"
+-version = "0.11.0-pre"
++version = "0.10.1"
+ dependencies = [
+  "ansi_term",
+  "datetime",
+@@ -90,9 +90,9 @@ dependencies = [
+
+ [[package]]
+ name = "git2"
+-version = "0.13.17"
++version = "0.13.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1d250f5f82326884bd39c2853577e70a121775db76818ffa452ed1e80de12986"
++checksum = "b483c6c2145421099df1b4efd50e0f6205479a072199460eff852fa15e5603c7"
+ dependencies = [
+  "bitflags",
+  "libc",
+@@ -119,9 +119,9 @@ dependencies = [
+
+ [[package]]
+ name = "idna"
+-version = "0.2.2"
++version = "0.2.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21"
++checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+ dependencies = [
+  "matches",
+  "unicode-bidi",
+@@ -130,9 +130,9 @@ dependencies = [
+
+ [[package]]
+ name = "jobserver"
+-version = "0.1.21"
++version = "0.1.22"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
++checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd"
+ dependencies = [
+  "libc",
+ ]
+@@ -151,9 +151,9 @@ checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
+
+ [[package]]
+ name = "libgit2-sys"
+-version = "0.12.18+1.1.0"
++version = "0.12.19+1.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3da6a42da88fc37ee1ecda212ffa254c25713532980005d5f7c0b0fbe7e6e885"
++checksum = "f322155d574c8b9ebe991a04f6908bb49e68a79463338d24a43d6274cb6443e6"
+ dependencies = [
+  "cc",
+  "libc",
+@@ -357,9 +357,9 @@ dependencies = [
+
+ [[package]]
+ name = "vcpkg"
+-version = "0.2.11"
++version = "0.2.12"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
++checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d"
+
+ [[package]]
+ name = "winapi"
+diff --git a/README.md b/README.md
+index 1939928..898394d 100644
+--- a/README.md
++++ b/README.md
+@@ -201,8 +201,8 @@ To build without Git support, run `cargo install --no-default-features exa` is a
+ <a id="development">
+ <h1>Development
+
+-<a href="https://blog.rust-lang.org/2020/03/12/Rust-1.42.html">
+-    <img src="https://img.shields.io/badge/rustc-1.42+-lightgray.svg" alt="Rust 1.42+" />
++<a href="https://blog.rust-lang.org/2020/08/03/Rust-1.45.2.html">
++    <img src="https://img.shields.io/badge/rustc-1.45.2+-lightgray.svg" alt="Rust 1.45.2+" />
+ </a>
+
+ <a href="https://github.com/ogham/exa/blob/master/LICENCE">
+@@ -211,7 +211,7 @@ To build without Git support, run `cargo install --no-default-features exa` is a
+ </h1></a>
+
+ exa is written in [Rust](https://www.rust-lang.org/).
+-You will need rustc version 1.42.0 or higher.
++You will need rustc version 1.45.2 or higher.
+ The recommended way to install Rust for development is from the [official download page](https://www.rust-lang.org/tools/install), using rustup.
+
+ Once Rust is installed, you can compile exa with Cargo:
+-- 
+2.40.0
+

srcpkgs/exa/template

@@ -1,7 +1,7 @@
 # Template file for 'exa'
 pkgname=exa
 version=0.10.1
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="${pkgname}-${version}"
 build_style=cargo
@@ -15,6 +15,7 @@ distfiles="https://github.com/ogham/exa/archive/refs/tags/v${version}.tar.gz
  https://github.com/ogham/exa/releases/download/v${version}/exa-accoutrements-v${version}.zip"
 checksum="ff0fa0bfc4edef8bdbbb3cabe6fdbd5481a71abbbcc2159f402dea515353ae7c
  531596a1ef2a757c7728087529528150e6eb52bb8224fe575aa00a5f1b762849"
+patch_args="-Np1 -d ${build_wrksrc}"
 
 post_extract() {
 	mkdir "${build_wrksrc}/accoutrements"