From cbe6d9d9eae6e45c47bb31b3b90c151e05db1a29 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sat, 10 Jun 2023 13:00:03 +0200 Subject: [PATCH] bat: rebuild for libgit2 --- srcpkgs/bat/patches/bump-git2.patch | 13 +++++++++++++ srcpkgs/bat/template | 6 ++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/bat/patches/bump-git2.patch diff --git a/srcpkgs/bat/patches/bump-git2.patch b/srcpkgs/bat/patches/bump-git2.patch new file mode 100644 index 00000000000..842b57d4ee6 --- /dev/null +++ b/srcpkgs/bat/patches/bump-git2.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 44460e0..78dfbde 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -68,7 +68,7 @@ walkdir = { version = "2.0", optional = true } + bytesize = { version = "1.1.0" } + + [dependencies.git2] +-version = "0.16" ++version = "0.17" + optional = true + default-features = false + diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template index c20fc0e09ed..6d6b39fae61 100644 --- a/srcpkgs/bat/template +++ b/srcpkgs/bat/template @@ -1,7 +1,7 @@ # Template file for 'bat' pkgname=bat version=0.23.0 -revision=1 +revision=2 build_style=cargo hostmakedepends="cmake llvm clang pkg-config" makedepends="libcurl-devel libgit2-devel libssh2-devel oniguruma-devel" @@ -19,7 +19,9 @@ case "$XBPS_TARGET_MACHINE" in *) ;; esac -export RUSTONIG_SYSTEM_LIBONIG=1 +post_patch() { + cargo update --package git2@0.16.1 --precise 0.17.2 +} pre_build() { export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"