[PR PATCH] riff: fix build failure from --locked

[PR PATCH] riff: fix build failure from --locked

[0x5c]

[-- Attachment #1: Type: text/plain, Size: 1416 bytes --]

There is a new pull request by 0x5c against master on the void-packages repository

https://github.com/0x5c/void-packages fix/riff-lock
https://github.com/void-linux/void-packages/pull/43477

riff: fix build failure from --locked
Since the addition of --locked to cargo's build command in #43233, the existing patch causes the build to fail. Cargo add updates the lock file, solving the issue.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/43477.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix/riff-lock-43477.patch --]
[-- Type: text/x-diff, Size: 2018 bytes --]

From 305558d9bf8b4b7cf01e441d98cde0bf1b559222 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sun, 16 Apr 2023 08:36:20 -0400
Subject: [PATCH] riff: fix build failure from --locked

Since the addition of --locked to cargo's build command in #43233, the existing
patch causes the build to fail. Cargo add updates the lock file, solving the
issue.
---
 srcpkgs/riff/patches/doublebuild.patch | 14 --------------
 srcpkgs/riff/template                  | 10 +++++++++-
 2 files changed, 9 insertions(+), 15 deletions(-)
 delete mode 100644 srcpkgs/riff/patches/doublebuild.patch

diff --git a/srcpkgs/riff/patches/doublebuild.patch b/srcpkgs/riff/patches/doublebuild.patch
deleted file mode 100644
index 2f3fcf485bcd..000000000000
--- a/srcpkgs/riff/patches/doublebuild.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Slight hack to prevent a rebuild in the install phase
-
---
-
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,6 +20,7 @@
- num_cpus = "1.13.0"
- threadpool = "1.8.1"
- itertools = "0.10.1"
-+syn = {version = "1.0.48", features = ["full"]}
-
- [dev-dependencies]
- pretty_assertions = "0.6.1"
diff --git a/srcpkgs/riff/template b/srcpkgs/riff/template
index ebb2dceec0cf..c6dbe7f25694 100644
--- a/srcpkgs/riff/template
+++ b/srcpkgs/riff/template
@@ -1,7 +1,7 @@
 # Template file for 'riff'
 pkgname=riff
 version=2.23.2
-revision=1
+revision=2
 build_style=cargo
 short_desc="Diff filter highlighting which line parts have changed"
 maintainer="0x5c <dev@0x5c.io>"
@@ -10,6 +10,14 @@ homepage="https://github.com/walles/riff"
 distfiles="https://github.com/walles/riff/archive/refs/tags/${version}.tar.gz"
 checksum=fc39a75a6e09a3d94c6b2d8a3ad1f7aacae5a9e6da2f66f7b26dac55e82b62f3
 
+post_patch() {
+	# Needed to prevent a rebuilt in do_install()
+	# These are already transitive deps at those versions, but cargo
+	# miscalculates that a feature is dropped when installing.
+	cargo add syn@1.0.48 --features full
+	cargo add libc@0.2.140 --features extra_traits
+}
+
 post_install() {
 	vlicense LICENSE
 }

Re: [PR PATCH] [Merged]: riff: fix build failure from --locked

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 1265 bytes --]

There's a merged pull request on the void-packages repository

riff: fix build failure from --locked
https://github.com/void-linux/void-packages/pull/43477

Description:
Since the addition of --locked to cargo's build command in #43233, the existing patch causes the build to fail. Cargo add updates the lock file, solving the issue.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->