Re: [PR PATCH] [Updated] tree-sitter: build and install tree-sitter CLI.

[gbrlsnchs <gbrlsnchs@users.noreply.github.com>]

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

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

https://github.com/gbrlsnchs/void-packages tree-sitter
https://github.com/void-linux/void-packages/pull/29272

tree-sitter: build and install tree-sitter CLI.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/29272.patch is attached

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

From ad30c6cd4bc2520b98337a642bcb29ac853cc82c Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Mon, 8 Mar 2021 17:47:17 -0300
Subject: [PATCH 1/2] tree-sitter: update to 0.19.2.

---
 common/shlibs                | 1 +
 srcpkgs/tree-sitter/template | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 42f37d8a08b..9f859863a95 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3966,3 +3966,4 @@ libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libpari-gmp.so.7 pari-2.13.0_1
 libtree-sitter.so.0 tree-sitter-0.19.0_1
+libtree-sitter.so.0 tree-sitter-0.19.2_1
diff --git a/srcpkgs/tree-sitter/template b/srcpkgs/tree-sitter/template
index e3218d9b444..fc1d074a5aa 100644
--- a/srcpkgs/tree-sitter/template
+++ b/srcpkgs/tree-sitter/template
@@ -1,6 +1,6 @@
 # Template file for 'tree-sitter'
 pkgname=tree-sitter
-version=0.19.0
+version=0.19.2
 revision=1
 build_style=gnu-makefile
 short_desc="Parser generator tool and incremental parsing library"
@@ -8,7 +8,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
 homepage="https://tree-sitter.github.io"
 distfiles="https://github.com/tree-sitter/${pkgname}/archive/v${version}.tar.gz"
-checksum=7fa56a76b29b170ae11026a5c965e5a1177c158e251bec103d353ffff16a84e9
+checksum=c1b0eace3264799a5b55415bfb8a17ef064ea086205e5e842d47df2296812fe9
 
 post_install() {
 	vlicense LICENSE

From 9635d982180c207f491b02e7cd40c79db0773908 Mon Sep 17 00:00:00 2001
From: Gabriel Sanches <gabriel@gsr.dev>
Date: Sat, 6 Mar 2021 14:56:08 -0300
Subject: [PATCH 2/2] tree-sitter: package the CLI.

---
 srcpkgs/tree-sitter/template | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/tree-sitter/template b/srcpkgs/tree-sitter/template
index fc1d074a5aa..e28860f90a7 100644
--- a/srcpkgs/tree-sitter/template
+++ b/srcpkgs/tree-sitter/template
@@ -2,7 +2,8 @@
 pkgname=tree-sitter
 version=0.19.2
 revision=1
-build_style=gnu-makefile
+build_style=cargo
+make_install_args="--path=cli"
 short_desc="Parser generator tool and incremental parsing library"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="MIT"
@@ -10,7 +11,15 @@ homepage="https://tree-sitter.github.io"
 distfiles="https://github.com/tree-sitter/${pkgname}/archive/v${version}.tar.gz"
 checksum=c1b0eace3264799a5b55415bfb8a17ef064ea086205e5e842d47df2296812fe9
 
+post_build() {
+	# Build libtree-sitter, since do_build builds the tree-sitter CLI.
+	make
+}
+
 post_install() {
+	# Install libtree-sitter, since do_install installs the tree-sitter CLI.
+	make STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} install
+
 	vlicense LICENSE
 }
 
@@ -18,6 +27,7 @@ tree-sitter-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
+		vmove usr/bin
 		vmove usr/include
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"