From 50347a7bb4c1d35b786cb9641fae017dd26ee437 Mon Sep 17 00:00:00 2001 From: Damjan 9000 Date: Sat, 17 Aug 2024 18:57:29 +0200 Subject: [PATCH 01/37] resolves: rhbz#2300246 - remove vim runtime path from sysinit --- sysinit.vim | 3 --- 1 file changed, 3 deletions(-) diff --git a/sysinit.vim b/sysinit.vim index bd151fc..21a501d 100644 --- a/sysinit.vim +++ b/sysinit.vim @@ -1,9 +1,6 @@ let g:python_host_prog = '/usr/bin/python2' let g:python3_host_prog = '/usr/bin/python3' -" In order for neovim to use installed plugins shared with vim -set runtimepath+=/usr/share/vim/vimfiles/ - augroup Fedora autocmd! " RPM spec file template From 7e1ae82c0833a8533b482dd8e20e5173f8d20054 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 1 Sep 2024 17:39:14 -0400 Subject: [PATCH 02/37] Rebuilt for tree-sitter 0.23.0 From bc6a6be1fd07e38b473414822387e56930090db7 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Tue, 3 Sep 2024 17:25:04 -0500 Subject: [PATCH 03/37] Allow bundling tree-sitter for EL10 - Add MIT to list of licenses since we are unconditionally bundling tree-sitter parsers - Convert bundled licenses file to SPDX expressions Signed-off-by: Michel Lind --- .gitignore | 1 + mkvendor-treesitter.sh | 27 +++++++++++++++++++++++++++ neovim-bundled-licenses.txt | 2 +- neovim.spec | 25 ++++++++++++++++++++++++- sources | 1 + 5 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 mkvendor-treesitter.sh diff --git a/.gitignore b/.gitignore index 83f18c1..760812a 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /neovim-0.10.0-vendor.tar.gz /neovim-0.10.1.tar.gz /neovim-0.10.1-vendor.tar.gz +/neovim-0.10.1-vendor-treesitter.tar.gz diff --git a/mkvendor-treesitter.sh b/mkvendor-treesitter.sh new file mode 100644 index 0000000..5ef2d5c --- /dev/null +++ b/mkvendor-treesitter.sh @@ -0,0 +1,27 @@ + #!/usr/bin/bash -x + +set -euo pipefail + +url=$(rpmspec -P neovim.spec | sed -En 's/^Source0:[[:space:]]+//p') +archive=$(basename "$url") +tmp=$(mktemp -d) +trap "rm -rf $tmp" EXIT + +curl -Lo "${tmp}/${archive}" "${url}" +grep -F "${archive}" sources | (cd "${tmp}" && cksum -c) +mkdir -p "${tmp}/src" +tar -zxf "${tmp}/${archive}" -C "${tmp}/src" --strip-components=1 + +cmake -S "${tmp}/src/cmake.deps" -B "${tmp}/deps" -G Ninja \ + -DUSE_BUNDLED=OFF -DUSE_BUNDLED_TS=ON +targets=$(basename -a "${tmp}/deps"/build/downloads/treesitter | \ + xargs -I {} echo build/src/{}-stamp/{}-download) +ninja -C "${tmp}/deps" ${targets} + +mv "${tmp}/${archive}" . +vendor="${archive%.tar.gz}-vendor" +tar -zcf "${vendor}-treesitter.tar.gz" -H pax --numeric-owner --owner=0:0 \ + -C "${tmp}/deps/build/downloads" . --transform="s/^\\./${vendor}-treesitter/" + +echo +echo "Run: fedpkg new-sources ${archive} ${vendor}.tar.gz ${vendor}-treesitter.tar.gz" diff --git a/neovim-bundled-licenses.txt b/neovim-bundled-licenses.txt index fee3e11..e72f40d 100644 --- a/neovim-bundled-licenses.txt +++ b/neovim-bundled-licenses.txt @@ -1,2 +1,2 @@ -"ASL 2.0" +"Apache-2.0" "MIT" diff --git a/neovim.spec b/neovim.spec index 200eff3..40fb19d 100644 --- a/neovim.spec +++ b/neovim.spec @@ -21,8 +21,18 @@ %endif %endif +%if 0%{?el10} +# tree-sitter in EL10 is too old and libtree-sitter-devel is not shipped +# https://issues.redhat.com/browse/RHEL-56996 +%bcond_with system_treesitter +%else +%bcond_without system_treesitter +%endif + %global luv_min_ver 1.43.0 +%if %{with system_treesitter} %global tree_sitter_min_ver 0.22.5 +%endif %global vterm_min_ver 0.3.3 %global luv_include_dir %{_includedir}/luv @@ -38,7 +48,7 @@ Name: neovim Version: 0.10.1 Release: %autorelease -License: Apache-2.0 AND Vim +License: Apache-2.0 AND Vim AND MIT Summary: Vim-fork focused on extensibility and agility Url: https://neovim.io @@ -48,6 +58,7 @@ Source2: spec-template # Generated by mkvendor.sh Source3: %{name}-%{version}-vendor.tar.gz Source4: neovim-bundled-licenses.txt +Source5: %{name}-%{version}-vendor-treesitter.tar.gz Patch1000: neovim-lua-bit32.patch @@ -85,10 +96,12 @@ BuildRequires: pkgconfig(vterm) >= %{vterm_min_ver} # need the build with the fix for the resize buffer issue Requires: libvterm >= %{vterm_min_ver} BuildRequires: pkgconfig(unibilium) +%if %{with system_treesitter} BuildRequires: pkgconfig(tree-sitter) >= %{tree_sitter_min_ver} # tree-sitter didn't do an soname bump. enforce the min version # see https://github.com/nvim-treesitter/nvim-treesitter/pull/3055/files Requires: libtree-sitter >= %{tree_sitter_min_ver} +%endif # Parser generator, only needed for :TSInstallFromGrammar Recommends: tree-sitter-cli Suggests: (python2-neovim if python2) @@ -109,7 +122,14 @@ excisions, Neovim is Vim. It is built for users who want the good parts of Vim, without compromise, and more. %prep +%if %{with system_treesitter} %setup -q -b3 +%else +%setup -q -b3 -b5 + +mv ../%{name}-%{version}-vendor-treesitter/* \ + ../%{name}-%{version}-vendor/ +%endif cp %{SOURCE4} . @@ -129,6 +149,9 @@ ln -sfr ../%{name}-%{version}-vendor .deps/build/downloads %define __cmake_builddir .deps %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DUSE_BUNDLED=OFF \ +%if %{without system_treesitter} + -DUSE_BUNDLED_TS=ON \ +%endif -DUSE_BUNDLED_TS_PARSERS=ON %cmake_build diff --git a/sources b/sources index 6347979..54b0dda 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (neovim-0.10.1.tar.gz) = 37e9d45041b059a26fe02717eae7cdbde58f0a35560c590764f5888de67cfa04bee76d6b359ab14b020ac5a661d64908960283347381d334106308504c0df908 SHA512 (neovim-0.10.1-vendor.tar.gz) = d89dcc059a78a8b3d4695d463daf709a5b3ec46ff02590b78dfad4380ccc86429f365714b0d68757c3f518969c61394312a63065cce630ecfff0e69a4d5a1892 +SHA512 (neovim-0.10.1-vendor-treesitter.tar.gz) = 4c6e759a06d9022415b4e5ac1029f0cb464b302c585b9bffa71791ec82908812f0b2b9b3a50d021b273930cbb03d5a0e553c6bf0122da0116fc7975330a4aae2 From 6ca81d068789b2e7ebf56b4105c04d147c940139 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 11 Sep 2024 09:54:22 +0200 Subject: [PATCH 04/37] Use easier to understand %bcond --- neovim.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neovim.spec b/neovim.spec index 40fb19d..99eea87 100644 --- a/neovim.spec +++ b/neovim.spec @@ -24,9 +24,9 @@ %if 0%{?el10} # tree-sitter in EL10 is too old and libtree-sitter-devel is not shipped # https://issues.redhat.com/browse/RHEL-56996 -%bcond_with system_treesitter +%bcond system_treesitter 0 %else -%bcond_without system_treesitter +%bcond system_treesitter 1 %endif %global luv_min_ver 1.43.0 From d1f8fa65cf9f77ed74130048166ad19b45d37f9f Mon Sep 17 00:00:00 2001 From: Damjan 9000 Date: Sat, 17 Aug 2024 18:57:29 +0200 Subject: [PATCH 05/37] resolves: rhbz#2300246 - remove vim runtime path from sysinit --- sysinit.vim | 3 --- 1 file changed, 3 deletions(-) diff --git a/sysinit.vim b/sysinit.vim index bd151fc..21a501d 100644 --- a/sysinit.vim +++ b/sysinit.vim @@ -1,9 +1,6 @@ let g:python_host_prog = '/usr/bin/python2' let g:python3_host_prog = '/usr/bin/python3' -" In order for neovim to use installed plugins shared with vim -set runtimepath+=/usr/share/vim/vimfiles/ - augroup Fedora autocmd! " RPM spec file template From 7c8e2afa36ad623a6bb663d867eefa56bea3b524 Mon Sep 17 00:00:00 2001 From: Michel Lind Date: Tue, 3 Sep 2024 17:25:04 -0500 Subject: [PATCH 06/37] Allow bundling tree-sitter for EL10 - Add MIT to list of licenses since we are unconditionally bundling tree-sitter parsers - Convert bundled licenses file to SPDX expressions Signed-off-by: Michel Lind --- .gitignore | 1 + mkvendor-treesitter.sh | 27 +++++++++++++++++++++++++++ neovim-bundled-licenses.txt | 2 +- neovim.spec | 25 ++++++++++++++++++++++++- sources | 1 + 5 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 mkvendor-treesitter.sh diff --git a/.gitignore b/.gitignore index 83f18c1..760812a 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /neovim-0.10.0-vendor.tar.gz /neovim-0.10.1.tar.gz /neovim-0.10.1-vendor.tar.gz +/neovim-0.10.1-vendor-treesitter.tar.gz diff --git a/mkvendor-treesitter.sh b/mkvendor-treesitter.sh new file mode 100644 index 0000000..5ef2d5c --- /dev/null +++ b/mkvendor-treesitter.sh @@ -0,0 +1,27 @@ + #!/usr/bin/bash -x + +set -euo pipefail + +url=$(rpmspec -P neovim.spec | sed -En 's/^Source0:[[:space:]]+//p') +archive=$(basename "$url") +tmp=$(mktemp -d) +trap "rm -rf $tmp" EXIT + +curl -Lo "${tmp}/${archive}" "${url}" +grep -F "${archive}" sources | (cd "${tmp}" && cksum -c) +mkdir -p "${tmp}/src" +tar -zxf "${tmp}/${archive}" -C "${tmp}/src" --strip-components=1 + +cmake -S "${tmp}/src/cmake.deps" -B "${tmp}/deps" -G Ninja \ + -DUSE_BUNDLED=OFF -DUSE_BUNDLED_TS=ON +targets=$(basename -a "${tmp}/deps"/build/downloads/treesitter | \ + xargs -I {} echo build/src/{}-stamp/{}-download) +ninja -C "${tmp}/deps" ${targets} + +mv "${tmp}/${archive}" . +vendor="${archive%.tar.gz}-vendor" +tar -zcf "${vendor}-treesitter.tar.gz" -H pax --numeric-owner --owner=0:0 \ + -C "${tmp}/deps/build/downloads" . --transform="s/^\\./${vendor}-treesitter/" + +echo +echo "Run: fedpkg new-sources ${archive} ${vendor}.tar.gz ${vendor}-treesitter.tar.gz" diff --git a/neovim-bundled-licenses.txt b/neovim-bundled-licenses.txt index fee3e11..e72f40d 100644 --- a/neovim-bundled-licenses.txt +++ b/neovim-bundled-licenses.txt @@ -1,2 +1,2 @@ -"ASL 2.0" +"Apache-2.0" "MIT" diff --git a/neovim.spec b/neovim.spec index 200eff3..40fb19d 100644 --- a/neovim.spec +++ b/neovim.spec @@ -21,8 +21,18 @@ %endif %endif +%if 0%{?el10} +# tree-sitter in EL10 is too old and libtree-sitter-devel is not shipped +# https://issues.redhat.com/browse/RHEL-56996 +%bcond_with system_treesitter +%else +%bcond_without system_treesitter +%endif + %global luv_min_ver 1.43.0 +%if %{with system_treesitter} %global tree_sitter_min_ver 0.22.5 +%endif %global vterm_min_ver 0.3.3 %global luv_include_dir %{_includedir}/luv @@ -38,7 +48,7 @@ Name: neovim Version: 0.10.1 Release: %autorelease -License: Apache-2.0 AND Vim +License: Apache-2.0 AND Vim AND MIT Summary: Vim-fork focused on extensibility and agility Url: https://neovim.io @@ -48,6 +58,7 @@ Source2: spec-template # Generated by mkvendor.sh Source3: %{name}-%{version}-vendor.tar.gz Source4: neovim-bundled-licenses.txt +Source5: %{name}-%{version}-vendor-treesitter.tar.gz Patch1000: neovim-lua-bit32.patch @@ -85,10 +96,12 @@ BuildRequires: pkgconfig(vterm) >= %{vterm_min_ver} # need the build with the fix for the resize buffer issue Requires: libvterm >= %{vterm_min_ver} BuildRequires: pkgconfig(unibilium) +%if %{with system_treesitter} BuildRequires: pkgconfig(tree-sitter) >= %{tree_sitter_min_ver} # tree-sitter didn't do an soname bump. enforce the min version # see https://github.com/nvim-treesitter/nvim-treesitter/pull/3055/files Requires: libtree-sitter >= %{tree_sitter_min_ver} +%endif # Parser generator, only needed for :TSInstallFromGrammar Recommends: tree-sitter-cli Suggests: (python2-neovim if python2) @@ -109,7 +122,14 @@ excisions, Neovim is Vim. It is built for users who want the good parts of Vim, without compromise, and more. %prep +%if %{with system_treesitter} %setup -q -b3 +%else +%setup -q -b3 -b5 + +mv ../%{name}-%{version}-vendor-treesitter/* \ + ../%{name}-%{version}-vendor/ +%endif cp %{SOURCE4} . @@ -129,6 +149,9 @@ ln -sfr ../%{name}-%{version}-vendor .deps/build/downloads %define __cmake_builddir .deps %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DUSE_BUNDLED=OFF \ +%if %{without system_treesitter} + -DUSE_BUNDLED_TS=ON \ +%endif -DUSE_BUNDLED_TS_PARSERS=ON %cmake_build diff --git a/sources b/sources index 6347979..54b0dda 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (neovim-0.10.1.tar.gz) = 37e9d45041b059a26fe02717eae7cdbde58f0a35560c590764f5888de67cfa04bee76d6b359ab14b020ac5a661d64908960283347381d334106308504c0df908 SHA512 (neovim-0.10.1-vendor.tar.gz) = d89dcc059a78a8b3d4695d463daf709a5b3ec46ff02590b78dfad4380ccc86429f365714b0d68757c3f518969c61394312a63065cce630ecfff0e69a4d5a1892 +SHA512 (neovim-0.10.1-vendor-treesitter.tar.gz) = 4c6e759a06d9022415b4e5ac1029f0cb464b302c585b9bffa71791ec82908812f0b2b9b3a50d021b273930cbb03d5a0e553c6bf0122da0116fc7975330a4aae2 From cfb85a6e83e90aaec29598c96215bb50b4556bfa Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 11 Sep 2024 09:54:22 +0200 Subject: [PATCH 07/37] Use easier to understand %bcond --- neovim.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neovim.spec b/neovim.spec index 40fb19d..99eea87 100644 --- a/neovim.spec +++ b/neovim.spec @@ -24,9 +24,9 @@ %if 0%{?el10} # tree-sitter in EL10 is too old and libtree-sitter-devel is not shipped # https://issues.redhat.com/browse/RHEL-56996 -%bcond_with system_treesitter +%bcond system_treesitter 0 %else -%bcond_without system_treesitter +%bcond system_treesitter 1 %endif %global luv_min_ver 1.43.0 From 6be59221e324f0ac6e5a0977a45f6646437e0da8 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sat, 5 Oct 2024 22:33:28 +0200 Subject: [PATCH 08/37] Update to version 0.10.2 - resolves: rhbz#2316441 --- .gitignore | 3 +++ README.md | 1 + neovim.spec | 2 +- sources | 6 +++--- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 760812a..4fbc987 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,6 @@ /neovim-0.10.1.tar.gz /neovim-0.10.1-vendor.tar.gz /neovim-0.10.1-vendor-treesitter.tar.gz +/neovim-0.10.2.tar.gz +/neovim-0.10.2-vendor.tar.gz +/neovim-0.10.2-vendor-treesitter.tar.gz diff --git a/README.md b/README.md index e3533c1..3e9397f 100644 --- a/README.md +++ b/README.md @@ -8,3 +8,4 @@ The hyper-extensible Vim-based text editor * Download the new tarball * Add the tarball with `fedpkg new-sources neovim-.tar.gz` * Run `bash mkvendor.sh` +* Run `bash mkvendor-treesitter.sh` diff --git a/neovim.spec b/neovim.spec index 99eea87..1a8db19 100644 --- a/neovim.spec +++ b/neovim.spec @@ -45,7 +45,7 @@ %endif Name: neovim -Version: 0.10.1 +Version: 0.10.2 Release: %autorelease License: Apache-2.0 AND Vim AND MIT diff --git a/sources b/sources index 54b0dda..20ff560 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (neovim-0.10.1.tar.gz) = 37e9d45041b059a26fe02717eae7cdbde58f0a35560c590764f5888de67cfa04bee76d6b359ab14b020ac5a661d64908960283347381d334106308504c0df908 -SHA512 (neovim-0.10.1-vendor.tar.gz) = d89dcc059a78a8b3d4695d463daf709a5b3ec46ff02590b78dfad4380ccc86429f365714b0d68757c3f518969c61394312a63065cce630ecfff0e69a4d5a1892 -SHA512 (neovim-0.10.1-vendor-treesitter.tar.gz) = 4c6e759a06d9022415b4e5ac1029f0cb464b302c585b9bffa71791ec82908812f0b2b9b3a50d021b273930cbb03d5a0e553c6bf0122da0116fc7975330a4aae2 +SHA512 (neovim-0.10.2.tar.gz) = 6478c53bddff0bf042388464fa1c5114e8fe75c7c41b22e5426783bd2f8406bd3297ffd4bc895ea13e573f0cd28a64755c1f5c063531bb8de477c4e439384418 +SHA512 (neovim-0.10.2-vendor.tar.gz) = 59047ccbc4e66e5d706709997350fdf591105bd12440edaf883646f83145b94ee691eaff4dac1e557c19dd09886ba4c155a8abc3cc4e18260cf1fcc61b1a3bac +SHA512 (neovim-0.10.2-vendor-treesitter.tar.gz) = deb0d4243b249267d1b28a69240272c440d53e5a8c6dc025b652f8595b60fa38650b77046eeff084c612cb6ec428d2318e71c1dd6ffff92f70255f365a4280ea From ee7435fabf7120c32fbcf2b317e9ec4614ed863a Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sat, 5 Oct 2024 22:33:28 +0200 Subject: [PATCH 09/37] Update to version 0.10.2 - resolves: rhbz#2316441 --- .gitignore | 3 +++ README.md | 1 + neovim.spec | 2 +- sources | 6 +++--- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 760812a..4fbc987 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,6 @@ /neovim-0.10.1.tar.gz /neovim-0.10.1-vendor.tar.gz /neovim-0.10.1-vendor-treesitter.tar.gz +/neovim-0.10.2.tar.gz +/neovim-0.10.2-vendor.tar.gz +/neovim-0.10.2-vendor-treesitter.tar.gz diff --git a/README.md b/README.md index e3533c1..3e9397f 100644 --- a/README.md +++ b/README.md @@ -8,3 +8,4 @@ The hyper-extensible Vim-based text editor * Download the new tarball * Add the tarball with `fedpkg new-sources neovim-.tar.gz` * Run `bash mkvendor.sh` +* Run `bash mkvendor-treesitter.sh` diff --git a/neovim.spec b/neovim.spec index 99eea87..1a8db19 100644 --- a/neovim.spec +++ b/neovim.spec @@ -45,7 +45,7 @@ %endif Name: neovim -Version: 0.10.1 +Version: 0.10.2 Release: %autorelease License: Apache-2.0 AND Vim AND MIT diff --git a/sources b/sources index 54b0dda..20ff560 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (neovim-0.10.1.tar.gz) = 37e9d45041b059a26fe02717eae7cdbde58f0a35560c590764f5888de67cfa04bee76d6b359ab14b020ac5a661d64908960283347381d334106308504c0df908 -SHA512 (neovim-0.10.1-vendor.tar.gz) = d89dcc059a78a8b3d4695d463daf709a5b3ec46ff02590b78dfad4380ccc86429f365714b0d68757c3f518969c61394312a63065cce630ecfff0e69a4d5a1892 -SHA512 (neovim-0.10.1-vendor-treesitter.tar.gz) = 4c6e759a06d9022415b4e5ac1029f0cb464b302c585b9bffa71791ec82908812f0b2b9b3a50d021b273930cbb03d5a0e553c6bf0122da0116fc7975330a4aae2 +SHA512 (neovim-0.10.2.tar.gz) = 6478c53bddff0bf042388464fa1c5114e8fe75c7c41b22e5426783bd2f8406bd3297ffd4bc895ea13e573f0cd28a64755c1f5c063531bb8de477c4e439384418 +SHA512 (neovim-0.10.2-vendor.tar.gz) = 59047ccbc4e66e5d706709997350fdf591105bd12440edaf883646f83145b94ee691eaff4dac1e557c19dd09886ba4c155a8abc3cc4e18260cf1fcc61b1a3bac +SHA512 (neovim-0.10.2-vendor-treesitter.tar.gz) = deb0d4243b249267d1b28a69240272c440d53e5a8c6dc025b652f8595b60fa38650b77046eeff084c612cb6ec428d2318e71c1dd6ffff92f70255f365a4280ea From d17ef5cb5214d9173d55918c4ac5360553684b5a Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sat, 21 Dec 2024 19:29:17 +0100 Subject: [PATCH 10/37] Update to version 0.10.3 - resolves: rhbz#2333681 --- .gitignore | 3 +++ neovim.spec | 2 +- sources | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4fbc987..c11b97b 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,6 @@ /neovim-0.10.2.tar.gz /neovim-0.10.2-vendor.tar.gz /neovim-0.10.2-vendor-treesitter.tar.gz +/neovim-0.10.3.tar.gz +/neovim-0.10.3-vendor.tar.gz +/neovim-0.10.3-vendor-treesitter.tar.gz diff --git a/neovim.spec b/neovim.spec index 1a8db19..b3b2a99 100644 --- a/neovim.spec +++ b/neovim.spec @@ -45,7 +45,7 @@ %endif Name: neovim -Version: 0.10.2 +Version: 0.10.3 Release: %autorelease License: Apache-2.0 AND Vim AND MIT diff --git a/sources b/sources index 20ff560..d63dc93 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (neovim-0.10.2.tar.gz) = 6478c53bddff0bf042388464fa1c5114e8fe75c7c41b22e5426783bd2f8406bd3297ffd4bc895ea13e573f0cd28a64755c1f5c063531bb8de477c4e439384418 -SHA512 (neovim-0.10.2-vendor.tar.gz) = 59047ccbc4e66e5d706709997350fdf591105bd12440edaf883646f83145b94ee691eaff4dac1e557c19dd09886ba4c155a8abc3cc4e18260cf1fcc61b1a3bac -SHA512 (neovim-0.10.2-vendor-treesitter.tar.gz) = deb0d4243b249267d1b28a69240272c440d53e5a8c6dc025b652f8595b60fa38650b77046eeff084c612cb6ec428d2318e71c1dd6ffff92f70255f365a4280ea +SHA512 (neovim-0.10.3.tar.gz) = f1286c42bf0a119fea4575ae64043e43f36cd569d339ced15700c45441e8d8952ea7eac2250063a5aff4552632f0ca7696b442d4d8ffa4f5fce25ddbee0e861b +SHA512 (neovim-0.10.3-vendor.tar.gz) = adab443b56f28fb0dc6908cb9712197bd97fd9f81d14d286b35cfc702304621062fefc1cbc3641cc14f6133b0d5da33f7d367672f911959538e07af906222c9d +SHA512 (neovim-0.10.3-vendor-treesitter.tar.gz) = 7aa042607f9edd7d8543d3dac85bbbc12cb5b0c2c1376d4d5c765c8bab67ca8e04d1ae49a91c1e37d83b7f55e53c1c45087b8c10c7feaefaf864ab7e285ba868 From 6b4cd716dcee8c5d0fbb299a12c2d0aeff81e002 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sat, 21 Dec 2024 19:29:17 +0100 Subject: [PATCH 11/37] Update to version 0.10.3 - resolves: rhbz#2333681 --- .gitignore | 3 +++ neovim.spec | 2 +- sources | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4fbc987..c11b97b 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,6 @@ /neovim-0.10.2.tar.gz /neovim-0.10.2-vendor.tar.gz /neovim-0.10.2-vendor-treesitter.tar.gz +/neovim-0.10.3.tar.gz +/neovim-0.10.3-vendor.tar.gz +/neovim-0.10.3-vendor-treesitter.tar.gz diff --git a/neovim.spec b/neovim.spec index 1a8db19..b3b2a99 100644 --- a/neovim.spec +++ b/neovim.spec @@ -45,7 +45,7 @@ %endif Name: neovim -Version: 0.10.2 +Version: 0.10.3 Release: %autorelease License: Apache-2.0 AND Vim AND MIT diff --git a/sources b/sources index 20ff560..d63dc93 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (neovim-0.10.2.tar.gz) = 6478c53bddff0bf042388464fa1c5114e8fe75c7c41b22e5426783bd2f8406bd3297ffd4bc895ea13e573f0cd28a64755c1f5c063531bb8de477c4e439384418 -SHA512 (neovim-0.10.2-vendor.tar.gz) = 59047ccbc4e66e5d706709997350fdf591105bd12440edaf883646f83145b94ee691eaff4dac1e557c19dd09886ba4c155a8abc3cc4e18260cf1fcc61b1a3bac -SHA512 (neovim-0.10.2-vendor-treesitter.tar.gz) = deb0d4243b249267d1b28a69240272c440d53e5a8c6dc025b652f8595b60fa38650b77046eeff084c612cb6ec428d2318e71c1dd6ffff92f70255f365a4280ea +SHA512 (neovim-0.10.3.tar.gz) = f1286c42bf0a119fea4575ae64043e43f36cd569d339ced15700c45441e8d8952ea7eac2250063a5aff4552632f0ca7696b442d4d8ffa4f5fce25ddbee0e861b +SHA512 (neovim-0.10.3-vendor.tar.gz) = adab443b56f28fb0dc6908cb9712197bd97fd9f81d14d286b35cfc702304621062fefc1cbc3641cc14f6133b0d5da33f7d367672f911959538e07af906222c9d +SHA512 (neovim-0.10.3-vendor-treesitter.tar.gz) = 7aa042607f9edd7d8543d3dac85bbbc12cb5b0c2c1376d4d5c765c8bab67ca8e04d1ae49a91c1e37d83b7f55e53c1c45087b8c10c7feaefaf864ab7e285ba868 From e6b772eb6e70782f06f87840a8c70bfded3a3436 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 9 Jan 2025 19:30:43 +0100 Subject: [PATCH 12/37] Fix `:Inspect` --- 31676.patch | 28 ++++++++++++++++++++++++++++ neovim.spec | 3 +++ 2 files changed, 31 insertions(+) create mode 100644 31676.patch diff --git a/31676.patch b/31676.patch new file mode 100644 index 0000000..027c831 --- /dev/null +++ b/31676.patch @@ -0,0 +1,28 @@ +From df3ff92a9a6983512d9f3b08a63fe31e885a2dfd Mon Sep 17 00:00:00 2001 +From: Christian Clason +Date: Sun, 22 Dec 2024 11:02:14 +0100 +Subject: [PATCH] fix(inspect): use correct default highlight + +Problem: `vim.highlight` was renamed on `master`, breaking the +backported fix. + +Solution: Use old name. + +Fixup for 650dcbbafea581353ae75a8377a0b108d1b26761 +--- + runtime/lua/vim/_inspector.lua | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/runtime/lua/vim/_inspector.lua b/runtime/lua/vim/_inspector.lua +index 55e2ae6073a891..9c894d1522ed92 100644 +--- a/runtime/lua/vim/_inspector.lua ++++ b/runtime/lua/vim/_inspector.lua +@@ -186,7 +186,7 @@ function vim.show_pos(bufnr, row, col, filter) + capture, + string.format( + 'priority: %d language: %s', +- capture.metadata.priority or vim.hl.priorities.treesitter, ++ capture.metadata.priority or vim.highlight.priorities.treesitter, + capture.lang + ) + ) diff --git a/neovim.spec b/neovim.spec index b3b2a99..fad8370 100644 --- a/neovim.spec +++ b/neovim.spec @@ -60,6 +60,8 @@ Source3: %{name}-%{version}-vendor.tar.gz Source4: neovim-bundled-licenses.txt Source5: %{name}-%{version}-vendor-treesitter.tar.gz +Patch0: https://github.com/neovim/neovim/pull/31676.patch + Patch1000: neovim-lua-bit32.patch BuildRequires: gcc-c++ @@ -133,6 +135,7 @@ mv ../%{name}-%{version}-vendor-treesitter/* \ cp %{SOURCE4} . +%patch -P 0 -p1 %if %{without luajit} %patch -P 1000 -p1 %endif From bab7d47025cb340908179e1ae6eae1b9b811be60 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 9 Jan 2025 19:30:43 +0100 Subject: [PATCH 13/37] Fix `:Inspect` --- 31676.patch | 28 ++++++++++++++++++++++++++++ neovim.spec | 3 +++ 2 files changed, 31 insertions(+) create mode 100644 31676.patch diff --git a/31676.patch b/31676.patch new file mode 100644 index 0000000..027c831 --- /dev/null +++ b/31676.patch @@ -0,0 +1,28 @@ +From df3ff92a9a6983512d9f3b08a63fe31e885a2dfd Mon Sep 17 00:00:00 2001 +From: Christian Clason +Date: Sun, 22 Dec 2024 11:02:14 +0100 +Subject: [PATCH] fix(inspect): use correct default highlight + +Problem: `vim.highlight` was renamed on `master`, breaking the +backported fix. + +Solution: Use old name. + +Fixup for 650dcbbafea581353ae75a8377a0b108d1b26761 +--- + runtime/lua/vim/_inspector.lua | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/runtime/lua/vim/_inspector.lua b/runtime/lua/vim/_inspector.lua +index 55e2ae6073a891..9c894d1522ed92 100644 +--- a/runtime/lua/vim/_inspector.lua ++++ b/runtime/lua/vim/_inspector.lua +@@ -186,7 +186,7 @@ function vim.show_pos(bufnr, row, col, filter) + capture, + string.format( + 'priority: %d language: %s', +- capture.metadata.priority or vim.hl.priorities.treesitter, ++ capture.metadata.priority or vim.highlight.priorities.treesitter, + capture.lang + ) + ) diff --git a/neovim.spec b/neovim.spec index b3b2a99..fad8370 100644 --- a/neovim.spec +++ b/neovim.spec @@ -60,6 +60,8 @@ Source3: %{name}-%{version}-vendor.tar.gz Source4: neovim-bundled-licenses.txt Source5: %{name}-%{version}-vendor-treesitter.tar.gz +Patch0: https://github.com/neovim/neovim/pull/31676.patch + Patch1000: neovim-lua-bit32.patch BuildRequires: gcc-c++ @@ -133,6 +135,7 @@ mv ../%{name}-%{version}-vendor-treesitter/* \ cp %{SOURCE4} . +%patch -P 0 -p1 %if %{without luajit} %patch -P 1000 -p1 %endif From 20acc48b36431c40ece2b4610c4479a589d7e3be Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 15 Jan 2025 09:34:43 +0100 Subject: [PATCH 14/37] Bump release to rebuild neovim [skip changelog] From e87be9dff271465003e2f3757e62cc52561c2108 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 19:53:17 +0000 Subject: [PATCH 15/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From c89da3fcf5eeab5789eec35f2f5cf2dd8fff0e48 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 23 Jan 2025 12:41:16 +0100 Subject: [PATCH 16/37] Fix building with gcc 15 - resolves: rhbz#2340915 --- neovim-fix-build-gcc15.patch | 28 ++++++++++++++++++++++++++++ neovim.spec | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 neovim-fix-build-gcc15.patch diff --git a/neovim-fix-build-gcc15.patch b/neovim-fix-build-gcc15.patch new file mode 100644 index 0000000..e87bb2f --- /dev/null +++ b/neovim-fix-build-gcc15.patch @@ -0,0 +1,28 @@ +From 60592492c589ba8eef4bf929e9f60b7c2ee32eb5 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Thu, 23 Jan 2025 11:40:10 +0100 +Subject: [PATCH] fix: Remove invalid bool definition + +This causes build failures with gcc 15. +--- + src/mpack/conv.h | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/mpack/conv.h b/src/mpack/conv.h +index 71f14a067e..e46a2b16d7 100644 +--- a/src/mpack/conv.h ++++ b/src/mpack/conv.h +@@ -14,10 +14,6 @@ typedef mpack_sint32_t mpack_sintmax_t; + typedef mpack_uint32_t mpack_uintmax_t; + #endif + +-#ifndef bool +-# define bool unsigned +-#endif +- + MPACK_API mpack_token_t mpack_pack_nil(void) FUNUSED FPURE; + MPACK_API mpack_token_t mpack_pack_boolean(unsigned v) FUNUSED FPURE; + MPACK_API mpack_token_t mpack_pack_uint(mpack_uintmax_t v) FUNUSED FPURE; +-- +2.48.1 + diff --git a/neovim.spec b/neovim.spec index fad8370..9ddc75b 100644 --- a/neovim.spec +++ b/neovim.spec @@ -61,6 +61,7 @@ Source4: neovim-bundled-licenses.txt Source5: %{name}-%{version}-vendor-treesitter.tar.gz Patch0: https://github.com/neovim/neovim/pull/31676.patch +Patch1: https://github.com/neovim/neovim/pull/32180.patch#/neovim-fix-build-gcc15.patch Patch1000: neovim-lua-bit32.patch @@ -136,6 +137,7 @@ mv ../%{name}-%{version}-vendor-treesitter/* \ cp %{SOURCE4} . %patch -P 0 -p1 +%patch -P 1 -p1 %if %{without luajit} %patch -P 1000 -p1 %endif From 0e5428a4d8d3ad8b35429438c774a7690fef634f Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 29 Jan 2025 11:54:23 +0100 Subject: [PATCH 17/37] Update to version 0.10.4 - https://github.com/neovim/neovim/releases/tag/v0.10.4 --- .gitignore | 3 +++ 31676.patch | 28 ---------------------------- neovim-fix-build-gcc15.patch | 28 ---------------------------- neovim.spec | 5 +---- sources | 6 +++--- 5 files changed, 7 insertions(+), 63 deletions(-) delete mode 100644 31676.patch delete mode 100644 neovim-fix-build-gcc15.patch diff --git a/.gitignore b/.gitignore index c11b97b..3d5b688 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,6 @@ /neovim-0.10.3.tar.gz /neovim-0.10.3-vendor.tar.gz /neovim-0.10.3-vendor-treesitter.tar.gz +/neovim-0.10.4.tar.gz +/neovim-0.10.4-vendor.tar.gz +/neovim-0.10.4-vendor-treesitter.tar.gz diff --git a/31676.patch b/31676.patch deleted file mode 100644 index 027c831..0000000 --- a/31676.patch +++ /dev/null @@ -1,28 +0,0 @@ -From df3ff92a9a6983512d9f3b08a63fe31e885a2dfd Mon Sep 17 00:00:00 2001 -From: Christian Clason -Date: Sun, 22 Dec 2024 11:02:14 +0100 -Subject: [PATCH] fix(inspect): use correct default highlight - -Problem: `vim.highlight` was renamed on `master`, breaking the -backported fix. - -Solution: Use old name. - -Fixup for 650dcbbafea581353ae75a8377a0b108d1b26761 ---- - runtime/lua/vim/_inspector.lua | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/runtime/lua/vim/_inspector.lua b/runtime/lua/vim/_inspector.lua -index 55e2ae6073a891..9c894d1522ed92 100644 ---- a/runtime/lua/vim/_inspector.lua -+++ b/runtime/lua/vim/_inspector.lua -@@ -186,7 +186,7 @@ function vim.show_pos(bufnr, row, col, filter) - capture, - string.format( - 'priority: %d language: %s', -- capture.metadata.priority or vim.hl.priorities.treesitter, -+ capture.metadata.priority or vim.highlight.priorities.treesitter, - capture.lang - ) - ) diff --git a/neovim-fix-build-gcc15.patch b/neovim-fix-build-gcc15.patch deleted file mode 100644 index e87bb2f..0000000 --- a/neovim-fix-build-gcc15.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 60592492c589ba8eef4bf929e9f60b7c2ee32eb5 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Thu, 23 Jan 2025 11:40:10 +0100 -Subject: [PATCH] fix: Remove invalid bool definition - -This causes build failures with gcc 15. ---- - src/mpack/conv.h | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/mpack/conv.h b/src/mpack/conv.h -index 71f14a067e..e46a2b16d7 100644 ---- a/src/mpack/conv.h -+++ b/src/mpack/conv.h -@@ -14,10 +14,6 @@ typedef mpack_sint32_t mpack_sintmax_t; - typedef mpack_uint32_t mpack_uintmax_t; - #endif - --#ifndef bool --# define bool unsigned --#endif -- - MPACK_API mpack_token_t mpack_pack_nil(void) FUNUSED FPURE; - MPACK_API mpack_token_t mpack_pack_boolean(unsigned v) FUNUSED FPURE; - MPACK_API mpack_token_t mpack_pack_uint(mpack_uintmax_t v) FUNUSED FPURE; --- -2.48.1 - diff --git a/neovim.spec b/neovim.spec index 9ddc75b..b0be00c 100644 --- a/neovim.spec +++ b/neovim.spec @@ -45,7 +45,7 @@ %endif Name: neovim -Version: 0.10.3 +Version: 0.10.4 Release: %autorelease License: Apache-2.0 AND Vim AND MIT @@ -60,9 +60,6 @@ Source3: %{name}-%{version}-vendor.tar.gz Source4: neovim-bundled-licenses.txt Source5: %{name}-%{version}-vendor-treesitter.tar.gz -Patch0: https://github.com/neovim/neovim/pull/31676.patch -Patch1: https://github.com/neovim/neovim/pull/32180.patch#/neovim-fix-build-gcc15.patch - Patch1000: neovim-lua-bit32.patch BuildRequires: gcc-c++ diff --git a/sources b/sources index d63dc93..647c98f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (neovim-0.10.3.tar.gz) = f1286c42bf0a119fea4575ae64043e43f36cd569d339ced15700c45441e8d8952ea7eac2250063a5aff4552632f0ca7696b442d4d8ffa4f5fce25ddbee0e861b -SHA512 (neovim-0.10.3-vendor.tar.gz) = adab443b56f28fb0dc6908cb9712197bd97fd9f81d14d286b35cfc702304621062fefc1cbc3641cc14f6133b0d5da33f7d367672f911959538e07af906222c9d -SHA512 (neovim-0.10.3-vendor-treesitter.tar.gz) = 7aa042607f9edd7d8543d3dac85bbbc12cb5b0c2c1376d4d5c765c8bab67ca8e04d1ae49a91c1e37d83b7f55e53c1c45087b8c10c7feaefaf864ab7e285ba868 +SHA512 (neovim-0.10.4.tar.gz) = 8dadc24edaaa27e6ecd4db6c19d0183868a8d2809ba122110685f340341d951772ac2eb0c5f7a7ab5f87d3d5d8ae5e81f156c61f04f6d4ebbaa17cd35fb70b64 +SHA512 (neovim-0.10.4-vendor.tar.gz) = 6ea5a3dac50af53aebbf3ebaadf6766f2b2bedcc6b43bca553015847be5311b5fb3803fad7d1bc856b67b77c0d73d8f9a578bc55448d5d845147d4e7b64558a1 +SHA512 (neovim-0.10.4-vendor-treesitter.tar.gz) = b3038b2fde2b1d7183667da0b37ee61e24abb9b17b744ac3c63ce49a299c4026ee2e836237a05044cd2b1bda6a3c1fa572c0199eb632fb0362d6e5e141ca882a From 8735db3c79bc18c3d0caf50d6310abc7007215b6 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 23 Jan 2025 12:41:16 +0100 Subject: [PATCH 18/37] Fix building with gcc 15 - resolves: rhbz#2340915 --- neovim-fix-build-gcc15.patch | 28 ++++++++++++++++++++++++++++ neovim.spec | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 neovim-fix-build-gcc15.patch diff --git a/neovim-fix-build-gcc15.patch b/neovim-fix-build-gcc15.patch new file mode 100644 index 0000000..e87bb2f --- /dev/null +++ b/neovim-fix-build-gcc15.patch @@ -0,0 +1,28 @@ +From 60592492c589ba8eef4bf929e9f60b7c2ee32eb5 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Thu, 23 Jan 2025 11:40:10 +0100 +Subject: [PATCH] fix: Remove invalid bool definition + +This causes build failures with gcc 15. +--- + src/mpack/conv.h | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/mpack/conv.h b/src/mpack/conv.h +index 71f14a067e..e46a2b16d7 100644 +--- a/src/mpack/conv.h ++++ b/src/mpack/conv.h +@@ -14,10 +14,6 @@ typedef mpack_sint32_t mpack_sintmax_t; + typedef mpack_uint32_t mpack_uintmax_t; + #endif + +-#ifndef bool +-# define bool unsigned +-#endif +- + MPACK_API mpack_token_t mpack_pack_nil(void) FUNUSED FPURE; + MPACK_API mpack_token_t mpack_pack_boolean(unsigned v) FUNUSED FPURE; + MPACK_API mpack_token_t mpack_pack_uint(mpack_uintmax_t v) FUNUSED FPURE; +-- +2.48.1 + diff --git a/neovim.spec b/neovim.spec index fad8370..9ddc75b 100644 --- a/neovim.spec +++ b/neovim.spec @@ -61,6 +61,7 @@ Source4: neovim-bundled-licenses.txt Source5: %{name}-%{version}-vendor-treesitter.tar.gz Patch0: https://github.com/neovim/neovim/pull/31676.patch +Patch1: https://github.com/neovim/neovim/pull/32180.patch#/neovim-fix-build-gcc15.patch Patch1000: neovim-lua-bit32.patch @@ -136,6 +137,7 @@ mv ../%{name}-%{version}-vendor-treesitter/* \ cp %{SOURCE4} . %patch -P 0 -p1 +%patch -P 1 -p1 %if %{without luajit} %patch -P 1000 -p1 %endif From b247ca8505c5964daa22f7af4df899769f6a1af3 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 29 Jan 2025 11:54:23 +0100 Subject: [PATCH 19/37] Update to version 0.10.4 - https://github.com/neovim/neovim/releases/tag/v0.10.4 --- .gitignore | 3 +++ 31676.patch | 28 ---------------------------- neovim-fix-build-gcc15.patch | 28 ---------------------------- neovim.spec | 5 +---- sources | 6 +++--- 5 files changed, 7 insertions(+), 63 deletions(-) delete mode 100644 31676.patch delete mode 100644 neovim-fix-build-gcc15.patch diff --git a/.gitignore b/.gitignore index c11b97b..3d5b688 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,6 @@ /neovim-0.10.3.tar.gz /neovim-0.10.3-vendor.tar.gz /neovim-0.10.3-vendor-treesitter.tar.gz +/neovim-0.10.4.tar.gz +/neovim-0.10.4-vendor.tar.gz +/neovim-0.10.4-vendor-treesitter.tar.gz diff --git a/31676.patch b/31676.patch deleted file mode 100644 index 027c831..0000000 --- a/31676.patch +++ /dev/null @@ -1,28 +0,0 @@ -From df3ff92a9a6983512d9f3b08a63fe31e885a2dfd Mon Sep 17 00:00:00 2001 -From: Christian Clason -Date: Sun, 22 Dec 2024 11:02:14 +0100 -Subject: [PATCH] fix(inspect): use correct default highlight - -Problem: `vim.highlight` was renamed on `master`, breaking the -backported fix. - -Solution: Use old name. - -Fixup for 650dcbbafea581353ae75a8377a0b108d1b26761 ---- - runtime/lua/vim/_inspector.lua | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/runtime/lua/vim/_inspector.lua b/runtime/lua/vim/_inspector.lua -index 55e2ae6073a891..9c894d1522ed92 100644 ---- a/runtime/lua/vim/_inspector.lua -+++ b/runtime/lua/vim/_inspector.lua -@@ -186,7 +186,7 @@ function vim.show_pos(bufnr, row, col, filter) - capture, - string.format( - 'priority: %d language: %s', -- capture.metadata.priority or vim.hl.priorities.treesitter, -+ capture.metadata.priority or vim.highlight.priorities.treesitter, - capture.lang - ) - ) diff --git a/neovim-fix-build-gcc15.patch b/neovim-fix-build-gcc15.patch deleted file mode 100644 index e87bb2f..0000000 --- a/neovim-fix-build-gcc15.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 60592492c589ba8eef4bf929e9f60b7c2ee32eb5 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Thu, 23 Jan 2025 11:40:10 +0100 -Subject: [PATCH] fix: Remove invalid bool definition - -This causes build failures with gcc 15. ---- - src/mpack/conv.h | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/mpack/conv.h b/src/mpack/conv.h -index 71f14a067e..e46a2b16d7 100644 ---- a/src/mpack/conv.h -+++ b/src/mpack/conv.h -@@ -14,10 +14,6 @@ typedef mpack_sint32_t mpack_sintmax_t; - typedef mpack_uint32_t mpack_uintmax_t; - #endif - --#ifndef bool --# define bool unsigned --#endif -- - MPACK_API mpack_token_t mpack_pack_nil(void) FUNUSED FPURE; - MPACK_API mpack_token_t mpack_pack_boolean(unsigned v) FUNUSED FPURE; - MPACK_API mpack_token_t mpack_pack_uint(mpack_uintmax_t v) FUNUSED FPURE; --- -2.48.1 - diff --git a/neovim.spec b/neovim.spec index 9ddc75b..b0be00c 100644 --- a/neovim.spec +++ b/neovim.spec @@ -45,7 +45,7 @@ %endif Name: neovim -Version: 0.10.3 +Version: 0.10.4 Release: %autorelease License: Apache-2.0 AND Vim AND MIT @@ -60,9 +60,6 @@ Source3: %{name}-%{version}-vendor.tar.gz Source4: neovim-bundled-licenses.txt Source5: %{name}-%{version}-vendor-treesitter.tar.gz -Patch0: https://github.com/neovim/neovim/pull/31676.patch -Patch1: https://github.com/neovim/neovim/pull/32180.patch#/neovim-fix-build-gcc15.patch - Patch1000: neovim-lua-bit32.patch BuildRequires: gcc-c++ diff --git a/sources b/sources index d63dc93..647c98f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (neovim-0.10.3.tar.gz) = f1286c42bf0a119fea4575ae64043e43f36cd569d339ced15700c45441e8d8952ea7eac2250063a5aff4552632f0ca7696b442d4d8ffa4f5fce25ddbee0e861b -SHA512 (neovim-0.10.3-vendor.tar.gz) = adab443b56f28fb0dc6908cb9712197bd97fd9f81d14d286b35cfc702304621062fefc1cbc3641cc14f6133b0d5da33f7d367672f911959538e07af906222c9d -SHA512 (neovim-0.10.3-vendor-treesitter.tar.gz) = 7aa042607f9edd7d8543d3dac85bbbc12cb5b0c2c1376d4d5c765c8bab67ca8e04d1ae49a91c1e37d83b7f55e53c1c45087b8c10c7feaefaf864ab7e285ba868 +SHA512 (neovim-0.10.4.tar.gz) = 8dadc24edaaa27e6ecd4db6c19d0183868a8d2809ba122110685f340341d951772ac2eb0c5f7a7ab5f87d3d5d8ae5e81f156c61f04f6d4ebbaa17cd35fb70b64 +SHA512 (neovim-0.10.4-vendor.tar.gz) = 6ea5a3dac50af53aebbf3ebaadf6766f2b2bedcc6b43bca553015847be5311b5fb3803fad7d1bc856b67b77c0d73d8f9a578bc55448d5d845147d4e7b64558a1 +SHA512 (neovim-0.10.4-vendor-treesitter.tar.gz) = b3038b2fde2b1d7183667da0b37ee61e24abb9b17b744ac3c63ce49a299c4026ee2e836237a05044cd2b1bda6a3c1fa572c0199eb632fb0362d6e5e141ca882a From 5d308335d03a1a5190950aa7dad589111dd6bf84 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Mon, 3 Feb 2025 12:23:47 +0000 Subject: [PATCH 20/37] Rebuild against tree-sitter-0.25.1-5.fc42 From 5cdd15f3183e11ff5d4bb19fdea8ca1ab1987571 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Wed, 19 Feb 2025 14:41:58 +0000 Subject: [PATCH 21/37] Rebuild against tree-sitter-0.25.2-3.fc43 From ae2400c6e9b714354159f75fadc321f26e109dec Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 21 Feb 2025 12:05:06 +0100 Subject: [PATCH 22/37] Rebuild against tree-sitter-0.25.2-3.fc43 From b85d57a54f64f75e93c948ebea7aeda36196c415 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 26 Mar 2025 15:50:40 +0100 Subject: [PATCH 23/37] Update to version 0.11.0 - https://gpanders.com/blog/whats-new-in-neovim-0-11/ - Check also `:help news` and `:help news-breaking` --- .gitignore | 3 ++ neovim-lua-bit32.patch | 38 ++++++++------ neovim.spec | 112 ++++++++++++++++++----------------------- sources | 6 +-- 4 files changed, 78 insertions(+), 81 deletions(-) diff --git a/.gitignore b/.gitignore index 3d5b688..bfae7ae 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,6 @@ /neovim-0.10.4.tar.gz /neovim-0.10.4-vendor.tar.gz /neovim-0.10.4-vendor-treesitter.tar.gz +/neovim-0.11.0.tar.gz +/neovim-0.11.0-vendor.tar.gz +/neovim-0.11.0-vendor-treesitter.tar.gz diff --git a/neovim-lua-bit32.patch b/neovim-lua-bit32.patch index 9618c0b..85333e8 100644 --- a/neovim-lua-bit32.patch +++ b/neovim-lua-bit32.patch @@ -1,23 +1,31 @@ -Index: neovim-0.10.0/src/nvim/ex_cmds.lua +Index: neovim-0.11.0/src/nvim/ex_cmds.lua =================================================================== ---- neovim-0.10.0.orig/src/nvim/ex_cmds.lua 2024-05-16 17:22:58.176811996 +0200 -+++ neovim-0.10.0/src/nvim/ex_cmds.lua 2024-05-16 17:23:05.255828571 +0200 +--- neovim-0.11.0.orig/src/nvim/ex_cmds.lua 2025-03-26 18:02:38.217064177 +0100 ++++ neovim-0.11.0/src/nvim/ex_cmds.lua 2025-03-26 18:02:41.424747978 +0100 @@ -1,4 +1,4 @@ -local bit = require 'bit' +local bit = require 'bit32' local M = {} -Index: neovim-0.10.0/src/nvim/generators/gen_ex_cmds.lua +Index: neovim-0.11.0/runtime/lua/vim/lsp/_watchfiles.lua =================================================================== ---- neovim-0.10.0.orig/src/nvim/generators/gen_ex_cmds.lua 2024-05-16 17:22:58.177811999 +0200 -+++ neovim-0.10.0/src/nvim/generators/gen_ex_cmds.lua 2024-05-16 17:23:05.256828573 +0200 -@@ -10,7 +10,7 @@ local defsfname = autodir .. '/ex_cmds_d - local enumfile = io.open(enumfname, 'w') - local defsfile = io.open(defsfname, 'w') - --local bit = require 'bit' -+local bit = require 'bit32' - local ex_cmds = require('ex_cmds') - local defs = ex_cmds.cmds - local flags = ex_cmds.flags +--- neovim-0.11.0.orig/runtime/lua/vim/lsp/_watchfiles.lua 2025-03-26 14:48:09.000000000 +0100 ++++ neovim-0.11.0/runtime/lua/vim/lsp/_watchfiles.lua 2025-03-26 18:04:19.210556853 +0100 +@@ -1,4 +1,4 @@ +-local bit = require('bit') ++local bit = require('bit32') + local glob = vim.glob + local watch = vim._watch + local protocol = require('vim.lsp.protocol') +Index: neovim-0.11.0/runtime/lua/vim/lsp/semantic_tokens.lua +=================================================================== +--- neovim-0.11.0.orig/runtime/lua/vim/lsp/semantic_tokens.lua 2025-03-26 14:48:09.000000000 +0100 ++++ neovim-0.11.0/runtime/lua/vim/lsp/semantic_tokens.lua 2025-03-26 18:04:28.696322064 +0100 +@@ -1,5 +1,5 @@ + local api = vim.api +-local bit = require('bit') ++local bit = require('bit32') + local ms = require('vim.lsp.protocol').Methods + local util = require('vim.lsp.util') + local uv = vim.uv diff --git a/neovim.spec b/neovim.spec index b0be00c..b7306be 100644 --- a/neovim.spec +++ b/neovim.spec @@ -45,7 +45,7 @@ %endif Name: neovim -Version: 0.10.4 +Version: 0.11.0 Release: %autorelease License: Apache-2.0 AND Vim AND MIT @@ -91,11 +91,12 @@ BuildRequires: jemalloc-devel %endif BuildRequires: msgpack-devel >= 3.1.0 BuildRequires: pkgconfig(termkey) -BuildRequires: pkgconfig(libuv) >= 1.42.0 +BuildRequires: pkgconfig(libuv) >= 1.50.0 BuildRequires: pkgconfig(vterm) >= %{vterm_min_ver} # need the build with the fix for the resize buffer issue Requires: libvterm >= %{vterm_min_ver} BuildRequires: pkgconfig(unibilium) +BuildRequires: pkgconfig(libutf8proc) >= 2.10.0 %if %{with system_treesitter} BuildRequires: pkgconfig(tree-sitter) >= %{tree_sitter_min_ver} # tree-sitter didn't do an soname bump. enforce the min version @@ -110,6 +111,7 @@ Suggests: (python3-neovim if python3) Recommends: xsel Recommends: wl-clipboard Recommends: ripgrep +Recommends: inotify-tools %description Neovim is a refactor - and sometimes redactor - in the tradition of @@ -133,8 +135,6 @@ mv ../%{name}-%{version}-vendor-treesitter/* \ cp %{SOURCE4} . -%patch -P 0 -p1 -%patch -P 1 -p1 %if %{without luajit} %patch -P 1000 -p1 %endif @@ -164,7 +164,8 @@ ln -sfr ../%{name}-%{version}-vendor .deps/build/downloads -DPREFER_LUA=%{?with_luajit:OFF}%{!?with_luajit:ON} \ -DLUA_PRG=%{lua_prg} \ -DENABLE_JEMALLOC=%{?with_jemalloc:ON}%{!?with_jemalloc:OFF} \ - -DLIBLUV_INCLUDE_DIR:PATH=%{luv_include_dir} + -DLIBLUV_INCLUDE_DIR:PATH=%{luv_include_dir} \ + -DENABLE_TRANSLATIONS=ON %cmake_build %install @@ -239,9 +240,6 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %dir %{_datadir}/nvim/runtime/autoload/xml %{_datadir}/nvim/runtime/autoload/xml/*.vim -%dir %{_datadir}/nvim/runtime/autoload/zig -%{_datadir}/nvim/runtime/autoload/zig/*.vim - %dir %{_datadir}/nvim/runtime/colors %{_datadir}/nvim/runtime/colors/*.lua %{_datadir}/nvim/runtime/colors/*.vim @@ -269,33 +267,9 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %dir %{_datadir}/nvim/runtime/indent/testdir/ %{_datadir}/nvim/runtime/indent/testdir/README.txt -%{_datadir}/nvim/runtime/indent/testdir/bitbake.in -%{_datadir}/nvim/runtime/indent/testdir/bitbake.ok -%{_datadir}/nvim/runtime/indent/testdir/dts.in -%{_datadir}/nvim/runtime/indent/testdir/dts.ok -%{_datadir}/nvim/runtime/indent/testdir/html.in -%{_datadir}/nvim/runtime/indent/testdir/html.ok -%{_datadir}/nvim/runtime/indent/testdir/krl.in -%{_datadir}/nvim/runtime/indent/testdir/krl.ok -%{_datadir}/nvim/runtime/indent/testdir/matlab.in -%{_datadir}/nvim/runtime/indent/testdir/matlab.ok -%{_datadir}/nvim/runtime/indent/testdir/python.in -%{_datadir}/nvim/runtime/indent/testdir/python.ok -%{_datadir}/nvim/runtime/indent/testdir/rapid.in -%{_datadir}/nvim/runtime/indent/testdir/rapid.ok -%{_datadir}/nvim/runtime/indent/testdir/runtest.vim -%{_datadir}/nvim/runtime/indent/testdir/sshconfig.in -%{_datadir}/nvim/runtime/indent/testdir/sshconfig.ok -%{_datadir}/nvim/runtime/indent/testdir/tcl.in -%{_datadir}/nvim/runtime/indent/testdir/tcl.ok -%{_datadir}/nvim/runtime/indent/testdir/vb.in -%{_datadir}/nvim/runtime/indent/testdir/vb.ok -%{_datadir}/nvim/runtime/indent/testdir/vim.in -%{_datadir}/nvim/runtime/indent/testdir/vim.ok -%{_datadir}/nvim/runtime/indent/testdir/xml.in -%{_datadir}/nvim/runtime/indent/testdir/xml.ok -%{_datadir}/nvim/runtime/indent/testdir/yaml.in -%{_datadir}/nvim/runtime/indent/testdir/yaml.ok +%{_datadir}/nvim/runtime/indent/testdir/*.in +%{_datadir}/nvim/runtime/indent/testdir/*.ok +%{_datadir}/nvim/runtime/indent/testdir/*.vim %dir %{_datadir}/nvim/runtime/keymap %{_datadir}/nvim/runtime/keymap/*.vim @@ -304,35 +278,24 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %dir %{_datadir}/nvim/runtime/lua %{_datadir}/nvim/runtime/lua/*.lua -%dir %{_datadir}/nvim/runtime/lua/nvim -%{_datadir}/nvim/runtime/lua/nvim/health.lua - -%dir %{_datadir}/nvim/runtime/lua/provider - -%dir %{_datadir}/nvim/runtime/lua/provider/clipboard -%{_datadir}/nvim/runtime/lua/provider/clipboard/*.lua - -%dir %{_datadir}/nvim/runtime/lua/provider/node -%{_datadir}/nvim/runtime/lua/provider/node/*.lua - -%dir %{_datadir}/nvim/runtime/lua/provider/perl -%{_datadir}/nvim/runtime/lua/provider/perl/*.lua - -%dir %{_datadir}/nvim/runtime/lua/provider/python -%{_datadir}/nvim/runtime/lua/provider/python/*.lua - -%dir %{_datadir}/nvim/runtime/lua/provider/ruby -%{_datadir}/nvim/runtime/lua/provider/ruby/*.lua - %dir %{_datadir}/nvim/runtime/lua/vim %{_datadir}/nvim/runtime/lua/vim/*.lua +%dir %{_datadir}/nvim/runtime/lua/vim/_ftplugin +%{_datadir}/nvim/runtime/lua/vim/_ftplugin/*.lua + %dir %{_datadir}/nvim/runtime/lua/vim/_meta %{_datadir}/nvim/runtime/lua/vim/_meta/*.lua +%dir %{_datadir}/nvim/runtime/lua/vim/deprecated +%{_datadir}/nvim/runtime/lua/vim/deprecated/health.lua + %dir %{_datadir}/nvim/runtime/lua/vim/filetype %{_datadir}/nvim/runtime/lua/vim/filetype/*.lua +%dir %{_datadir}/nvim/runtime/lua/vim/health +%{_datadir}/nvim/runtime/lua/vim/health/*.lua + %dir %{_datadir}/nvim/runtime/lua/vim/func %{_datadir}/nvim/runtime/lua/vim/func/*.lua @@ -348,15 +311,13 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %dir %{_datadir}/nvim/runtime/lua/vim/treesitter %{_datadir}/nvim/runtime/lua/vim/treesitter/*.lua +%dir %{_datadir}/nvim/runtime/lua/vim/treesitter/_meta +%{_datadir}/nvim/runtime/lua/vim/treesitter/_meta/*.lua + %dir %{_datadir}/nvim/runtime/lua/vim/ui %dir %{_datadir}/nvim/runtime/lua/vim/ui/clipboard %{_datadir}/nvim/runtime/lua/vim/ui/clipboard/*.lua -%dir %{_datadir}/nvim/runtime/macros -%{_datadir}/nvim/runtime/macros/*.vim -%{_datadir}/nvim/runtime/macros/less.bat -%{_datadir}/nvim/runtime/macros/less.sh - %dir %{_datadir}/nvim/runtime/pack %dir %{_datadir}/nvim/runtime/pack/dist %dir %{_datadir}/nvim/runtime/pack/dist/opt @@ -369,6 +330,28 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %dir %{_datadir}/nvim/runtime/pack/dist/opt/justify/plugin %{_datadir}/nvim/runtime/pack/dist/opt/justify/plugin/*.vim +%dir %{_datadir}/nvim/runtime/pack/dist/opt/netrw +%{_datadir}/nvim/runtime/pack/dist/opt/netrw/LICENSE.txt +%{_datadir}/nvim/runtime/pack/dist/opt/netrw/README.md + +%dir %{_datadir}/nvim/runtime/pack/dist/opt/netrw/autoload +%{_datadir}/nvim/runtime/pack/dist/opt/netrw/autoload/*.vim + +%dir %{_datadir}/nvim/runtime/pack/dist/opt/netrw/doc +%{_datadir}/nvim/runtime/pack/dist/opt/netrw/doc/*.txt +%{_datadir}/nvim/runtime/pack/dist/opt/netrw/doc/tags + +%dir %{_datadir}/nvim/runtime/pack/dist/opt/netrw/plugin +%{_datadir}/nvim/runtime/pack/dist/opt/netrw/plugin/*.vim + +%dir %{_datadir}/nvim/runtime/pack/dist/opt/netrw/syntax +%{_datadir}/nvim/runtime/pack/dist/opt/netrw/syntax/*.vim + +%dir %{_datadir}/nvim/runtime/pack/dist/opt/nohlsearch + +%dir %{_datadir}/nvim/runtime/pack/dist/opt/nohlsearch/plugin +%{_datadir}/nvim/runtime/pack/dist/opt/nohlsearch/plugin/*.vim + %dir %{_datadir}/nvim/runtime/pack/dist/opt/shellmenu %dir %{_datadir}/nvim/runtime/pack/dist/opt/shellmenu/plugin %{_datadir}/nvim/runtime/pack/dist/opt/shellmenu/plugin/*.vim @@ -419,6 +402,12 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %dir %{_datadir}/nvim/runtime/queries/vimdoc/ %{_datadir}/nvim/runtime/queries/vimdoc/*.scm +%dir %{_datadir}/nvim/runtime/scripts +%{_datadir}/nvim/runtime/scripts/*.lua +%{_datadir}/nvim/runtime/scripts/*.vim +%{_datadir}/nvim/runtime/scripts/less.bat +%{_datadir}/nvim/runtime/scripts/less.sh + %dir %{_datadir}/nvim/runtime/spell %{_datadir}/nvim/runtime/spell/cleanadd.vim %{_datadir}/nvim/runtime/spell/en.utf-8.spl @@ -439,9 +428,6 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %{_datadir}/nvim/runtime/syntax/shared/*.vim %{_datadir}/nvim/runtime/syntax/shared/README.txt -%dir %{_datadir}/nvim/runtime/tools -%{_datadir}/nvim/runtime/tools/*.vim - %dir %{_datadir}/nvim/runtime/tutor %{_datadir}/nvim/runtime/tutor/tutor.tutor %{_datadir}/nvim/runtime/tutor/tutor.tutor.json diff --git a/sources b/sources index 647c98f..2384d59 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (neovim-0.10.4.tar.gz) = 8dadc24edaaa27e6ecd4db6c19d0183868a8d2809ba122110685f340341d951772ac2eb0c5f7a7ab5f87d3d5d8ae5e81f156c61f04f6d4ebbaa17cd35fb70b64 -SHA512 (neovim-0.10.4-vendor.tar.gz) = 6ea5a3dac50af53aebbf3ebaadf6766f2b2bedcc6b43bca553015847be5311b5fb3803fad7d1bc856b67b77c0d73d8f9a578bc55448d5d845147d4e7b64558a1 -SHA512 (neovim-0.10.4-vendor-treesitter.tar.gz) = b3038b2fde2b1d7183667da0b37ee61e24abb9b17b744ac3c63ce49a299c4026ee2e836237a05044cd2b1bda6a3c1fa572c0199eb632fb0362d6e5e141ca882a +SHA512 (neovim-0.11.0.tar.gz) = f898aebffa1d222cdbbc2663b69a6ea55a045c3ddb4e8454bda7b0c6e9abbfc60dce6ea235f535506f6caac9cc1b07c65bdab25374f320cfabc3744336989cf6 +SHA512 (neovim-0.11.0-vendor.tar.gz) = 32d611eea34dc99ab0de0dff82c1dbbe352cd931e324cb1640691409d2113142d42d5f9faf70d1a82dbc19dbedbce6a22c4ab448374fa8c9c813675ed82d30c1 +SHA512 (neovim-0.11.0-vendor-treesitter.tar.gz) = 6f88608f64a01d487122d3d68bddf0edbeb175b9cb4c9e1aa004d577c8c51a0211b6e2ac4df2de4d8e8629dd6a3ad7e045bd9a038907afdd1a6595341abcfeb3 From f52bcdabda2af64fe89ad8dab0e3c341771d8379 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Mon, 14 Apr 2025 12:25:46 +0100 Subject: [PATCH 24/37] Rebuild against tree-sitter-0.25.3-1.fc43 From 090e80c01a2182fab82be19984075316a8a684b4 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sat, 26 Apr 2025 20:57:38 +0200 Subject: [PATCH 25/37] Update to version 0.11.1 - https://github.com/neovim/neovim/releases/tag/v0.11.1 --- .gitignore | 3 +++ neovim.spec | 2 +- sources | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bfae7ae..9bf4440 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,6 @@ /neovim-0.11.0.tar.gz /neovim-0.11.0-vendor.tar.gz /neovim-0.11.0-vendor-treesitter.tar.gz +/neovim-0.11.1.tar.gz +/neovim-0.11.1-vendor.tar.gz +/neovim-0.11.1-vendor-treesitter.tar.gz diff --git a/neovim.spec b/neovim.spec index b7306be..303cb74 100644 --- a/neovim.spec +++ b/neovim.spec @@ -45,7 +45,7 @@ %endif Name: neovim -Version: 0.11.0 +Version: 0.11.1 Release: %autorelease License: Apache-2.0 AND Vim AND MIT diff --git a/sources b/sources index 2384d59..5010779 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (neovim-0.11.0.tar.gz) = f898aebffa1d222cdbbc2663b69a6ea55a045c3ddb4e8454bda7b0c6e9abbfc60dce6ea235f535506f6caac9cc1b07c65bdab25374f320cfabc3744336989cf6 -SHA512 (neovim-0.11.0-vendor.tar.gz) = 32d611eea34dc99ab0de0dff82c1dbbe352cd931e324cb1640691409d2113142d42d5f9faf70d1a82dbc19dbedbce6a22c4ab448374fa8c9c813675ed82d30c1 -SHA512 (neovim-0.11.0-vendor-treesitter.tar.gz) = 6f88608f64a01d487122d3d68bddf0edbeb175b9cb4c9e1aa004d577c8c51a0211b6e2ac4df2de4d8e8629dd6a3ad7e045bd9a038907afdd1a6595341abcfeb3 +SHA512 (neovim-0.11.1.tar.gz) = d2dac85379022e939a6a5ac8b64074d1e4a6d3605791b916e1d77366b97a28ee9f99107e4c251d5a28a5f515fa8bcde9cc6372a9d7901832de3ee01fb9895f4d +SHA512 (neovim-0.11.1-vendor.tar.gz) = 6ad10fb40c70087320bf32e793ed5be3ad10e369ea097d9d62a8b8e28f6a87d689b1d255413804f50949ed712c7e4d7c889bdc2457bbc301484cf4944fced4a1 +SHA512 (neovim-0.11.1-vendor-treesitter.tar.gz) = 0e1f195100197dbf7413136d0d17f794ec30f2426dd7577c18133b0a3514ccd262330e7a91c1778434885c0724397376f1e16c6e788a967ebd1a5e0ca1b95527 From c2d626944cb9dba2b334b98349a27df895d3261f Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Mon, 12 May 2025 14:03:56 +0100 Subject: [PATCH 26/37] Rebuild against tree-sitter-0.25.4-3.fc43 From 3a235a9d60129abdadb1076d610b54075a8ec4a8 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Wed, 28 May 2025 13:01:39 +0100 Subject: [PATCH 27/37] Rebuild against tree-sitter-0.25.5-1.fc43 From b197cc44abc81df17936f86d0c9e42ecc5ec7179 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 3 Jun 2025 10:23:15 +0200 Subject: [PATCH 28/37] Update to version 0.11.2 - resolves: rhbz#2362455 --- .gitignore | 3 +++ neovim.spec | 4 ++-- sources | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 9bf4440..05220de 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,6 @@ /neovim-0.11.1.tar.gz /neovim-0.11.1-vendor.tar.gz /neovim-0.11.1-vendor-treesitter.tar.gz +/neovim-0.11.2.tar.gz +/neovim-0.11.2-vendor.tar.gz +/neovim-0.11.2-vendor-treesitter.tar.gz diff --git a/neovim.spec b/neovim.spec index 303cb74..7d1699d 100644 --- a/neovim.spec +++ b/neovim.spec @@ -45,7 +45,7 @@ %endif Name: neovim -Version: 0.11.1 +Version: 0.11.2 Release: %autorelease License: Apache-2.0 AND Vim AND MIT @@ -213,7 +213,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %dir %{_datadir}/nvim/runtime %{_datadir}/nvim/runtime/*.vim -%{_datadir}/nvim/runtime/filetype.lua +%{_datadir}/nvim/runtime/*.lua %{_datadir}/nvim/runtime/neovim.ico %dir %{_datadir}/nvim/runtime/autoload diff --git a/sources b/sources index 5010779..ccfbaf0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (neovim-0.11.1.tar.gz) = d2dac85379022e939a6a5ac8b64074d1e4a6d3605791b916e1d77366b97a28ee9f99107e4c251d5a28a5f515fa8bcde9cc6372a9d7901832de3ee01fb9895f4d -SHA512 (neovim-0.11.1-vendor.tar.gz) = 6ad10fb40c70087320bf32e793ed5be3ad10e369ea097d9d62a8b8e28f6a87d689b1d255413804f50949ed712c7e4d7c889bdc2457bbc301484cf4944fced4a1 -SHA512 (neovim-0.11.1-vendor-treesitter.tar.gz) = 0e1f195100197dbf7413136d0d17f794ec30f2426dd7577c18133b0a3514ccd262330e7a91c1778434885c0724397376f1e16c6e788a967ebd1a5e0ca1b95527 +SHA512 (neovim-0.11.2.tar.gz) = eeb543ff40b71f384c3a8d964c05e20b4d8be2f647314da703f071954a6f434320b0a61c0a42936c71c970de018de654d8c0e15de92890b9dc50054c5b70b863 +SHA512 (neovim-0.11.2-vendor.tar.gz) = b9d8629ea3134ca15fdf8c15007c81e11ff03b3f7f1db514a5afa67a50ec993b1f4f49af236e95f8a391df5e99ef386086f65f7839d849ac38eedd846dc1223a +SHA512 (neovim-0.11.2-vendor-treesitter.tar.gz) = 7d24436f9f7e2a5dbb85e09262232baaa55bf0f1ff82d39981e352bc51378716cce34759160293e7255de20673fbadf5038665837b85898acbf1d965a6981fcc From bf419f09abed77999410f997985d6c90c933edc7 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Fri, 13 Jun 2025 15:38:04 +0100 Subject: [PATCH 29/37] Rebuild against tree-sitter-0.25.6-1.fc43 From 84454ea7e5768c764254621cfaeac9f500f28243 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sun, 13 Jul 2025 09:05:38 +0200 Subject: [PATCH 30/37] Update to version 0.11.3 --- .gitignore | 3 +++ neovim.spec | 14 +++++++------- sources | 6 +++--- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 05220de..4048e05 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,6 @@ /neovim-0.11.2.tar.gz /neovim-0.11.2-vendor.tar.gz /neovim-0.11.2-vendor-treesitter.tar.gz +/neovim-0.11.3.tar.gz +/neovim-0.11.3-vendor.tar.gz +/neovim-0.11.3-vendor-treesitter.tar.gz diff --git a/neovim.spec b/neovim.spec index 7d1699d..32cb9b5 100644 --- a/neovim.spec +++ b/neovim.spec @@ -45,7 +45,7 @@ %endif Name: neovim -Version: 0.11.2 +Version: 0.11.3 Release: %autorelease License: Apache-2.0 AND Vim AND MIT @@ -429,16 +429,16 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %{_datadir}/nvim/runtime/syntax/shared/README.txt %dir %{_datadir}/nvim/runtime/tutor -%{_datadir}/nvim/runtime/tutor/tutor.tutor -%{_datadir}/nvim/runtime/tutor/tutor.tutor.json +%{_datadir}/nvim/runtime/tutor/*.tutor +%{_datadir}/nvim/runtime/tutor/*.tutor.json %dir %{_datadir}/nvim/runtime/tutor/en -%{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor -%{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json +%{_datadir}/nvim/runtime/tutor/en/*.tutor +%{_datadir}/nvim/runtime/tutor/en/*.tutor.json %dir %{_datadir}/nvim/runtime/tutor/ja -%{_datadir}/nvim/runtime/tutor/ja/vim-01-beginner.tutor -%{_datadir}/nvim/runtime/tutor/ja/vim-01-beginner.tutor.json +%{_datadir}/nvim/runtime/tutor/ja/*.tutor +%{_datadir}/nvim/runtime/tutor/ja/*.tutor.json %changelog %autochangelog diff --git a/sources b/sources index ccfbaf0..6caa44e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (neovim-0.11.2.tar.gz) = eeb543ff40b71f384c3a8d964c05e20b4d8be2f647314da703f071954a6f434320b0a61c0a42936c71c970de018de654d8c0e15de92890b9dc50054c5b70b863 -SHA512 (neovim-0.11.2-vendor.tar.gz) = b9d8629ea3134ca15fdf8c15007c81e11ff03b3f7f1db514a5afa67a50ec993b1f4f49af236e95f8a391df5e99ef386086f65f7839d849ac38eedd846dc1223a -SHA512 (neovim-0.11.2-vendor-treesitter.tar.gz) = 7d24436f9f7e2a5dbb85e09262232baaa55bf0f1ff82d39981e352bc51378716cce34759160293e7255de20673fbadf5038665837b85898acbf1d965a6981fcc +SHA512 (neovim-0.11.3.tar.gz) = 30be325ea364369c242d1ccc7067ccda4c64e4f89198431d1a22ad04213fd7a9aba01d41e9c7c7c35c73883e575d3e09bb928d8e450ad484814165ca1390d995 +SHA512 (neovim-0.11.3-vendor.tar.gz) = 65e11af8c8de8096ba8bcf4b08371a168ace608a30b9176c80ab57d2832aeb2ae1f05411f998f864a5ee35693fb7a0c8b1e42d71bdf2579cc99162049d6d51c8 +SHA512 (neovim-0.11.3-vendor-treesitter.tar.gz) = 5e2419f11ddf554d53942738a35057cb367c90808067294c4ae40b7bde44eb89da5e4d9c7df9a7297b132df9cd010ce093e6c286906fd0961f783a8863f4150e From 52fc733a74235f56ea54dfb25aabb42a4394fd25 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Fri, 18 Jul 2025 12:52:51 +0100 Subject: [PATCH 31/37] Rebuild against tree-sitter-0.25.8-1.fc43 From 496aab5614bdfd4d612dd85cf2b6dbbc57b36f63 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:43:14 +0000 Subject: [PATCH 32/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 235cefbde993230668fb047a6038053573a913cf Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 2 Sep 2025 10:09:06 +0200 Subject: [PATCH 33/37] Update to version 0.11.4 - https://github.com/neovim/neovim/releases/tag/v0.11.4 - resolves: rhbz#2392274 --- .gitignore | 3 +++ neovim.spec | 9 ++++++++- sources | 6 +++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4048e05..e9ab9ed 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,6 @@ /neovim-0.11.3.tar.gz /neovim-0.11.3-vendor.tar.gz /neovim-0.11.3-vendor-treesitter.tar.gz +/neovim-0.11.4.tar.gz +/neovim-0.11.4-vendor.tar.gz +/neovim-0.11.4-vendor-treesitter.tar.gz diff --git a/neovim.spec b/neovim.spec index 32cb9b5..7f53068 100644 --- a/neovim.spec +++ b/neovim.spec @@ -45,7 +45,7 @@ %endif Name: neovim -Version: 0.11.3 +Version: 0.11.4 Release: %autorelease License: Apache-2.0 AND Vim AND MIT @@ -278,6 +278,9 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %dir %{_datadir}/nvim/runtime/lua %{_datadir}/nvim/runtime/lua/*.lua +%dir %{_datadir}/nvim/runtime/lua/nvim +%{_datadir}/nvim/runtime/lua/nvim/*.lua + %dir %{_datadir}/nvim/runtime/lua/vim %{_datadir}/nvim/runtime/lua/vim/*.lua @@ -440,5 +443,9 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %{_datadir}/nvim/runtime/tutor/ja/*.tutor %{_datadir}/nvim/runtime/tutor/ja/*.tutor.json +%dir %{_datadir}/nvim/runtime/tutor/zh +%{_datadir}/nvim/runtime/tutor/zh/*.tutor +%{_datadir}/nvim/runtime/tutor/zh/*.tutor.json + %changelog %autochangelog diff --git a/sources b/sources index 6caa44e..a78f5d4 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (neovim-0.11.3.tar.gz) = 30be325ea364369c242d1ccc7067ccda4c64e4f89198431d1a22ad04213fd7a9aba01d41e9c7c7c35c73883e575d3e09bb928d8e450ad484814165ca1390d995 -SHA512 (neovim-0.11.3-vendor.tar.gz) = 65e11af8c8de8096ba8bcf4b08371a168ace608a30b9176c80ab57d2832aeb2ae1f05411f998f864a5ee35693fb7a0c8b1e42d71bdf2579cc99162049d6d51c8 -SHA512 (neovim-0.11.3-vendor-treesitter.tar.gz) = 5e2419f11ddf554d53942738a35057cb367c90808067294c4ae40b7bde44eb89da5e4d9c7df9a7297b132df9cd010ce093e6c286906fd0961f783a8863f4150e +SHA512 (neovim-0.11.4.tar.gz) = 15eafa31cfee04f72f87ca442382d79a5c1f2e7699709cd1f713196a09425c55bca0587afc206488c528fa707515f12f8e2bc91460126c77ab3bc8e776deba76 +SHA512 (neovim-0.11.4-vendor.tar.gz) = 7fdca462883ab3bfdaaa7aeb1beb9380c2eb537a61a6e4fb9dacde3d7a58c423af50a11dbf62579d3034453c1a595b821fccb49419f6fa935a765a2fc7b41045 +SHA512 (neovim-0.11.4-vendor-treesitter.tar.gz) = 3721bd4954df4bc47dfe9a217979cf9721b4753c4a5e2e7d153762fdb0a283251aefe03d697bd68f9497c50710de266f607ad772a6a6f6db1699a9d6941c912b From 5ad696d19c93205a29a5d6b4644de3551dde1218 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Tue, 9 Sep 2025 14:40:02 +0100 Subject: [PATCH 34/37] Rebuild against tree-sitter-0.25.9-1.fc44 From 708ec7ad796d7a1807bffade47643eea342c0bd6 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Wed, 24 Sep 2025 15:20:54 +0100 Subject: [PATCH 35/37] Rebuild against tree-sitter-0.25.10-1.fc44 From 26b14788aae9912a259ae1b21896c8695459d66f Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sun, 12 Oct 2025 17:30:53 +0200 Subject: [PATCH 36/37] Don't write logfiles when refreshing helptags - resolves: rhbz#2402743 --- neovim.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neovim.spec b/neovim.spec index 7f53068..a882337 100644 --- a/neovim.spec +++ b/neovim.spec @@ -187,11 +187,11 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ # Refresh documentation helptags. %transfiletriggerin -- %{_datadir}/nvim/runtime/doc -%{_bindir}/nvim -u NONE -es -c ":helptags %{_datadir}/nvim/runtime/doc" -c ":q" &> /dev/null || : +NVIM_LOG_FILE=/dev/null %{_bindir}/nvim -u NONE -es -c ":helptags %{_datadir}/nvim/runtime/doc" -c ":q" &> /dev/null || : %transfiletriggerpostun -- %{_datadir}/nvim/runtime/doc > %{_datadir}/nvim/runtime/doc/tags || : -%{_bindir}/nvim -u NONE -es -c ":helptags %{_datadir}/nvim/runtime/doc" -c ":q" &> /dev/null || : +NVIM_LOG_FILE=/dev/null %{_bindir}/nvim -u NONE -es -c ":helptags %{_datadir}/nvim/runtime/doc" -c ":q" &> /dev/null || : %files -f nvim.lang %license LICENSE.txt neovim-bundled-licenses.txt From f861fee0b375762a798aca83b520223d198cbabf Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 3 Nov 2025 09:41:38 +0100 Subject: [PATCH 37/37] Update to version 0.11.5 resolves: rhbz#2411913 --- .gitignore | 2 ++ README.md | 1 - mkvendor-treesitter.sh | 27 ---------------- mkvendor.sh | 73 ++++++++++++++++++++++++++++++------------ neovim.spec | 10 +----- sources | 5 ++- 6 files changed, 58 insertions(+), 60 deletions(-) delete mode 100644 mkvendor-treesitter.sh diff --git a/.gitignore b/.gitignore index e9ab9ed..5f5dba2 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,5 @@ /neovim-0.11.4.tar.gz /neovim-0.11.4-vendor.tar.gz /neovim-0.11.4-vendor-treesitter.tar.gz +/neovim-0.11.5.tar.gz +/neovim-0.11.5-vendor.tar.gz diff --git a/README.md b/README.md index 3e9397f..e3533c1 100644 --- a/README.md +++ b/README.md @@ -8,4 +8,3 @@ The hyper-extensible Vim-based text editor * Download the new tarball * Add the tarball with `fedpkg new-sources neovim-.tar.gz` * Run `bash mkvendor.sh` -* Run `bash mkvendor-treesitter.sh` diff --git a/mkvendor-treesitter.sh b/mkvendor-treesitter.sh deleted file mode 100644 index 5ef2d5c..0000000 --- a/mkvendor-treesitter.sh +++ /dev/null @@ -1,27 +0,0 @@ - #!/usr/bin/bash -x - -set -euo pipefail - -url=$(rpmspec -P neovim.spec | sed -En 's/^Source0:[[:space:]]+//p') -archive=$(basename "$url") -tmp=$(mktemp -d) -trap "rm -rf $tmp" EXIT - -curl -Lo "${tmp}/${archive}" "${url}" -grep -F "${archive}" sources | (cd "${tmp}" && cksum -c) -mkdir -p "${tmp}/src" -tar -zxf "${tmp}/${archive}" -C "${tmp}/src" --strip-components=1 - -cmake -S "${tmp}/src/cmake.deps" -B "${tmp}/deps" -G Ninja \ - -DUSE_BUNDLED=OFF -DUSE_BUNDLED_TS=ON -targets=$(basename -a "${tmp}/deps"/build/downloads/treesitter | \ - xargs -I {} echo build/src/{}-stamp/{}-download) -ninja -C "${tmp}/deps" ${targets} - -mv "${tmp}/${archive}" . -vendor="${archive%.tar.gz}-vendor" -tar -zcf "${vendor}-treesitter.tar.gz" -H pax --numeric-owner --owner=0:0 \ - -C "${tmp}/deps/build/downloads" . --transform="s/^\\./${vendor}-treesitter/" - -echo -echo "Run: fedpkg new-sources ${archive} ${vendor}.tar.gz ${vendor}-treesitter.tar.gz" diff --git a/mkvendor.sh b/mkvendor.sh index c030923..69152c9 100644 --- a/mkvendor.sh +++ b/mkvendor.sh @@ -1,28 +1,61 @@ - #!/usr/bin/bash -x +#!/usr/bin/bash -x set -euo pipefail -url=$(rpmspec -P neovim.spec | sed -En 's/^Source0:[[:space:]]+//p') -archive=$(basename "$url") -tmp=$(mktemp -d) -trap "rm -rf $tmp" EXIT +nvim_url="$(rpmspec -P neovim.spec | sed -En 's/^Source0:[[:space:]]+//p')" +nvim_archive="$(basename "$nvim_url")" +nvim_tmpdir="$(mktemp --tmpdir -d nvim-XXXXXXXX)" +nvim_srcdir="$(pwd)" -curl -Lo "${tmp}/${archive}" "${url}" -grep -F "${archive}" sources | (cd "${tmp}" && cksum -c) -mkdir -p "${tmp}/src" -tar -zxf "${tmp}/${archive}" -C "${tmp}/src" --strip-components=1 +cleanup_tmpdir() { + popd 2>/dev/null || true + rm -rf "${nvim_tmpdir}" +} +trap cleanup_tmpdir SIGINT -cmake -S "${tmp}/src/cmake.deps" -B "${tmp}/deps" -G Ninja \ - -DUSE_BUNDLED=OFF -DUSE_BUNDLED_TS_PARSERS=ON -targets=$(basename -a "${tmp}/deps"/build/downloads/treesitter_* | \ - xargs -I {} echo build/src/{}-stamp/{}-download) -ninja -C "${tmp}/deps" ${targets} +cleanup_and_exit() { + cleanup_tmpdir + if test "$1" = 0 -o -z "$1" ; then + exit 0 + else + exit "${1}" + fi +} -mv "${tmp}/${archive}" . -vendor="${archive%.tar.gz}-vendor" -tar -zcf "${vendor}.tar.gz" -H pax --numeric-owner --owner=0:0 \ - -C "${tmp}/deps/build/downloads" . --transform="s/^\\./${vendor}/" +if [ ! -w "${nvim_archive}" ]; then + curl -Lo "${nvim_archive}" "${nvim_url}" + fedpkg new-sources "${nvim_archive}" +fi + +mkdir -p "${nvim_tmpdir}/src" +tar -zxf "${nvim_srcdir}/${nvim_archive}" -C "${nvim_tmpdir}/src" --strip-components=1 + +pushd "${nvim_tmpdir}" || cleanup_and_exit 1 + +cmake \ + -S "${nvim_tmpdir}/src/cmake.deps" \ + -B "${nvim_tmpdir}/deps" -G Ninja \ + -DUSE_BUNDLED=OFF \ + -DUSE_BUNDLED_TS=ON \ + -DUSE_BUNDLED_TS_PARSERS=ON + +readarray -t targets < <(basename -a "${nvim_tmpdir}/deps/build/downloads/"treesitter* | \ + xargs -I {} echo build/src/{}-stamp/{}-download) +ninja -C "${nvim_tmpdir}/deps" "${targets[@]}" + +nvim_vendor="${nvim_archive%.tar.gz}-vendor" +nvim_vendor_archive="${nvim_vendor}.tar.gz" +tar -zcf "${nvim_srcdir}/${nvim_vendor_archive}" \ + -H pax \ + --numeric-owner \ + --owner=0:0 \ + -C "${nvim_tmpdir}/deps/build/downloads" . \ + --transform="s/^\\./${nvim_vendor}/" +popd + +cksum -a sha512 "${nvim_archive}" "${nvim_vendor_archive}" | tee sources -cksum -a sha512 "${archive}" "${vendor}.tar.gz" | tee sources echo -echo "Run: fedpkg new-sources ${archive} ${vendor}.tar.gz" +echo "Run: fedpkg new-sources ${nvim_archive} ${nvim_vendor_archive}" + +cleanup_and_exit 0 diff --git a/neovim.spec b/neovim.spec index a882337..d3e5009 100644 --- a/neovim.spec +++ b/neovim.spec @@ -45,7 +45,7 @@ %endif Name: neovim -Version: 0.11.4 +Version: 0.11.5 Release: %autorelease License: Apache-2.0 AND Vim AND MIT @@ -58,7 +58,6 @@ Source2: spec-template # Generated by mkvendor.sh Source3: %{name}-%{version}-vendor.tar.gz Source4: neovim-bundled-licenses.txt -Source5: %{name}-%{version}-vendor-treesitter.tar.gz Patch1000: neovim-lua-bit32.patch @@ -124,14 +123,7 @@ excisions, Neovim is Vim. It is built for users who want the good parts of Vim, without compromise, and more. %prep -%if %{with system_treesitter} %setup -q -b3 -%else -%setup -q -b3 -b5 - -mv ../%{name}-%{version}-vendor-treesitter/* \ - ../%{name}-%{version}-vendor/ -%endif cp %{SOURCE4} . diff --git a/sources b/sources index a78f5d4..2bb5bca 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (neovim-0.11.4.tar.gz) = 15eafa31cfee04f72f87ca442382d79a5c1f2e7699709cd1f713196a09425c55bca0587afc206488c528fa707515f12f8e2bc91460126c77ab3bc8e776deba76 -SHA512 (neovim-0.11.4-vendor.tar.gz) = 7fdca462883ab3bfdaaa7aeb1beb9380c2eb537a61a6e4fb9dacde3d7a58c423af50a11dbf62579d3034453c1a595b821fccb49419f6fa935a765a2fc7b41045 -SHA512 (neovim-0.11.4-vendor-treesitter.tar.gz) = 3721bd4954df4bc47dfe9a217979cf9721b4753c4a5e2e7d153762fdb0a283251aefe03d697bd68f9497c50710de266f607ad772a6a6f6db1699a9d6941c912b +SHA512 (neovim-0.11.5.tar.gz) = 1b2bb241261eefd195275e28bb9ebe4102261d61d8b7fe38ccebad7131ccc38d29fae8494d511b4c440ad71ef95dc405a2ba6e98b5d47426f215c8137c8bc91f +SHA512 (neovim-0.11.5-vendor.tar.gz) = 388e8afb7919d89c7bceab3f03a49909ef307c3c2ac29d9899f5e30e475c18d453010290cc8929e5cae0a1252b2b7056a5d2bedfc9a3f3a12c0530aa52e14b0c