From 41560e8cf2a9130b83667fbf4c2fed8dacd7229d Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Mon, 11 Mar 2024 18:59:14 +0100 Subject: [PATCH] tree-sitter-vim: 0.2.0 -> 0.3.0; renamed from tree-sitter-viml; added dependency on tree-sitter-cli --- .../.footprint | 0 tree-sitter-vim/.signature | 6 +++++ ...6f150347c1cd044e90b8e2bc73c00677fa55.patch | 22 +++++++++++++++++++ {tree-sitter-viml => tree-sitter-vim}/Pkgfile | 13 ++++++----- tree-sitter-viml/.signature | 5 ----- 5 files changed, 36 insertions(+), 10 deletions(-) rename {tree-sitter-viml => tree-sitter-vim}/.footprint (100%) create mode 100644 tree-sitter-vim/.signature create mode 100644 tree-sitter-vim/32c76f150347c1cd044e90b8e2bc73c00677fa55.patch rename {tree-sitter-viml => tree-sitter-vim}/Pkgfile (59%) delete mode 100644 tree-sitter-viml/.signature diff --git a/tree-sitter-viml/.footprint b/tree-sitter-vim/.footprint similarity index 100% rename from tree-sitter-viml/.footprint rename to tree-sitter-vim/.footprint diff --git a/tree-sitter-vim/.signature b/tree-sitter-vim/.signature new file mode 100644 index 000000000..aae31795d --- /dev/null +++ b/tree-sitter-vim/.signature @@ -0,0 +1,6 @@ +untrusted comment: verify with /etc/ports/contrib.pub +RWSagIOpLGJF349f5FJlDpYem7VEfG0W9WsLv3/BxkO3YHwr/Pcj1IdYv/ZG/AT0uP2+mgMaSS6ZUwj3dPCqL/tW2TBm+LwLsQI= +SHA256 (Pkgfile) = d9641242e7244d2fc6fb8463ca19b9171ffb15c011469cdeb5f203cdbe32b269 +SHA256 (.footprint) = d54ff3e392ae984e50a236dc913c6ef827ab4e9496b58c5243d0c83c3983e6b9 +SHA256 (tree-sitter-vim-0.3.0.tar.gz) = 403acec3efb7cdb18ff3d68640fc823502a4ffcdfbb71cec3f98aa786c21cbe2 +SHA256 (32c76f150347c1cd044e90b8e2bc73c00677fa55.patch) = 4a2dde4222d300224295848e07e576e17c7ba52636f42b2a255fd65b476d4da0 diff --git a/tree-sitter-vim/32c76f150347c1cd044e90b8e2bc73c00677fa55.patch b/tree-sitter-vim/32c76f150347c1cd044e90b8e2bc73c00677fa55.patch new file mode 100644 index 000000000..579c4a3c1 --- /dev/null +++ b/tree-sitter-vim/32c76f150347c1cd044e90b8e2bc73c00677fa55.patch @@ -0,0 +1,22 @@ +From 32c76f150347c1cd044e90b8e2bc73c00677fa55 Mon Sep 17 00:00:00 2001 +From: Christian Clason +Date: Sat, 30 Sep 2023 15:42:23 +0200 +Subject: [PATCH] fix(scanner): use local include + +tree-sitter CLI no longer installs the header globally +--- + src/scanner.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/scanner.c b/src/scanner.c +index 1a2d96a..f77fefd 100644 +--- a/src/scanner.c ++++ b/src/scanner.c +@@ -1,6 +1,6 @@ + #include "stdio.h" + #include "stdlib.h" +-#include ++#include "tree_sitter/parser.h" + #include + #include + #include diff --git a/tree-sitter-viml/Pkgfile b/tree-sitter-vim/Pkgfile similarity index 59% rename from tree-sitter-viml/Pkgfile rename to tree-sitter-vim/Pkgfile index 5002729cd..ceb8cdbef 100644 --- a/tree-sitter-viml/Pkgfile +++ b/tree-sitter-vim/Pkgfile @@ -1,16 +1,19 @@ # Description: Tree-sitter parser for VimL -# URL: https://github.com/vigoux/tree-sitter-viml +# URL: https://github.com/tree-sitter-grammars/tree-sitter-vim # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: npm tree-sitter +# Depends on: npm tree-sitter-cli -name=tree-sitter-viml -version=0.2.0 +name=tree-sitter-vim +version=0.3.0 release=1 -source=(https://github.com/vigoux/tree-sitter-viml/archive/v$version/$name-$version.tar.gz) +source=(https://github.com/tree-sitter-grammars/tree-sitter-vim/archive/v$version/$name-$version.tar.gz + 32c76f150347c1cd044e90b8e2bc73c00677fa55.patch) build() { cd $name-$version + patch -Np1 -i $SRC/32c76f150347c1cd044e90b8e2bc73c00677fa55.patch + tree-sitter generate --log cd src export CFLAGS+=' -fPIC' diff --git a/tree-sitter-viml/.signature b/tree-sitter-viml/.signature deleted file mode 100644 index 75a238430..000000000 --- a/tree-sitter-viml/.signature +++ /dev/null @@ -1,5 +0,0 @@ -untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3wmrInBqC5OcEFfFfkfEaUqwnTHSnEjWPIXl4lN8r60KWR9b5h4kMvicu75Y/SOqoyvLT4NgX1xUYjhCjNq1egI= -SHA256 (Pkgfile) = cd0c896238d1531d833cbbd97f043d8c1c94a51e4a9e9406e35702466d7f16cf -SHA256 (.footprint) = d54ff3e392ae984e50a236dc913c6ef827ab4e9496b58c5243d0c83c3983e6b9 -SHA256 (tree-sitter-viml-0.2.0.tar.gz) = 608dcc31a7948cb66ae7f45494620e2e9face1af75598205541f80d782ec4501