From 698933eeda0f1f482e34449e267b8104bf77cfe9 Mon Sep 17 00:00:00 2001 From: Marcin Puc 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 " 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 }