Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tree-sitter for openSUSE:Factory checked in at 2026-02-27 17:03:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tree-sitter (Old) and /work/SRC/openSUSE:Factory/.tree-sitter.new.29461 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tree-sitter" Fri Feb 27 17:03:43 2026 rev:23 rq:1335327 version:0.25.3 Changes: -------- --- /work/SRC/openSUSE:Factory/tree-sitter/tree-sitter.changes 2026-01-08 15:26:13.858072844 +0100 +++ /work/SRC/openSUSE:Factory/.tree-sitter.new.29461/tree-sitter.changes 2026-02-27 17:08:25.776433189 +0100 @@ -1,0 +2,14 @@ +Thu Feb 19 19:38:33 UTC 2026 - Björn Kettunen <[email protected]> + +- Workaround circular dependency between Emacs and Tree-sitter + by defining these macros ourselves here. + +------------------------------------------------------------------- +Sun Feb 8 18:50:23 UTC 2026 - Björn Kettunen <[email protected]> + +- Install grammars into treesitter_grammardir with subdirectory + removing the need for the NeoVIM workaround. +- Add site-start script to point to Emacs to grammars installed in + treesitter_grammardir + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tree-sitter.spec ++++++ --- /var/tmp/diff_new_pack.dVxbmv/_old 2026-02-27 17:08:28.928563826 +0100 +++ /var/tmp/diff_new_pack.dVxbmv/_new 2026-02-27 17:08:28.948564654 +0100 @@ -14,6 +14,9 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # +# Sync with macros.emacs from the emacs package +%global _emacs_sitelispdir %{_datadir}/emacs/site-lisp +%global _emacs_sitestartdir %{_emacs_sitelispdir}/site-start.d %define somajor 0_25 @@ -28,6 +31,7 @@ Source11: baselibs.conf Source20: tree-sitter-target.py Source21: macros.in +%{load:%{SOURCE21}} Source22: macros.lua Source23: functions.lua Source24: compile-macros.sh @@ -35,6 +39,9 @@ Source26: treesitter_grammar.req BuildRequires: cargo-packaging BuildRequires: rust > 1.82.0 +# for macros.emacs +# BuildRequires: emacs-nox +# Commented out since we don't want circular dependencies Requires: lib%{name}%{somajor} = %{version} Requires: nodejs %{?suse_build_hwcaps_libs} @@ -104,13 +111,21 @@ find %{buildroot} -type f \( -name "*.la" -o -name "*.a" \) -delete -print # stupid workaround for "integrating" the grammars into neovim -install -d %{buildroot}%{_libdir}/tree_sitter +install -d %{buildroot}%{_treesitter_grammardir} +install -d %{buildroot}%{_treesitter_grammar_develdir} #fix pkgconfig file for i in lib include; do sed -i 's|'$i'dir=${prefix}//usr/|'$i'dir=${prefix}/usr/|g' %{buildroot}%{_libdir}/pkgconfig/%{name}.pc done +install -d %{buildroot}/%{_emacs_sitestartdir} +cat <<EOF > %{buildroot}/%{_emacs_sitestartdir}/tree-sitter-load-path.el +;; -*- lexical-binding: t -*- +;; Add tree-sitter grammars packaged by openSUSE +(add-to-list 'treesit-extra-load-path %{_treesitter_grammardir}) +EOF + %ldconfig_scriptlets -n lib%{name}%{somajor} %files @@ -121,11 +136,17 @@ %{_rpmmacrodir}/macros.treesitter %{_rpmconfigdir}/treesitter_grammar.req %{_fileattrsdir}/treesitter_grammar.attr +%dir %{_emacs_sitelispdir} +%dir %{_emacs_sitestartdir} +%{_emacs_sitestartdir}/tree-sitter-load-path.el +%dir %{_includedir}/%{_treesitter_base_name} +%dir %{_treesitter_grammar_develdir} + %files -n lib%{name}%{somajor} %license LICENSE %{_libdir}/lib%{name}.so.* -%dir %{_libdir}/tree_sitter +%dir %{_treesitter_grammardir} %files devel %doc docs/ ++++++ macros.in ++++++ --- /var/tmp/diff_new_pack.dVxbmv/_old 2026-02-27 17:08:29.676594828 +0100 +++ /var/tmp/diff_new_pack.dVxbmv/_new 2026-02-27 17:08:29.720596651 +0100 @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # SPDX-FileCopyrightText: 2024 Björn Bidar %_treesitter_base_name tree-sitter -%_treesitter_grammardir %{_libdir} +%_treesitter_grammardir %{_libdir}/tree-sitter %_treesitter_grammar_develdir %{_includedir}/%{_treesitter_base_name}/grammars %_treesitter_grammar_base_libname lib%{_treesitter_base_name} %treesitter_target() %{_rpmconfigdir}/tree-sitter-target.py
