[PR PATCH] bat: update to 0.24.0

[PR PATCH] bat: update to 0.24.0

[tranzystorek-io]

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

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

https://github.com/tranzystorek-io/void-packages bat
https://github.com/void-linux/void-packages/pull/46619

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

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

cc @Johnnynator

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

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

From a6b0926287b19ddcb07f5323b964565b67cbc007 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 11 Oct 2023 21:12:28 +0200
Subject: [PATCH] bat: update to 0.24.0

---
 srcpkgs/bat/patches/bump-git2.patch      | 13 --------
 srcpkgs/bat/patches/downgrade-git2.patch | 13 ++++++++
 srcpkgs/bat/template                     | 39 ++++++++----------------
 3 files changed, 25 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/bat/patches/bump-git2.patch
 create mode 100644 srcpkgs/bat/patches/downgrade-git2.patch

diff --git a/srcpkgs/bat/patches/bump-git2.patch b/srcpkgs/bat/patches/bump-git2.patch
deleted file mode 100644
index 842b57d4ee6b3..0000000000000
--- a/srcpkgs/bat/patches/bump-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/patches/downgrade-git2.patch b/srcpkgs/bat/patches/downgrade-git2.patch
new file mode 100644
index 0000000000000..c228946832069
--- /dev/null
+++ b/srcpkgs/bat/patches/downgrade-git2.patch
@@ -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
+ 
diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template
index 6d6b39fae611d..5c69693973ab4 100644
--- a/srcpkgs/bat/template
+++ b/srcpkgs/bat/template
@@ -1,45 +1,30 @@
 # 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"
+configure_args="--features lessopen"
+hostmakedepends="pkg-config"
+makedepends="libgit2-devel oniguruma-devel"
 short_desc="Cat(1) clone with syntax highlighting and Git integration"
 maintainer="John <me@johnnynator.dev>"
 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 git2@0.16.1 --precise 0.17.2
-}
-
-pre_build() {
-	export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"
-	export CC_${RUST_BUILD//-/_}="${BUILD_CC}"
+	cargo update --package git2@0.18.0 --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
 }

Re: [PR PATCH] [Updated] bat: update to 0.24.0

[tranzystorek-io]

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

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

https://github.com/tranzystorek-io/void-packages bat
https://github.com/void-linux/void-packages/pull/46619

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

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

cc @Johnnynator

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

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

From 0a74c4466fa0e8470fffc7bce64e702087b7b1e2 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 11 Oct 2023 21:12:28 +0200
Subject: [PATCH] bat: update to 0.24.0

---
 srcpkgs/bat/patches/bump-git2.patch      | 13 --------
 srcpkgs/bat/patches/downgrade-git2.patch | 13 ++++++++
 srcpkgs/bat/template                     | 38 +++++++-----------------
 3 files changed, 24 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/bat/patches/bump-git2.patch
 create mode 100644 srcpkgs/bat/patches/downgrade-git2.patch

diff --git a/srcpkgs/bat/patches/bump-git2.patch b/srcpkgs/bat/patches/bump-git2.patch
deleted file mode 100644
index 842b57d4ee6b3..0000000000000
--- a/srcpkgs/bat/patches/bump-git2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/patches/downgrade-git2.patch b/srcpkgs/bat/patches/downgrade-git2.patch
new file mode 100644
index 0000000000000..c228946832069
--- /dev/null
+++ b/srcpkgs/bat/patches/downgrade-git2.patch
@@ -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
+ 
diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template
index 6d6b39fae611d..55ef7ae8fa22a 100644
--- a/srcpkgs/bat/template
+++ b/srcpkgs/bat/template
@@ -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 <me@johnnynator.dev>"
 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 git2@0.16.1 --precise 0.17.2
-}
-
-pre_build() {
-	export CFLAGS_${RUST_BUILD//-/_}="${CFLAGS_host}"
-	export CC_${RUST_BUILD//-/_}="${BUILD_CC}"
+	cargo update --package git2@0.18.0 --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
 }

Re: [PR PATCH] [Merged]: bat: update to 0.24.0

[Johnnynator]

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

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

bat: update to 0.24.0
https://github.com/void-linux/void-packages/pull/46619

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

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

cc @Johnnynator

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