tree-sitter: revert to 0.25.10 (#25685)
* tree-sitter: revert to 0.25.10 0.26.0 was removed upstream and it causes problems here * my broken memory
This commit is contained in:
parent
1a720add38
commit
0ca211012b
@ -8,7 +8,7 @@ _realname=emacs
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
pkgver=30.2
|
||||
pkgrel=4
|
||||
pkgrel=5
|
||||
pkgdesc="The extensible, customizable, self-documenting, real-time display editor (mingw-w64)"
|
||||
arch=('any')
|
||||
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
|
||||
|
||||
@ -4,7 +4,7 @@ _realname=mesonlsp
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
pkgver=4.3.7
|
||||
pkgrel=6
|
||||
pkgrel=7
|
||||
pkgdesc='Meson language server (mingw-w64)'
|
||||
arch=('any')
|
||||
mingw_arch=('mingw64' 'ucrt64')
|
||||
|
||||
@ -4,7 +4,7 @@ _realname=neovim
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
|
||||
pkgver=0.11.4
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc='Fork of Vim aiming to improve user experience, plugins, and GUIs (mingw-w64)'
|
||||
arch=('any')
|
||||
mingw_arch=('ucrt64' 'clang64' 'clangarm64')
|
||||
@ -48,7 +48,8 @@ sha256sums=('83cf9543bedab8bec8c11cd50ccd9a4bf1570420a914b9a28f83ad100ca6d524'
|
||||
prepare() {
|
||||
cd "${srcdir}"/${_realname}-${pkgver}
|
||||
patch -p1 -i "${srcdir}/0001-cmake-disable-bundling.patch"
|
||||
patch -p1 -i "${srcdir}/f4fc769c81af6f8d9235d59aec75cfe7c104b3ce.patch"
|
||||
# uncomment when we update tree-sitter to 0.26.0
|
||||
#patch -p1 -i "${srcdir}/f4fc769c81af6f8d9235d59aec75cfe7c104b3ce.patch"
|
||||
|
||||
# Werror is enabled in CI only
|
||||
sed "s/-Werror/-Wall/g" -i src/nvim/CMakeLists.txt
|
||||
|
||||
@ -5,8 +5,9 @@ _realname=tree-sitter
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
"${MINGW_PACKAGE_PREFIX}-lib${_realname}")
|
||||
pkgver=0.26.0
|
||||
pkgver=0.25.10
|
||||
pkgrel=1
|
||||
epoch=1
|
||||
pkgdesc="An incremental parsing system for programming tools (mingw-w64)"
|
||||
arch=('any')
|
||||
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
|
||||
@ -27,7 +28,7 @@ checkdepends=('git')
|
||||
source=("https://github.com/tree-sitter/tree-sitter/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
|
||||
"rquickjs-sys.tar.gz::https://crates.io/api/v1/crates/rquickjs-sys/0.9.0/download"
|
||||
"rquickjs-sys-clang-build.patch")
|
||||
sha256sums=('ed464a90b7d73cdcf7acecf132186b905998f80f216be262f101ffc49d6459d7'
|
||||
sha256sums=('ad5040537537012b16ef6e1210a572b927c7cdc2b99d1ee88d44a7dcdc3ff44c'
|
||||
'7fed0097b0b4fbb2a87f6dd3b995a7c64ca56de30007eb7e867dfdfc78324ba5'
|
||||
'1535a50435eca881abf8d913e61710e1c807019a5f2eb81581757841f8686a33')
|
||||
noextract=("${_realname}-${pkgver}.tar.gz")
|
||||
@ -36,14 +37,15 @@ prepare() {
|
||||
tar -xzf "${_realname}-${pkgver}.tar.gz" || true
|
||||
cd "${_realname}-${pkgver}"
|
||||
|
||||
patch -d ../rquickjs-sys-0.9.0 -p1 -i ../rquickjs-sys-clang-build.patch
|
||||
cat >> Cargo.toml <<END
|
||||
# from 0.26.0
|
||||
# patch -d ../rquickjs-sys-0.9.0 -p1 -i ../rquickjs-sys-clang-build.patch
|
||||
# cat >> Cargo.toml <<END
|
||||
|
||||
[patch.crates-io]
|
||||
rquickjs-sys = { path = "../rquickjs-sys-0.9.0" }
|
||||
END
|
||||
# [patch.crates-io]
|
||||
# rquickjs-sys = { path = "../rquickjs-sys-0.9.0" }
|
||||
# END
|
||||
|
||||
cargo update -p rquickjs-sys
|
||||
# cargo update -p rquickjs-sys
|
||||
cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
|
||||
}
|
||||
|
||||
@ -66,7 +68,7 @@ build() {
|
||||
-DBUILD_SHARED_LIBS=ON \
|
||||
-DTREE_SITTER_FEATURE_WASM=ON \
|
||||
-DCMAKE_DLL_NAME_WITH_SOVERSION=ON \
|
||||
-S "${_realname}-${pkgver}" \
|
||||
-S "${_realname}-${pkgver}/lib" \
|
||||
-B "build-${MSYSTEM}"
|
||||
|
||||
cmake --build "build-${MSYSTEM}"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user