diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..0a80fdce31f59c062e2abba28776e9521eddff30 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..a666b58f97d0370f352f057a029192de8552dc0a --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/vim diff --git a/backport-patch-9.1.0918-tiny-vim-crashes-with-fuzzy-buffer-completion.patch b/backport-patch-9.1.0918-tiny-vim-crashes-with-fuzzy-buffer-completion.patch deleted file mode 100644 index 22eda0a1fdb87544f69577f98f5cab5d4557145d..0000000000000000000000000000000000000000 --- a/backport-patch-9.1.0918-tiny-vim-crashes-with-fuzzy-buffer-completion.patch +++ /dev/null @@ -1,103 +0,0 @@ -From dff3c9c1a789351a741b6a430862c8b2a0eff383 Mon Sep 17 00:00:00 2001 -From: 826814741_6 <44406129+826814741-6@users.noreply.github.com> -Date: Tue, 10 Dec 2024 17:15:14 +0100 -Subject: [PATCH] patch 9.1.0918: tiny Vim crashes with fuzzy buffer completion - -Problem: tiny Vim crashes with fuzzy buffer completion -Solution: Adjust #ifdefs in ExpandBufnames() (826814741_6) - -closes: #16200 - -Signed-off-by: h-east -Signed-off-by: 826814741_6 <44406129+826814741-6@users.noreply.github.com> -Signed-off-by: Christian Brabandt ---- - src/buffer.c | 4 ++-- - src/testdir/Make_all.mak | 6 ++++-- - src/testdir/test29.in | 14 ++++++++++++++ - src/testdir/test29.ok | 1 + - 4 files changed, 21 insertions(+), 4 deletions(-) - create mode 100644 src/testdir/test29.in - create mode 100644 src/testdir/test29.ok - -diff --git a/src/buffer.c b/src/buffer.c -index 3b05f25d7f705b..147d20dc78f0ff 100644 ---- a/src/buffer.c -+++ b/src/buffer.c -@@ -2985,9 +2985,9 @@ ExpandBufnames( - vim_free(patc); - } - --#ifdef FEAT_VIMINFO - if (!fuzzy) - { -+#ifdef FEAT_VIMINFO - if (matches != NULL) - { - int i; -@@ -3007,13 +3007,13 @@ ExpandBufnames( - } - vim_free(matches); - } -+#endif - } - else - { - if (fuzzymatches_to_strmatches(fuzmatch, file, count, FALSE) == FAIL) - return FAIL; - } --#endif - - *num_file = count; - return (count == 0 ? FAIL : OK); -diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak -index bdf058c1ec43a1..7285354838805a 100644 ---- a/src/testdir/Make_all.mak -+++ b/src/testdir/Make_all.mak -@@ -21,7 +21,8 @@ SCRIPTS_TINY = \ - test25 \ - test26 \ - test27 \ -- test28 -+ test28 \ -+ test29 - - SCRIPTS_TINY_OUT = \ - test10.out \ -@@ -33,7 +34,8 @@ SCRIPTS_TINY_OUT = \ - test25.out \ - test26.out \ - test27.out \ -- test28.out -+ test28.out \ -+ test29.out - - # Tests for Vim9 script. - TEST_VIM9 = \ -diff --git a/src/testdir/test29.in b/src/testdir/test29.in -new file mode 100644 -index 00000000000000..047803c60ff7bd ---- /dev/null -+++ b/src/testdir/test29.in -@@ -0,0 +1,14 @@ -+Test for buffer name completion when 'wildoptions' contains "fuzzy" -+(Confirm that Vim does not crash) -+ -+STARTTEST -+:set wildoptions=fuzzy -+:new buf_a -+:b buf_a -+:q! -+:set wildoptions& -+:$w! test.out -+:qa! -+ENDTEST -+ -+I'm alive! -diff --git a/src/testdir/test29.ok b/src/testdir/test29.ok -new file mode 100644 -index 00000000000000..6a0a7c94510a8e ---- /dev/null -+++ b/src/testdir/test29.ok -@@ -0,0 +1 @@ -+I'm alive! diff --git a/v9.1.0764.tar.gz b/v9.1.0764.tar.gz deleted file mode 100644 index a7dc22fc601cd2c3c5fb38823d91ce3c736b152e..0000000000000000000000000000000000000000 Binary files a/v9.1.0764.tar.gz and /dev/null differ diff --git a/v9.1.1019.tar.gz b/v9.1.1019.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8951663e7f7b930197bd573b62e2d59c31982bad --- /dev/null +++ b/v9.1.1019.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49014bc082523cb4149358514cfec8e5b3e789982ac2253322f166eb9e830897 +size 18413320 diff --git a/vim.spec b/vim.spec index 029c82f824c500383de58937aac7cfbd2bccb5e2..47235774dfced865cc4e92d3d16c053b3d6e9b5a 100644 --- a/vim.spec +++ b/vim.spec @@ -4,13 +4,13 @@ %{!?_with_netbeans__:%define _with_netbeans__ 1} %define baseversion 9.1 -%define patchlevel 0764 +%define patchlevel 1019 %define vimdir vim91 Name: vim Epoch: 2 Version: %{baseversion}.%{patchlevel} -Release: 2 +Release: 1 Summary: Vim is a highly configurable text editor for efficiently creating and changing any kind of text. License: Vim AND LGPL-2.1-or-later AND MIT AND GPL-1.0-only AND (GPL-2.0-only OR Vim) AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-or-later AND GPL-3.0-or-later AND OPUBL-1.0 AND Apache-2.0 WITH Swift-exception URL: https://www.vim.org @@ -24,8 +24,6 @@ Patch0002: vim-8.0-copy-paste.patch Patch0003: vim-python3-tests.patch Patch0005: bugfix-rm-modify-info-version.patch -Patch6000: backport-patch-9.1.0918-tiny-vim-crashes-with-fuzzy-buffer-completion.patch - BuildRequires: autoconf python3-devel ncurses-devel gettext perl-devel perl-generators gcc BuildRequires: perl(ExtUtils::Embed) perl(ExtUtils::ParseXS) libacl-devel gpm-devel file BuildRequires: pkgconfig(libsodium) @@ -279,17 +277,6 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{_builddir}/%{n appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml -pushd %{buildroot}%{_datadir}/%{name}/%{vimdir}/tutor -ln -sf menu_ja_jp.ujis.vim %{buildroot}%{_datadir}/%{name}/%{vimdir}/lang/menu_ja_jp.eucjp.vim -for files in {tutor.ca,tutor.it,tutor.fr,tutor.es,tutor.de,tutor.sv,tutor.no} -do - iconv -f CP1252 -t UTF8 ${files} -o ${files}.bak;mv ${files}.bak ${files} -done -iconv -f ISO-8859-2 -t UTF8 tutor.pl -o tutor.pl.bak;mv tutor.pl.bak tutor.pl -iconv -f ISO-8859-2 -t UTF8 tutor.sk -o tutor.sk.bak;mv tutor.sk.bak tutor.sk -iconv -f KOI8R -t UTF8 tutor.ru -o tutor.ru.bak;mv tutor.ru.bak tutor.ru -popd - install -Dpm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/virc install -pm644 %{SOURCE2} %{buildroot}%{_sysconfdir}/vimrc @@ -335,10 +322,6 @@ popd > %{_datadir}/%{name}/vimfiles/doc/tags || : %{_bindir}/vim -c ":helptags %{_datadir}/%{name}/vimfiles/doc" -c :q &> /dev/null || : -%check -export TERM=xterm -LC_ALL=en_US.UTF-8 make -j1 test || echo "Warning: Please check tests." - %files common %license LICENSE %doc README* @@ -351,6 +334,7 @@ LC_ALL=en_US.UTF-8 make -j1 test || echo "Warning: Please check tests." %{_datadir}/%{name}/%{vimdir}/import/dist/{vimhelp.vim,vimhighlight.vim} %{_bindir}/xxd %lang(af) %{_datadir}/%{name}/%{vimdir}/lang/af +%lang(am) %{_datadir}/%{name}/%{vimdir}/lang/am %lang(ca) %{_datadir}/%{name}/%{vimdir}/lang/ca %lang(cs) %{_datadir}/%{name}/%{vimdir}/lang/cs %lang(cs.cp1250) %{_datadir}/%{name}/%{vimdir}/lang/cs.cp1250 @@ -430,6 +414,10 @@ LC_ALL=en_US.UTF-8 make -j1 test || echo "Warning: Please check tests." %{_mandir}/man1/evim.* %changelog +* Thu Jan 16 2025 Funda Wang - 2:9.1.1019-1 +- update to 9.1 patchlevel 1019 +- disable check section as it hangs too long + * Fri Dec 13 2024 wangjiang - 2:9.1.0764-2 - fix tiny-Vim crashes with fuzzy buffer completion