Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_170887481744740"
MIME-Version: 1.0
Date: Sun, 25 Feb 2024 15:26:57 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/textproc/tree-sitter
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20240225152657.8A820FA27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_170887481744740
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Sun Feb 25 15:26:57 UTC 2024

Modified Files:
	pkgsrc/textproc/tree-sitter: Makefile distinfo
	pkgsrc/textproc/tree-sitter/patches: patch-Makefile

Log Message:
tree-sitter: update to 0.21.0.

Breaking

    Remove the apply-all-captures flag, make last-wins precedence the default

    NOTE: This change might cause breakage in your grammar's highlight tests.
    Just flip the order around of the relevant queries, and keep in mind that the
    last query that matches will win.

Features

    Use lockfiles to dedup recompilation
    Improve error message for files with an unknown grammar path (#2475)
    Implement first-line-regex (#2479)
    Error out if an empty string is in the extras array
    Allow specifying an external scanner's files (#3031)
    Better error info when a scanner is missing required symbols
    cli: Add an optional grammar-path argument for the playground (#3014)
    cli: Add optional config-path argument (#3050)
    loader: Add more commonly used default parser directories

Bug Fixes

    Prettify xml output and add node position info (#2970)
    Inherited grammar generation
    Properly error out when the word property is an invalid rule
    Update schema for regex flags (#3006)
    Properly handle Query.matches when filtering out results (#3013)
    Sexp format edge case with quoted closed parenthesis (#3016)
    Always push the default files if there's no externals
    Don't log NUL characters (#3037)
    Don't throw an error if the user uses map in the grammar (#3041)
    Remove redundant imports (#3047)
    cli: Installation via a HTTP tunnel proxy (#2824)
    cli: Don't update tests automatically if parse errors are detected (#3033)
    cli: Don't use long for grammar_path
    test: Allow writing updates to tests without erroneous nodes instead of denying all of them if a single error is found
    test: Edge case when parsing UNEXPECTED/MISSING nodes with an indentation level greater than 0
    wasm: Remove C++ mangled symbols (#2971)

Documentation

    Create issue template (#2978)
    Document regex limitations
    Mention that token($.foo) is illegal
    Explicitly mention behavior of walking outside the given "root" node for a TSTreeCursor (#3021)
    Small fixes (#2987)
    Add Tact language parser (#3030)
    web: Provide deno usage information (#2498)

Refactor

    Extract regex check into a function and lower its precedence
    &PathBuf -> &Path (#3035)
    Name anonymous types in api.h (#1659)

Testing

    Add quotes around bash variables (#3023)
    Update html tests

Build System and CI

    Only create release for normal semver tags (#2973)
    Add useful development targets to makefile (#2979)
    Remove minimum glibc information in summary page (#2988)
    Use the native m1 mac runner (#2995)
    Add editorconfig (#2998)
    Remove symbolic links from repository (#2997)
    Move common Cargo.toml keys into the workspace and inherit them (#3019)
    Remove reviewers when drafting or closing a PR (#2963)
    Enable creating changelogs with git-cliff (#3040)
    Cache fixtures (#3038)
    Don't cancel jobs on master (#3052)
    Relax caching requirements (#3051)
    deps: Bump clap from 4.4.18 to 4.5.0 (#3007)
    deps: Bump wasmtime from v16.0.0 to v17.0.1 (#3008)
    deps: Bump wasmtime to v18.0.1 (#3057)
    sanitize: Add a timeout of 60 minutes (#3017)
    sanitize: Reduce timeout to 20 minutes (#3054)

Other

    Document preferred language for scanner (#2972)
    Add java and tsx to corpus tests (#2992)
    Provide a CLI flag to open log.html (#2996)
    Some more clippy lints (#3010)
    Remove deprecated query parsing mechanism (#3011)
    Print out full compiler arguments ran when it fails (#3018)
    Deprecate C++ scanners (#3020)
    Add some documentation to the playground page (#1495)
    Update relevant rust tests (#2947)
    Clippy lints (#3032)
    Error out when multiple arguments are passed to token/token.immediate (#3036)
    Tidying
    Prefer turbofish syntax where possible (#3048)
    Use published wasmtime crates
    Cleaner cast
    Update Cargo.lock
    Get rid of github_issue_test file (#3055)
    cli: Use spawn to display emcc's stdout and stderr (#2494)
    cli: Warn users when a query path needed for a subcommand isn't specified in a grammar's package.json
    generate: Dedup and warn about duplicate or invalid rules (#2994)
    test: Use different languages for async tests (#2953)
    wasm: Use SIDE_MODULE=2 to silence warning (#3003)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/tree-sitter/Makefile \
    pkgsrc/textproc/tree-sitter/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/tree-sitter/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_170887481744740
Content-Disposition: inline
Content-Length: 3245
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/textproc/tree-sitter/Makefile
diff -u pkgsrc/textproc/tree-sitter/Makefile:1.4 pkgsrc/textproc/tree-sitter/Makefile:1.5
--- pkgsrc/textproc/tree-sitter/Makefile:1.4	Sun Jan 28 13:28:34 2024
+++ pkgsrc/textproc/tree-sitter/Makefile	Sun Feb 25 15:26:57 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2024/01/28 13:28:34 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2024/02/25 15:26:57 wiz Exp $
 
-DISTNAME=	tree-sitter-0.20.9
+DISTNAME=	tree-sitter-0.21.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=tree-sitter/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -12,7 +12,7 @@ LICENSE=	mit
 
 USE_TOOLS+=	gmake
 
-USE_CC_FEATURES+=	c99
+USE_CC_FEATURES+=	c11
 PKGCONFIG_OVERRIDE+=	tree-sitter.pc.in
 
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/tree-sitter/distinfo
diff -u pkgsrc/textproc/tree-sitter/distinfo:1.4 pkgsrc/textproc/tree-sitter/distinfo:1.5
--- pkgsrc/textproc/tree-sitter/distinfo:1.4	Sun Jan 28 13:28:34 2024
+++ pkgsrc/textproc/tree-sitter/distinfo	Sun Feb 25 15:26:57 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2024/01/28 13:28:34 wiz Exp $
+$NetBSD: distinfo,v 1.5 2024/02/25 15:26:57 wiz Exp $
 
-BLAKE2s (tree-sitter-0.20.9.tar.gz) = 9e1f2c72c185a90cf4d3062501fd92bea93245b6b84102340a428360b7dd6485
-SHA512 (tree-sitter-0.20.9.tar.gz) = 6882c0edf87232d42aa40936c6a2da46e6dbb89d28b3def67e9c5231af19a517fbe22cf0ce9aa25a8ad4252cef6cf4aa94a00f8d0503a8bdd99ce0edd99a392a
-Size (tree-sitter-0.20.9.tar.gz) = 3041304 bytes
-SHA1 (patch-Makefile) = 951a61482cd2ffb4e968605587298c7fe1273959
+BLAKE2s (tree-sitter-0.21.0.tar.gz) = 091e154202aa1f71f0eb675039da66c9c0227fc0e9b51f85f956be0138a7be7d
+SHA512 (tree-sitter-0.21.0.tar.gz) = b68a6f0fcf7bf8044bc82d861baf9a445d2e100a1e3fc39b78ecf38cd529281e35350916fe9e5811173a73cbb255fc0bb3f65b6dd6d6852026a7aab56fb8030d
+Size (tree-sitter-0.21.0.tar.gz) = 3055055 bytes
+SHA1 (patch-Makefile) = b4dccbfaccf544ffac1fe28bcb8d156ea820c1c3

Index: pkgsrc/textproc/tree-sitter/patches/patch-Makefile
diff -u pkgsrc/textproc/tree-sitter/patches/patch-Makefile:1.2 pkgsrc/textproc/tree-sitter/patches/patch-Makefile:1.3
--- pkgsrc/textproc/tree-sitter/patches/patch-Makefile:1.2	Sun Jan 28 13:28:34 2024
+++ pkgsrc/textproc/tree-sitter/patches/patch-Makefile	Sun Feb 25 15:26:57 2024
@@ -1,16 +1,16 @@
-$NetBSD: patch-Makefile,v 1.2 2024/01/28 13:28:34 wiz Exp $
+$NetBSD: patch-Makefile,v 1.3 2024/02/25 15:26:57 wiz Exp $
 
 - Avoid to possibly pass extra optimization CFLAGS
 - Do not override PCLIBDIR for FreeBSD, NetBSD and DragonFly
 
---- Makefile.orig	2024-01-25 20:05:17.000000000 +0000
+--- Makefile.orig	2024-02-21 18:32:29.000000000 +0000
 +++ Makefile
 @@ -18,7 +18,7 @@ endif
  OBJ := $(SRC:.c=.o)
  
  # define default flags, and override to append mandatory flags
--override CFLAGS := -O3 -std=gnu99 -fPIC -fvisibility=hidden -Wall -Wextra -Wshadow $(CFLAGS)
-+override CFLAGS := -std=gnu99 -fPIC -fvisibility=hidden -Wall -Wextra -Wshadow $(CFLAGS)
+-override CFLAGS := -O3 -std=gnu11 -fPIC -fvisibility=hidden -Wall -Wextra -Wshadow -pedantic $(CFLAGS)
++override CFLAGS := -std=gnu11 -fPIC -fvisibility=hidden -Wall -Wextra -Wshadow -pedantic $(CFLAGS)
  override CFLAGS += -Ilib/src -Ilib/src/wasm -Ilib/include
  
  # ABI versioning


--_----------=_170887481744740--