From 27cfea8e4de6fac7ebea4d54b86c09969e50f0b2 Mon Sep 17 00:00:00 2001 From: ognevnydemon Date: Sat, 13 Apr 2024 16:15:47 +0300 Subject: [PATCH] tree-sitter: update to 0.22.4 --- mingw-w64-tree-sitter/PKGBUILD | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/mingw-w64-tree-sitter/PKGBUILD b/mingw-w64-tree-sitter/PKGBUILD index c9fa30561e..4e1d6f9fa9 100644 --- a/mingw-w64-tree-sitter/PKGBUILD +++ b/mingw-w64-tree-sitter/PKGBUILD @@ -3,7 +3,7 @@ _realname=tree-sitter pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.22.2 +pkgver=0.22.4 pkgrel=1 pkgdesc="An incremental parsing system for programming tools (mingw-w64)" arch=('any') @@ -16,23 +16,32 @@ msys2_references=( ) license=('spdx:MIT') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" - "${MINGW_PACKAGE_PREFIX}-rust") + "${MINGW_PACKAGE_PREFIX}-rust" + "${MINGW_PACKAGE_PREFIX}-pkgconf" + "${MINGW_PACKAGE_PREFIX}-openssl" + "${MINGW_PACKAGE_PREFIX}-libgit2" + "${MINGW_PACKAGE_PREFIX}-libssh2") +checkdepends=('git') source=("https://github.com/tree-sitter/tree-sitter/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz" "001-mingw-build.patch") -sha256sums=('0c829523b876d4a37e1bd46a655c133a93669c0fe98fcd84972b168849c27afc' +sha256sums=('919b750da9af1260cd989498bc84c63391b72ee2aa2ec20fc84882544eb7a229' '04baf5f5aa9e5dbce70c71e7c6a894f2a37865d40f738e43f6ca84e757752d48') noextract=("${_realname}-${pkgver}.tar.gz") +_env() { + export LIBZ_SYS_STATIC=0 + export LIBGIT2_NO_VENDOR=1 + export OPENSSL_NO_VENDOR=1 + export PKG_CONFIG_ALL_DYNAMIC=1 + export LIBSSH2_SYS_USE_PKG_CONFIG=1 +} + prepare() { tar -xzf "${_realname}-${pkgver}.tar.gz" || true cd "${srcdir}/${_realname}-${pkgver}" patch -p1 -i "${srcdir}/001-mingw-build.patch" - local _target="${CARCH}-pc-windows-gnu" - if [[ $MINGW_PACKAGE_PREFIX == *-clang-aarch64 ]]; then - _target="${CARCH}-pc-windows-gnullvm" - fi - cargo fetch --locked --target "${_target}" + cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')" } build() { @@ -40,11 +49,15 @@ build() { make cd "${srcdir}/${_realname}-${pkgver}" - cargo build --frozen --release + + _env + cargo build --frozen --profile optimize } check() { cd "${srcdir}/${_realname}-${pkgver}" + + _env make test } @@ -52,7 +65,7 @@ package() { cd "${srcdir}/${_realname}-${pkgver}" make PREFIX="${MINGW_PREFIX}" DESTDIR="${pkgdir}" install - install -m755 target/release/tree-sitter.exe "${pkgdir}/${MINGW_PREFIX}/bin" + install -m755 target/optimize/tree-sitter.exe "${pkgdir}${MINGW_PREFIX}/bin/tree-sitter.exe" install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" }