From 11666eb2517967caec2eb44548225f26eeb1d67b Mon Sep 17 00:00:00 2001
From: edd <edd@openbsd.org>
Date: Wed, 1 Apr 2026 19:14:49 +0000
Subject: [PATCH] textproc/tree-sitter: update to v0.26.8.

Diff from Laurent Cheylus, thanks!
---
 textproc/tree-sitter/Makefile               |  7 ++---
 textproc/tree-sitter/distinfo               |  4 +--
 textproc/tree-sitter/patches/patch-Makefile | 34 ++++++++++-----------
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/textproc/tree-sitter/Makefile b/textproc/tree-sitter/Makefile
index 78b78646c54..9b15ea1e7ad 100644
--- a/textproc/tree-sitter/Makefile
+++ b/textproc/tree-sitter/Makefile
@@ -5,12 +5,9 @@ COMMENT =	parser generator tool and incremental parsing library
 
 GH_ACCOUNT =		tree-sitter
 GH_PROJECT =		tree-sitter
-# NOTE: neovim-0.11.* only builds with tree-sitter-0.25.x, so only update
-# tree-sitter at the same time as a neovim-0.12.x update (once released).
-# https://github.com/neovim/neovim/issues/36914
-GH_TAGNAME =		v0.25.10
+GH_TAGNAME =		v0.26.8
 
-SHARED_LIBS +=		tree-sitter	5.0 # 0.25.3
+SHARED_LIBS +=		tree-sitter	6.0 # 0.26.8
 
 CATEGORIES =		textproc
 
diff --git a/textproc/tree-sitter/distinfo b/textproc/tree-sitter/distinfo
index 7d88c3db748..7abac6c9e19 100644
--- a/textproc/tree-sitter/distinfo
+++ b/textproc/tree-sitter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tree-sitter-0.25.10.tar.gz) = rVBAU3U3ASsW724SEKVyuSfHzcK5nR7ojUSn3Nw/9Ew=
-SIZE (tree-sitter-0.25.10.tar.gz) = 864648
+SHA256 (tree-sitter-0.26.8.tar.gz) = 5oJrdTPsOohaulmDd6bSC1pjIf89t2lo6WDCNS06UHc=
+SIZE (tree-sitter-0.26.8.tar.gz) = 908286
diff --git a/textproc/tree-sitter/patches/patch-Makefile b/textproc/tree-sitter/patches/patch-Makefile
index e81fae0dad2..8b447e7663a 100644
--- a/textproc/tree-sitter/patches/patch-Makefile
+++ b/textproc/tree-sitter/patches/patch-Makefile
@@ -5,41 +5,41 @@ pkg-config file.
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -7,7 +7,7 @@ DESCRIPTION := An incremental parsing system for progr
+@@ -3,7 +3,7 @@ DESCRIPTION := An incremental parsing system for progr
  HOMEPAGE_URL := https://tree-sitter.github.io/tree-sitter/
-
+ 
  # install directory layout
 -PREFIX ?= /usr/local
 +PREFIX ?= ${LOCALBASE}
  INCLUDEDIR ?= $(PREFIX)/include
  LIBDIR ?= $(PREFIX)/lib
- PCLIBDIR ?= $(LIBDIR)/pkgconfig
-@@ -43,8 +43,8 @@ ifneq ($(findstring darwin,$(shell $(CC) -dumpmachine)
+ BINDIR ?= $(PREFIX)/bin
+@@ -45,8 +45,8 @@ else ifneq ($(findstring mingw32,$(MACHINE)),)
  else
  	SOEXT = so
  	SOEXTVER_MAJOR = $(SOEXT).$(SONAME_MAJOR)
 -	SOEXTVER = $(SOEXT).$(SONAME_MAJOR).$(SONAME_MINOR)
 -	LINKSHARED += -shared -Wl,-soname,libtree-sitter.$(SOEXTVER)
-+	SOEXTVER = so.${LIBtree-sitter_VERSION}
++	SOEXTVER = $(SOEXT).${LIBtree-sitter_VERSION}
 +	LINKSHARED += -shared
- endif
  ifneq ($(filter $(shell uname),FreeBSD NetBSD DragonFly),)
  	PCLIBDIR := $(PREFIX)/libdata/pkgconfig
-@@ -67,7 +67,7 @@ tree-sitter.pc: lib/tree-sitter.pc.in
+ endif
+@@ -73,7 +73,7 @@ tree-sitter.pc: lib/tree-sitter.pc.in
  		-e 's|@CMAKE_INSTALL_INCLUDEDIR@|$(INCLUDEDIR:$(PREFIX)/%=%)|' \
  		-e 's|@PROJECT_DESCRIPTION@|$(DESCRIPTION)|' \
  		-e 's|@PROJECT_HOMEPAGE_URL@|$(HOMEPAGE_URL)|' \
 -		-e 's|@CMAKE_INSTALL_PREFIX@|$(PREFIX)|' $< > $@
 +		-e 's|@CMAKE_INSTALL_PREFIX@|$(LOCALBASE)|' $< > $@
-
- clean:
- 	$(RM) $(OBJ) tree-sitter.pc libtree-sitter.a libtree-sitter.$(SOEXT)
-@@ -78,8 +78,6 @@ install: all
- 	install -m644 tree-sitter.pc '$(DESTDIR)$(PCLIBDIR)'/tree-sitter.pc
- 	install -m644 libtree-sitter.a '$(DESTDIR)$(LIBDIR)'/libtree-sitter.a
+ 
+ shared: libtree-sitter.$(SOEXT)
+ 
+@@ -93,8 +93,6 @@ ifneq ($(findstring mingw32,$(MACHINE)),)
+ 	install -m755 libtree-sitter.dll.a '$(DESTDIR)$(LIBDIR)'/libtree-sitter.dll.a
+ else
  	install -m755 libtree-sitter.$(SOEXT) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER)
--	ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR)
--	ln -sf libtree-sitter.$(SOEXTVER_MAJOR) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT)
-
+-	cd '$(DESTDIR)$(LIBDIR)' && ln -sf libtree-sitter.$(SOEXTVER) libtree-sitter.$(SOEXTVER_MAJOR)
+-	cd '$(DESTDIR)$(LIBDIR)' && ln -sf libtree-sitter.$(SOEXTVER_MAJOR) libtree-sitter.$(SOEXT)
+ endif
+ 
  uninstall:
- 	$(RM) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.a \