Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] delta: update to 0.12.1, restore cross
@ 2022-03-09  1:52 cinerea0
  2022-03-09 22:23 ` [PR PATCH] [Merged]: " leahneukirchen
  0 siblings, 1 reply; 2+ messages in thread
From: cinerea0 @ 2022-03-09  1:52 UTC (permalink / raw)
  To: ml

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

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

https://github.com/cinerea0/void-packages delta
https://github.com/void-linux/void-packages/pull/36055

delta: update to 0.12.1, restore cross
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36055.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-delta-36055.patch --]
[-- Type: text/x-diff, Size: 1194 bytes --]

From 322ed5e4d4d4aa5e78fe07f907c5e7c28e35d7cd Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 8 Mar 2022 20:51:53 -0500
Subject: [PATCH] delta: update to 0.12.1, restore cross

---
 srcpkgs/delta/template | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index 32984c557cb7..dd9809f3f7e1 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,6 +1,6 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.11.3
+version=0.12.1
 revision=1
 build_style=cargo
 checkdepends="git"
@@ -9,9 +9,12 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=cf68f43d4d26c10551c0137a7e718719958e52267d83f29a8f7794af12095b9e
-make_check=no  # TODO: Re-enable checks when Rust gets updated
-nocross=yes # fails with current rust
+checksum=1b97998841305909638008bd9fa3fca597907cb23830046fd2e610632cdabba3
+
+post_patch() {
+	# fixes an indexmap error when cross compiling
+	cargo update --package autocfg --precise 1.1.0
+}
 
 post_install() {
 	vlicense LICENSE

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: delta: update to 0.12.1, restore cross
  2022-03-09  1:52 [PR PATCH] delta: update to 0.12.1, restore cross cinerea0
@ 2022-03-09 22:23 ` leahneukirchen
  0 siblings, 0 replies; 2+ messages in thread
From: leahneukirchen @ 2022-03-09 22:23 UTC (permalink / raw)
  To: ml

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

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

delta: update to 0.12.1, restore cross
https://github.com/void-linux/void-packages/pull/36055

Description:
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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
-->


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-03-09 22:23 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-09  1:52 [PR PATCH] delta: update to 0.12.1, restore cross cinerea0
2022-03-09 22:23 ` [PR PATCH] [Merged]: " leahneukirchen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).