Skip to content

Commit

Permalink
bat: update to 0.24.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tranzystorekk authored and Johnnynator committed Oct 12, 2023
1 parent 38eb546 commit 683922a
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 40 deletions.
13 changes: 0 additions & 13 deletions srcpkgs/bat/patches/bump-git2.patch

This file was deleted.

13 changes: 13 additions & 0 deletions srcpkgs/bat/patches/downgrade-git2.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/Cargo.toml b/Cargo.toml
index e31fbc3..cc4cdf9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -69,7 +69,7 @@ os_str_bytes = { version = "~6.4", optional = true }
run_script = { version = "^0.10.0", optional = true}

[dependencies.git2]
-version = "0.18"
+version = "0.17"
optional = true
default-features = false

38 changes: 11 additions & 27 deletions srcpkgs/bat/template
Original file line number Diff line number Diff line change
@@ -1,45 +1,29 @@
# Template file for 'bat'
pkgname=bat
version=0.23.0
revision=2
version=0.24.0
revision=1
build_style=cargo
hostmakedepends="cmake llvm clang pkg-config"
makedepends="libcurl-devel libgit2-devel libssh2-devel oniguruma-devel"
hostmakedepends="pkg-config"
makedepends="libgit2-devel oniguruma-devel"
short_desc="Cat(1) clone with syntax highlighting and Git integration"
maintainer="John <[email protected]>"
license="Apache-2.0, MIT"
homepage="https://github.com/sharkdp/bat"
changelog="https://raw.githubusercontent.com/sharkdp/bat/master/CHANGELOG.md"
distfiles="https://github.com/sharkdp/bat/archive/refs/tags/v${version}.tar.gz"
checksum=30b6256bea0143caebd08256e0a605280afbbc5eef7ce692f84621eb232a9b31
checksum=907554a9eff239f256ee8fe05a922aad84febe4fe10a499def72a4557e9eedfb

# skip problematic doctests on i686
case "$XBPS_TARGET_MACHINE" in
i686) make_check_args="--tests";;
*) ;;
esac
export BAT_ASSETS_GEN_DIR="${XBPS_BUILDDIR}/${pkgname}-${version}"

post_patch() {
cargo update --package [email protected] --precise 0.17.2
}

pre_build() {
export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"
export CC_${RUST_BUILD//-/_}="${BUILD_CC}"
cargo update --package [email protected] --precise 0.17.2
}

post_install() {
local manpage
vlicense LICENSE-MIT
vdoc README.md
# The manual page is hidden somewhere deep in the build tree
manpage=$(find ${wrksrc}/target -name bat.1 | head -n1)
vman ${manpage}
# Completions are also hidden somewhere deep in the build tree
fish_completion=$(find ${wrksrc}/target -name bat.fish -print -quit)
vcompletion ${fish_completion} fish
zsh_completion=$(find ${wrksrc}/target -name bat.zsh -print -quit)
vcompletion ${zsh_completion} zsh
bash_completion=$(find ${wrksrc}/target -name bat.bash -print -quit)
vcompletion ${bash_completion} bash
vman assets/manual/bat.1
vcompletion assets/completions/bat.fish fish
vcompletion assets/completions/bat.zsh zsh
vcompletion assets/completions/bat.bash bash
}

0 comments on commit 683922a

Please sign in to comment.