From 7272fce5d30b90a2a1be99b2684a2124b1d3993d Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Fri, 4 Feb 2022 22:54:05 +0100
Subject: [PATCH] community/tree-sitter-*: rebuild with tree-sitter 0.20.4-r4
---
community/tree-sitter-bash/APKBUILD | 2 +-
community/tree-sitter-c/APKBUILD | 2 +-
community/tree-sitter-cpp/APKBUILD | 2 +-
community/tree-sitter-css/APKBUILD | 2 +-
community/tree-sitter-elm/APKBUILD | 2 +-
community/tree-sitter-embedded-template/APKBUILD | 2 +-
community/tree-sitter-html/APKBUILD | 2 +-
community/tree-sitter-java/APKBUILD | 2 +-
community/tree-sitter-javascript/APKBUILD | 2 +-
community/tree-sitter-jsdoc/APKBUILD | 2 +-
community/tree-sitter-json/APKBUILD | 2 +-
community/tree-sitter-julia/APKBUILD | 2 +-
community/tree-sitter-python/APKBUILD | 2 +-
community/tree-sitter-regex/APKBUILD | 2 +-
community/tree-sitter-ruby/APKBUILD | 2 +-
community/tree-sitter-rust/APKBUILD | 2 +-
community/tree-sitter-scala/APKBUILD | 2 +-
community/tree-sitter-toml/APKBUILD | 2 +-
community/tree-sitter-tsq/APKBUILD | 2 +-
community/tree-sitter-typescript/APKBUILD | 12 +++++++++---
20 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/community/tree-sitter-bash/APKBUILD b/community/tree-sitter-bash/APKBUILD
index 932fdc05b5a7..95f124a676f2 100644
--- a/community/tree-sitter-bash/APKBUILD
+++ b/community/tree-sitter-bash/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tree-sitter-bash
pkgver=0.19.0
-pkgrel=2
+pkgrel=3
pkgdesc="Bash grammar for tree-sitter"
url="https://github.com/tree-sitter/tree-sitter-bash"
arch="all"
diff --git a/community/tree-sitter-c/APKBUILD b/community/tree-sitter-c/APKBUILD
index d69967e6d215..da5ac24d7313 100644
--- a/community/tree-sitter-c/APKBUILD
+++ b/community/tree-sitter-c/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tree-sitter-c
pkgver=0.20.1
-pkgrel=2
+pkgrel=3
pkgdesc="C grammar for tree-sitter"
url="https://github.com/tree-sitter/tree-sitter-c"
arch="all"
diff --git a/community/tree-sitter-cpp/APKBUILD b/community/tree-sitter-cpp/APKBUILD
index d5c05011983c..2cbe7c1d9fc9 100644
--- a/community/tree-sitter-cpp/APKBUILD
+++ b/community/tree-sitter-cpp/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tree-sitter-cpp
pkgver=0.20.0
-pkgrel=2
+pkgrel=3
pkgdesc="C++ grammar for tree-sitter"
url="https://github.com/tree-sitter/tree-sitter-cpp"
arch="all"
diff --git a/community/tree-sitter-css/APKBUILD b/community/tree-sitter-css/APKBUILD
index 3bf55d278509..8fbcd44182c2 100644
--- a/community/tree-sitter-css/APKBUILD
+++ b/community/tree-sitter-css/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tree-sitter-css
pkgver=0.19.0
-pkgrel=2
+pkgrel=3
pkgdesc="CSS grammar for tree-sitter"
url="https://github.com/tree-sitter/tree-sitter-css"
arch="all"
diff --git a/community/tree-sitter-elm/APKBUILD b/community/tree-sitter-elm/APKBUILD
index a6248177da69..38371b6e235c 100644
--- a/community/tree-sitter-elm/APKBUILD
+++ b/community/tree-sitter-elm/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tree-sitter-elm
pkgver=5.5.0
-pkgrel=0
+pkgrel=1
pkgdesc="Elm grammar for tree-sitter"
url="https://github.com/elm-tooling/tree-sitter-elm"
arch="all"
diff --git a/community/tree-sitter-embedded-template/APKBUILD b/community/tree-sitter-embedded-template/APKBUILD
index 8200c18ea96c..14c39c568fce 100644
--- a/community/tree-sitter-embedded-template/APKBUILD
+++ b/community/tree-sitter-embedded-template/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tree-sitter-embedded-template
pkgver=0.19.0
-pkgrel=2
+pkgrel=3
pkgdesc="Tree-sitter grammar for embedded template languages like ERB, EJS"
url="https://github.com/tree-sitter/tree-sitter-embedded-template"
arch="all"
diff --git a/community/tree-sitter-html/APKBUILD b/community/tree-sitter-html/APKBUILD
index a582cbb0779c..afa32a627877 100644
--- a/community/tree-sitter-html/APKBUILD
+++ b/community/tree-sitter-html/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tree-sitter-html
pkgver=0.19.0
-pkgrel=2
+pkgrel=3
pkgdesc="HTML grammar for tree-sitter"
url="https://github.com/tree-sitter/tree-sitter-html"
arch="all"
diff --git a/community/tree-sitter-java/APKBUILD b/community/tree-sitter-java/APKBUILD
index 4afef6303911..5381d25984eb 100644
--- a/community/tree-sitter-java/APKBUILD
+++ b/community/tree-sitter-java/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tree-sitter-java
pkgver=0.19.1
-pkgrel=2
+pkgrel=3
pkgdesc="Java grammar for tree-sitter"
url="https://github.com/tree-sitter/tree-sitter-java"
arch="all"
diff --git a/community/tree-sitter-javascript/APKBUILD b/community/tree-sitter-javascript/APKBUILD
index d9a0e3068f64..1a0801ecf573 100644
--- a/community/tree-sitter-javascript/APKBUILD
+++ b/community/tree-sitter-javascript/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tree-sitter-javascript
pkgver=0.20.0
-pkgrel=2
+pkgrel=3
pkgdesc="JavaScript grammar for tree-sitter"
url="https://github.com/tree-sitter/tree-sitter-javascript"
arch="all"
diff --git a/community/tree-sitter-jsdoc/APKBUILD b/community/tree-sitter-jsdoc/APKBUILD
index c5b7cadce7e7..ff482656773f 100644
--- a/community/tree-sitter-jsdoc/APKBUILD
+++ b/community/tree-sitter-jsdoc/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tree-sitter-jsdoc
pkgver=0.19.0
-pkgrel=2
+pkgrel=3
pkgdesc="JSDoc grammar for tree-sitter"
url="https://github.com/tree-sitter/tree-sitter-jsdoc"
arch="all"
diff --git a/community/tree-sitter-json/APKBUILD b/community/tree-sitter-json/APKBUILD
index 03e658c03d38..79d16397e7b1 100644
--- a/community/tree-sitter-json/APKBUILD
+++ b/community/tree-sitter-json/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tree-sitter-json
pkgver=0.19.0
-pkgrel=2
+pkgrel=3
pkgdesc="JSON grammar for tree-sitter"
url="https://github.com/tree-sitter/tree-sitter-json"
arch="all"
diff --git a/community/tree-sitter-julia/APKBUILD b/community/tree-sitter-julia/APKBUILD
index c34973d67e31..ecf0f90ca105 100644
--- a/community/tree-sitter-julia/APKBUILD
+++ b/community/tree-sitter-julia/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tree-sitter-julia
pkgver=0.19.0
-pkgrel=2
+pkgrel=3
pkgdesc="Julia grammar for tree-sitter"
url="https://github.com/tree-sitter/tree-sitter-julia"
arch="all"
diff --git a/community/tree-sitter-python/APKBUILD b/community/tree-sitter-python/APKBUILD
index 69f10f7cf0fa..9639303cb905 100644
--- a/community/tree-sitter-python/APKBUILD
+++ b/community/tree-sitter-python/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tree-sitter-python
pkgver=0.19.1
-pkgrel=2
+pkgrel=3
pkgdesc="Python grammar for tree-sitter"
url="https://github.com/tree-sitter/tree-sitter-python"
arch="all"
diff --git a/community/tree-sitter-regex/APKBUILD b/community/tree-sitter-regex/APKBUILD
index 654fc6d8574c..3ce793700a69 100644
--- a/community/tree-sitter-regex/APKBUILD
+++ b/community/tree-sitter-regex/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tree-sitter-regex
pkgver=0.19.0
-pkgrel=2
+pkgrel=3
pkgdesc="Tree-sitter grammar for regular expressions"
url="https://github.com/tree-sitter/tree-sitter-regex"
arch="all"
diff --git a/community/tree-sitter-ruby/APKBUILD b/community/tree-sitter-ruby/APKBUILD
index e9fc39376ffa..2d6197926605 100644
--- a/community/tree-sitter-ruby/APKBUILD
+++ b/community/tree-sitter-ruby/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tree-sitter-ruby
pkgver=0.19.0
-pkgrel=2
+pkgrel=3
pkgdesc="Ruby grammar for tree-sitter"
url="https://github.com/tree-sitter/tree-sitter-ruby"
arch="all"
diff --git a/community/tree-sitter-rust/APKBUILD b/community/tree-sitter-rust/APKBUILD
index 537743d49ed1..2bebe09f8590 100644
--- a/community/tree-sitter-rust/APKBUILD
+++ b/community/tree-sitter-rust/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tree-sitter-rust
pkgver=0.20.0
-pkgrel=2
+pkgrel=3
pkgdesc="Rust grammar for tree-sitter"
url="https://github.com/tree-sitter/tree-sitter-rust"
arch="all"
diff --git a/community/tree-sitter-scala/APKBUILD b/community/tree-sitter-scala/APKBUILD
index 513fdbfc6a82..780368dbedf3 100644
--- a/community/tree-sitter-scala/APKBUILD
+++ b/community/tree-sitter-scala/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tree-sitter-scala
pkgver=0.19.0
-pkgrel=0
+pkgrel=1
pkgdesc="Scala grammar for tree-sitter"
url="https://github.com/tree-sitter/tree-sitter-scala"
arch="all"
diff --git a/community/tree-sitter-toml/APKBUILD b/community/tree-sitter-toml/APKBUILD
index e08024c2a091..efe6bae328e9 100644
--- a/community/tree-sitter-toml/APKBUILD
+++ b/community/tree-sitter-toml/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tree-sitter-toml
pkgver=0.5.1
-pkgrel=0
+pkgrel=1
pkgdesc="TOML grammar for tree-sitter"
url="https://github.com/ikatyang/tree-sitter-toml"
arch="all"
diff --git a/community/tree-sitter-tsq/APKBUILD b/community/tree-sitter-tsq/APKBUILD
index 619684f888cd..edf2194eb225 100644
--- a/community/tree-sitter-tsq/APKBUILD
+++ b/community/tree-sitter-tsq/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tree-sitter-tsq
pkgver=0.19.0
-pkgrel=0
+pkgrel=1
pkgdesc="Tree-sitter grammar for the tree-sitter query language"
url="https://github.com/tree-sitter/tree-sitter-tsq"
arch="all"
diff --git a/community/tree-sitter-typescript/APKBUILD b/community/tree-sitter-typescript/APKBUILD
index 14ef663d1c76..a705d9f70d9d 100644
--- a/community/tree-sitter-typescript/APKBUILD
+++ b/community/tree-sitter-typescript/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=tree-sitter-typescript
pkgver=0.20.0
-pkgrel=2
+pkgrel=3
pkgdesc="TypeScript grammar for tree-sitter"
url="https://github.com/tree-sitter/tree-sitter-typescript"
arch="all"
@@ -18,14 +18,20 @@ _langs='tsx typescript'
build() {
local lang; for lang in $_langs; do
- abuild-tree-sitter build -C "$lang/src"
+ abuild-tree-sitter build -s "$lang/src"
done
}
package() {
+ local querydir="$pkgdir/usr/share/tree-sitter/queries"
+
local lang; for lang in $_langs; do
- DESTDIR="$pkgdir" abuild-tree-sitter install -C "$lang/src"
+ DESTDIR="$pkgdir" abuild-tree-sitter install -s "$lang/src"
done
+
+ rm "$querydir"/tsx/*
+ echo '; inherits: typescript' > "$querydir"/tsx/highlights.scm
+ echo '; inherits: typescript' > "$querydir"/tsx/injections.scm
}
sha512sums="
--
GitLab