commit: e54c3c8a00fb4ca18ac45da316e1cd95cd1f95cb Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com> AuthorDate: Sat Jan 27 08:49:13 2024 +0000 Commit: Matthew Smith <matthew <AT> gentoo <DOT> org> CommitDate: Sat Jan 27 19:35:02 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e54c3c8a
dev-libs/tree-sitter: Version bump to 0.20.9 Closes: https://bugs.gentoo.org/922963 Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/35040 Signed-off-by: Matthew Smith <matthew <AT> gentoo.org> dev-libs/tree-sitter/Manifest | 1 + .../files/tree-sitter-0.20.9-no-static.patch | 21 +++++++++++++++++++++ ...sitter-9999.ebuild => tree-sitter-0.20.9.ebuild} | 19 ++++++++++++++----- dev-libs/tree-sitter/tree-sitter-9999.ebuild | 6 ++++-- 4 files changed, 40 insertions(+), 7 deletions(-) diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest index ba37153ef228..c960db5475e3 100644 --- a/dev-libs/tree-sitter/Manifest +++ b/dev-libs/tree-sitter/Manifest @@ -1,3 +1,4 @@ DIST tree-sitter-0.20.6.tar.gz 2924556 BLAKE2B 17348717441497ea7fc91419a0e8796d077b9acda2b584e9c3e1ac4a7a3f1fa3f84d5b749f21144d0593aaa7bf2e7ff9665539e91c6e81cda4359850e0fcdb14 SHA512 f0fb1e0073867c2a6e69b230e07e5eec32a2b30d3c711ec188526e287d6a1ef06de266d476482f900ec7c9ff6c11909899fd35a802e96f0befc6e99815502377 DIST tree-sitter-0.20.7.tar.gz 2928761 BLAKE2B 280083381ce4f5949ab1ca1412026cac79bcf28b488147150d934b70cdc7804466c8032d50254f1ff4457b55a33fe0dceef66fd053cd32bbf844dc8280e896ab SHA512 dd306f7304cb5f87c05eab3bf5c9c4c13bfed7766a164eafe3159adbc6cca4e66fbdb6880f48dfc668408fbefc14b0147aa2231db085a72f526ac51b681b7c26 DIST tree-sitter-0.20.8.tar.gz 2941223 BLAKE2B 158820a88b20cc96252f8bfdd257e910ca4dc79174bb45ee52623c923b8a634714c65be8f9534411865fb03aaf84bf16bf659567a74cd58141ea687fa89601e5 SHA512 30fa3f97e1a24d469a7565dc91db629accdfbe081b43d951e9751059a0c7f763d727e95efce5806cd9b1689650773bee1106f4f91ba001da57df3b0d83dda967 +DIST tree-sitter-0.20.9.tar.gz 3041304 BLAKE2B a6cf6606f75918eeab7dab0d2758cdba0922b5677cd4c8755982c077ee0a734090c8a87f7dd1fd56525b5864f94f5f19c3fd04e43773877e13968855f976d0c0 SHA512 6882c0edf87232d42aa40936c6a2da46e6dbb89d28b3def67e9c5231af19a517fbe22cf0ce9aa25a8ad4252cef6cf4aa94a00f8d0503a8bdd99ce0edd99a392a diff --git a/dev-libs/tree-sitter/files/tree-sitter-0.20.9-no-static.patch b/dev-libs/tree-sitter/files/tree-sitter-0.20.9-no-static.patch new file mode 100644 index 000000000000..ab0b7ef76fb6 --- /dev/null +++ b/dev-libs/tree-sitter/files/tree-sitter-0.20.9-no-static.patch @@ -0,0 +1,21 @@ +diff --git a/Makefile b/Makefile +index 6030852e..ea1c4617 100644 +--- a/Makefile ++++ b/Makefile +@@ -41,7 +41,7 @@ ifneq (,$(filter $(shell uname),FreeBSD NetBSD DragonFly)) + PCLIBDIR := $(PREFIX)/libdata/pkgconfig + endif + +-all: libtree-sitter.a libtree-sitter.$(SOEXTVER) ++all: libtree-sitter.$(SOEXTVER) + + libtree-sitter.a: $(OBJ) + $(AR) rcs $@ $^ +@@ -61,7 +61,6 @@ install: all + tree-sitter.pc.in > tree-sitter.pc + + install -d '$(DESTDIR)$(LIBDIR)' +- install -m644 libtree-sitter.a '$(DESTDIR)$(LIBDIR)'/ + install -m755 libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/ + ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR) + ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT) diff --git a/dev-libs/tree-sitter/tree-sitter-9999.ebuild b/dev-libs/tree-sitter/tree-sitter-0.20.9.ebuild similarity index 66% copy from dev-libs/tree-sitter/tree-sitter-9999.ebuild copy to dev-libs/tree-sitter/tree-sitter-0.20.9.ebuild index 12d922e961da..b2522c4480b3 100644 --- a/dev-libs/tree-sitter/tree-sitter-9999.ebuild +++ b/dev-libs/tree-sitter/tree-sitter-0.20.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,16 @@ fi LICENSE="MIT" SLOT="0" -PATCHES=( "${FILESDIR}/${PN}-No-static-libs-gentoo.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-0.20.9-no-static.patch" +) + +# XXX: Please, don't forget to check this on next version bump. +# And, maybe remove as non-needed, if version in Makefile will +# match the release. +# ref: https://github.com/tree-sitter/tree-sitter/issues/2210 +# see Makefile:1 +QA_PKGCONFIG_VERSION="0.20.10" src_prepare() { default @@ -33,9 +42,9 @@ src_compile() { src_install() { emake DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ - LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - install + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + install } pkg_postinst() { diff --git a/dev-libs/tree-sitter/tree-sitter-9999.ebuild b/dev-libs/tree-sitter/tree-sitter-9999.ebuild index 12d922e961da..1725e8da5f49 100644 --- a/dev-libs/tree-sitter/tree-sitter-9999.ebuild +++ b/dev-libs/tree-sitter/tree-sitter-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,7 +18,9 @@ fi LICENSE="MIT" SLOT="0" -PATCHES=( "${FILESDIR}/${PN}-No-static-libs-gentoo.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-0.20.9-no-static.patch" +) src_prepare() { default
