From 5b3c2068169314088e25b46041a682ed04012adb Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 26 Jan 2024 07:24:38 +0100 Subject: [PATCH 1/5] Update to version 0.20.9 --- .gitignore | 1 + sources | 2 +- tree-sitter.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2d3eab9..4acdf8f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /tree-sitter-0.20.6.tar.gz /tree-sitter-0.20.7.tar.gz /tree-sitter-0.20.8.tar.gz +/tree-sitter-0.20.9.tar.gz diff --git a/sources b/sources index 0197c6d..3d51d96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.20.8.tar.gz) = 30fa3f97e1a24d469a7565dc91db629accdfbe081b43d951e9751059a0c7f763d727e95efce5806cd9b1689650773bee1106f4f91ba001da57df3b0d83dda967 +SHA512 (tree-sitter-0.20.9.tar.gz) = 6882c0edf87232d42aa40936c6a2da46e6dbb89d28b3def67e9c5231af19a517fbe22cf0ce9aa25a8ad4252cef6cf4aa94a00f8d0503a8bdd99ce0edd99a392a diff --git a/tree-sitter.spec b/tree-sitter.spec index c5e20df..52b3bac 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,8 +1,8 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.20.8 -Release: 2%{?dist} +Version: 0.20.9 +Release: 1%{?dist} Summary: An incremental parsing system for programming tools License: MIT @@ -72,6 +72,10 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %changelog +* Fri Jan 26 2024 Andreas Schneider - 0.20.9-1 +- Update to version 0.20.9 + https://github.com/tree-sitter/tree-sitter/releases/tag/v0.20.9 + * Sat Jul 22 2023 Fedora Release Engineering - 0.20.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From f1cb5277bb006a50eadeff6744f5dc0a04f40412 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 22 Feb 2024 15:38:59 +0100 Subject: [PATCH 2/5] Update to version 0.21.0 --- .gitignore | 1 + sources | 2 +- tree-sitter.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4acdf8f..33646fe 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /tree-sitter-0.20.7.tar.gz /tree-sitter-0.20.8.tar.gz /tree-sitter-0.20.9.tar.gz +/tree-sitter-0.21.0.tar.gz diff --git a/sources b/sources index 3d51d96..b24af31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.20.9.tar.gz) = 6882c0edf87232d42aa40936c6a2da46e6dbb89d28b3def67e9c5231af19a517fbe22cf0ce9aa25a8ad4252cef6cf4aa94a00f8d0503a8bdd99ce0edd99a392a +SHA512 (tree-sitter-0.21.0.tar.gz) = b68a6f0fcf7bf8044bc82d861baf9a445d2e100a1e3fc39b78ecf38cd529281e35350916fe9e5811173a73cbb255fc0bb3f65b6dd6d6852026a7aab56fb8030d diff --git a/tree-sitter.spec b/tree-sitter.spec index 52b3bac..8917a4e 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,7 +1,7 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.20.9 +Version: 0.21.0 Release: 1%{?dist} Summary: An incremental parsing system for programming tools @@ -72,6 +72,10 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %changelog +* Thu Feb 22 2024 Andreas Schneider - 0.21.0-1 +- Update to version 0.21.0 + https://github.com/tree-sitter/tree-sitter/releases/tag/v0.21.0 + * Fri Jan 26 2024 Andreas Schneider - 0.20.9-1 - Update to version 0.20.9 https://github.com/tree-sitter/tree-sitter/releases/tag/v0.20.9 From f4f010421230780cb3a5320356f89c339d7f8c4d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 11 Mar 2024 09:12:20 +0100 Subject: [PATCH 3/5] Update to version 0.22.1 --- .gitignore | 1 + sources | 2 +- tree-sitter.spec | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 33646fe..80feacc 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /tree-sitter-0.20.8.tar.gz /tree-sitter-0.20.9.tar.gz /tree-sitter-0.21.0.tar.gz +/tree-sitter-0.22.1.tar.gz diff --git a/sources b/sources index b24af31..0ec067a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.21.0.tar.gz) = b68a6f0fcf7bf8044bc82d861baf9a445d2e100a1e3fc39b78ecf38cd529281e35350916fe9e5811173a73cbb255fc0bb3f65b6dd6d6852026a7aab56fb8030d +SHA512 (tree-sitter-0.22.1.tar.gz) = fa2656ad3a6d52301b497512aecc87b8c50ab6646aaac4730a26249ed0878e4542e2d256e42e0179ebc06147f772a2cf38f9362bb94ea1a8f0ec8c21e06e75e7 diff --git a/tree-sitter.spec b/tree-sitter.spec index 8917a4e..4734eda 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,13 +1,14 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.21.0 +Version: 0.22.1 Release: 1%{?dist} Summary: An incremental parsing system for programming tools License: MIT URL: https://tree-sitter.github.io/ Source0: https://github.com/tree-sitter/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +Patch0: https://github.com/tree-sitter/tree-sitter/pull/3159.patch#/tree-sitter-fix-makefile.patch BuildRequires: gcc BuildRequires: make @@ -72,6 +73,11 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %changelog +* Mon Mar 11 2024 Andreas Schneider - 0.22.1-1 +- Update to version 0.22.1 + https://github.com/tree-sitter/tree-sitter/releases/tag/v0.22.1 + https://github.com/tree-sitter/tree-sitter/releases/tag/v0.22.0 + * Thu Feb 22 2024 Andreas Schneider - 0.21.0-1 - Update to version 0.21.0 https://github.com/tree-sitter/tree-sitter/releases/tag/v0.21.0 From 937e22289b995b7e910ea03e9be7d0a3d1610b10 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 11 Mar 2024 15:37:20 +0100 Subject: [PATCH 4/5] Add missing patch --- tree-sitter-fix-makefile.patch | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 tree-sitter-fix-makefile.patch diff --git a/tree-sitter-fix-makefile.patch b/tree-sitter-fix-makefile.patch new file mode 100644 index 0000000..5dc8702 --- /dev/null +++ b/tree-sitter-fix-makefile.patch @@ -0,0 +1,27 @@ +From e34c047dfe27c08c65cfb0004a6cbddcc65ba3dc Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Mon, 11 Mar 2024 15:20:07 +0100 +Subject: [PATCH] fix(make): Allow to override CFLAGS on the commandline + +If you package tree-sitter for a distribution, the distribution is +setting the CFLAGS which should be used for all packages. Allow those +flags to be used. + +Signed-off-by: Andreas Schneider +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index e1164428fa..f9e62d7e25 100644 +--- a/Makefile ++++ b/Makefile +@@ -19,7 +19,7 @@ OBJ := $(SRC:.c=.o) + + # define default flags, and override to append mandatory flags + ARFLAGS := rcs +-CFLAGS := -O3 -Wall -Wextra -Wshadow -pedantic ++CFLAGS ?= -O3 -Wall -Wextra -Wshadow -pedantic + override CFLAGS += -std=c11 -fPIC -fvisibility=hidden + override CFLAGS += -Ilib/src -Ilib/src/wasm -Ilib/include + From bab520903c38d63b2ac1ea52a2c6417ac30e1bbc Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 18 Mar 2024 20:19:01 +0100 Subject: [PATCH 5/5] Update to version 0.22.2 --- .gitignore | 1 + sources | 2 +- tree-sitter-fix-makefile.patch | 27 --------------------------- tree-sitter.spec | 7 +++++-- 4 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 tree-sitter-fix-makefile.patch diff --git a/.gitignore b/.gitignore index 80feacc..3c85707 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /tree-sitter-0.20.9.tar.gz /tree-sitter-0.21.0.tar.gz /tree-sitter-0.22.1.tar.gz +/tree-sitter-0.22.2.tar.gz diff --git a/sources b/sources index 0ec067a..b3d9235 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tree-sitter-0.22.1.tar.gz) = fa2656ad3a6d52301b497512aecc87b8c50ab6646aaac4730a26249ed0878e4542e2d256e42e0179ebc06147f772a2cf38f9362bb94ea1a8f0ec8c21e06e75e7 +SHA512 (tree-sitter-0.22.2.tar.gz) = a42d744f6e1db7c7c842804f3435b87ccb5d0df2363a18eee38353f12f18c8cf0c6211bf0225fd5f2c0431ca8531aa4ddd73d87d42b80fa35c3c701cae2d7856 diff --git a/tree-sitter-fix-makefile.patch b/tree-sitter-fix-makefile.patch deleted file mode 100644 index 5dc8702..0000000 --- a/tree-sitter-fix-makefile.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e34c047dfe27c08c65cfb0004a6cbddcc65ba3dc Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Mon, 11 Mar 2024 15:20:07 +0100 -Subject: [PATCH] fix(make): Allow to override CFLAGS on the commandline - -If you package tree-sitter for a distribution, the distribution is -setting the CFLAGS which should be used for all packages. Allow those -flags to be used. - -Signed-off-by: Andreas Schneider ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index e1164428fa..f9e62d7e25 100644 ---- a/Makefile -+++ b/Makefile -@@ -19,7 +19,7 @@ OBJ := $(SRC:.c=.o) - - # define default flags, and override to append mandatory flags - ARFLAGS := rcs --CFLAGS := -O3 -Wall -Wextra -Wshadow -pedantic -+CFLAGS ?= -O3 -Wall -Wextra -Wshadow -pedantic - override CFLAGS += -std=c11 -fPIC -fvisibility=hidden - override CFLAGS += -Ilib/src -Ilib/src/wasm -Ilib/include - diff --git a/tree-sitter.spec b/tree-sitter.spec index 4734eda..95e9d9d 100644 --- a/tree-sitter.spec +++ b/tree-sitter.spec @@ -1,14 +1,13 @@ %global treesitter_so_version 0 Name: tree-sitter -Version: 0.22.1 +Version: 0.22.2 Release: 1%{?dist} Summary: An incremental parsing system for programming tools License: MIT URL: https://tree-sitter.github.io/ Source0: https://github.com/tree-sitter/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: https://github.com/tree-sitter/tree-sitter/pull/3159.patch#/tree-sitter-fix-makefile.patch BuildRequires: gcc BuildRequires: make @@ -73,6 +72,10 @@ find %{buildroot}%{_libdir} -type f \( -name "*.la" -o -name "*.a" \) -delete -p %changelog +* Mon Mar 18 2024 Andreas Schneider - 0.22.2-1 +- Update to version 0.22.2 + https://github.com/tree-sitter/tree-sitter/blob/v0.22.2/CHANGELOG.md + * Mon Mar 11 2024 Andreas Schneider - 0.22.1-1 - Update to version 0.22.1 https://github.com/tree-sitter/tree-sitter/releases/tag/v0.22.1