[PR PATCH] delta: update to 0.17.0

[PR PATCH] delta: update to 0.17.0

[tranzystorekk]

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

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

https://github.com/tranzystorekk/void-packages delta
https://github.com/void-linux/void-packages/pull/49318

delta: update to 0.17.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

cc @abenson

<!--
#### 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/49318.patch is attached

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

From 45b79bdbc752803ae6cb586ef46001fea3ad3c3c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 16 Mar 2024 16:13:54 +0100
Subject: [PATCH] delta: update to 0.17.0

---
 .../{bump-git2.patch => downgrade-git2.patch}      |  8 ++++----
 srcpkgs/delta/template                             | 14 ++++++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)
 rename srcpkgs/delta/patches/{bump-git2.patch => downgrade-git2.patch} (55%)

diff --git a/srcpkgs/delta/patches/bump-git2.patch b/srcpkgs/delta/patches/downgrade-git2.patch
similarity index 55%
rename from srcpkgs/delta/patches/bump-git2.patch
rename to srcpkgs/delta/patches/downgrade-git2.patch
index 05255c23c9ccbf..2f1e88ea6e3700 100644
--- a/srcpkgs/delta/patches/bump-git2.patch
+++ b/srcpkgs/delta/patches/downgrade-git2.patch
@@ -1,12 +1,12 @@
 diff --git a/Cargo.toml b/Cargo.toml
-index 8c0c6d8..4fdaa9d 100644
+index d55c68e..b80247b 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -46,7 +46,7 @@ vte = "0.11.0"
- xdg = "2.4.1"
+@@ -57,7 +57,7 @@ clap_complete = "4.4.4"
+ terminal-colorsaurus = "0.3.1"
  
  [dependencies.git2]
--version = "0.16.1"
+-version = "0.18.2"
 +version = "0.17"
  default-features = false
  features = []
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index e0e2c44370d7bf..cbf9d8315842f9 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,8 +1,9 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.16.5
-revision=2
+version=0.17.0
+revision=1
 build_style=cargo
+build_helper=qemu
 hostmakedepends="pkg-config"
 makedepends="libgit2-devel oniguruma-devel"
 checkdepends="git"
@@ -11,12 +12,17 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
-checksum=00d4740e9da4f543f34a2a0503615f8190d307d1180dfb753b6911aa6940197f
+checksum=1abd21587bcc1f2ef0cd342784ce990da9978bc345578e45506419e0952de714
 
 post_patch() {
-	cargo update --package git2@0.16.1 --precise 0.17.2
+	cargo update --package git2@0.18.2 --precise 0.17.2
 }
 
 post_install() {
 	vlicense LICENSE
+
+	for _shell in bash fish zsh; do
+		vtargetrun ${DESTDIR}/usr/bin/delta --generate-completion ${_shell} > delta.${_shell}
+		vcompletion delta.${_shell} ${_shell}
+	done
 }

Re: [PR PATCH] [Updated] delta: update to 0.17.0

[tranzystorekk]

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

There is an updated pull request by tranzystorekk against master on the void-packages repository

https://github.com/tranzystorekk/void-packages delta
https://github.com/void-linux/void-packages/pull/49318

delta: update to 0.17.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

cc @abenson

<!--
#### 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/49318.patch is attached

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

From 698933eeda0f1f482e34449e267b8104bf77cfe9 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 16 Mar 2024 16:13:54 +0100
Subject: [PATCH] delta: update to 0.17.0

---
 .../{bump-git2.patch => downgrade-git2.patch}    |  8 ++++----
 srcpkgs/delta/template                           | 16 ++++++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)
 rename srcpkgs/delta/patches/{bump-git2.patch => downgrade-git2.patch} (55%)

diff --git a/srcpkgs/delta/patches/bump-git2.patch b/srcpkgs/delta/patches/downgrade-git2.patch
similarity index 55%
rename from srcpkgs/delta/patches/bump-git2.patch
rename to srcpkgs/delta/patches/downgrade-git2.patch
index 05255c23c9ccbf..2f1e88ea6e3700 100644
--- a/srcpkgs/delta/patches/bump-git2.patch
+++ b/srcpkgs/delta/patches/downgrade-git2.patch
@@ -1,12 +1,12 @@
 diff --git a/Cargo.toml b/Cargo.toml
-index 8c0c6d8..4fdaa9d 100644
+index d55c68e..b80247b 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -46,7 +46,7 @@ vte = "0.11.0"
- xdg = "2.4.1"
+@@ -57,7 +57,7 @@ clap_complete = "4.4.4"
+ terminal-colorsaurus = "0.3.1"
  
  [dependencies.git2]
--version = "0.16.1"
+-version = "0.18.2"
 +version = "0.17"
  default-features = false
  features = []
diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index e0e2c44370d7bf..d32063d2489442 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,8 +1,11 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.16.5
-revision=2
+version=0.17.0
+revision=1
 build_style=cargo
+build_helper=qemu
+# https://github.com/dandavison/delta/issues/1637
+make_check_args="-- --test-threads=1"
 hostmakedepends="pkg-config"
 makedepends="libgit2-devel oniguruma-devel"
 checkdepends="git"
@@ -11,12 +14,17 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="https://github.com/dandavison/delta/archive/refs/tags/${version}.tar.gz"
-checksum=00d4740e9da4f543f34a2a0503615f8190d307d1180dfb753b6911aa6940197f
+checksum=1abd21587bcc1f2ef0cd342784ce990da9978bc345578e45506419e0952de714
 
 post_patch() {
-	cargo update --package git2@0.16.1 --precise 0.17.2
+	cargo update --package git2@0.18.2 --precise 0.17.2
 }
 
 post_install() {
 	vlicense LICENSE
+
+	for _shell in bash fish zsh; do
+		vtargetrun ${DESTDIR}/usr/bin/delta --generate-completion ${_shell} > delta.${_shell}
+		vcompletion delta.${_shell} ${_shell}
+	done
 }

Re: [PR REVIEW] delta: update to 0.17.0

[abenson]

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/49318#discussion_r1528232368

Comment:
Why do we need to downgrade `git2`?

Re: [PR REVIEW] delta: update to 0.17.0

[tranzystorekk]

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

New review comment by tranzystorekk on void-packages repository

https://github.com/void-linux/void-packages/pull/49318#discussion_r1528382002

Comment:
It sadly pins the version of libgit2 used, so this is the only way to link to version 1.6 void provides.

Re: [PR PATCH] [Merged]: delta: update to 0.17.0

[abenson]

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

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

delta: update to 0.17.0
https://github.com/void-linux/void-packages/pull/49318

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

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

cc @abenson

<!--
#### 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
-->