diff --git a/ports/tree-sitter/CMakeLists.txt b/ports/tree-sitter/CMakeLists.txt index aef0bddb61..b5e0b8a555 100644 --- a/ports/tree-sitter/CMakeLists.txt +++ b/ports/tree-sitter/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.20) project( tree-sitter LANGUAGES C - VERSION 0.20.6 + VERSION 0.25.1 ) set(TS_SOVERSION_MAJOR 0) @@ -39,7 +39,6 @@ install( ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") install(FILES "${PROJECT_SOURCE_DIR}/include/tree_sitter/api.h" - "${PROJECT_SOURCE_DIR}/include/tree_sitter/parser.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/tree_sitter") install( diff --git a/ports/tree-sitter/pkgconfig.patch b/ports/tree-sitter/pkgconfig.patch deleted file mode 100644 index 88de4eca49..0000000000 --- a/ports/tree-sitter/pkgconfig.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/tree-sitter.pc.in b/lib/tree-sitter.pc.in -similarity index 61% -rename from tree-sitter.pc.in -rename to lib/tree-sitter.pc.in -index f98816cb..71a3b4f9 100644 ---- a/tree-sitter.pc.in -+++ b/lib/tree-sitter.pc.in -@@ -1,10 +1,10 @@ --prefix=@PREFIX@ --libdir=@LIBDIR@ --includedir=@INCLUDEDIR@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+libdir=${prefix}/lib -+includedir=${prefix}/include - - Name: tree-sitter - Description: An incremental parsing system for programming tools - URL: https://tree-sitter.github.io/ --Version: @VERSION@ -+Version: @PROJECT_VERSION@ - Libs: -L${libdir} -ltree-sitter - Cflags: -I${includedir} diff --git a/ports/tree-sitter/portfile.cmake b/ports/tree-sitter/portfile.cmake index 46ec95667b..09fc211f14 100644 --- a/ports/tree-sitter/portfile.cmake +++ b/ports/tree-sitter/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tree-sitter/tree-sitter - REF ccd6bf554d922596ce905730d98a77af368bba5c #v0.20.6 - SHA512 ab7eeecafc9d7d17093e25479903fa8c77a84ce4c3a41d737d49bcf9348ab6cc55cf3d6cce0229781292c2b05342fbf45641e40545ea3fde09e441e02f2cdb83 + REF "v${VERSION}" + SHA512 9861b18c7209e3c37d180a399bcae181cea46c4e58eff743ff6044ed0f2923ee838fa88993f1266272e07163748d5df1bef7d7dc6d8800e004e8af1227e489af HEAD_REF master - PATCHES pkgconfig.patch ) # currently not supported upstream diff --git a/ports/tree-sitter/vcpkg.json b/ports/tree-sitter/vcpkg.json index 6941c4db93..d96525a32a 100644 --- a/ports/tree-sitter/vcpkg.json +++ b/ports/tree-sitter/vcpkg.json @@ -1,7 +1,6 @@ { "name": "tree-sitter", - "version-semver": "0.20.6", - "port-version": 1, + "version-semver": "0.25.1", "description": "An incremental parsing system for programming tools.", "homepage": "https://github.com/tree-sitter/tree-sitter", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 0fe23a8a07..bd85f58910 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9229,8 +9229,8 @@ "port-version": 1 }, "tree-sitter": { - "baseline": "0.20.6", - "port-version": 1 + "baseline": "0.25.1", + "port-version": 0 }, "treehh": { "baseline": "3.18", diff --git a/versions/t-/tree-sitter.json b/versions/t-/tree-sitter.json index 998b1d0ce2..3d637fe3b1 100644 --- a/versions/t-/tree-sitter.json +++ b/versions/t-/tree-sitter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "abf6f52a374b81df2ed33643b546754144b51ac6", + "version-semver": "0.25.1", + "port-version": 0 + }, { "git-tree": "f818e329af89033c591416456e9c630280bd4ef8", "version-semver": "0.20.6",