From 2364c7989739fdf5915253b5fe1a4abe45663d046be82a160f71bc747b3b7b5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 23 May 2018 12:03:50 +0000 Subject: [PATCH] Accepting request 611530 from home:mimi_vx:branches:editors - update to 8.1 revision 0020 - refresh disable-unreliable-tests.patch vim-8.0-ttytype-test.patch - refresh vim73-no-static-libpython.patch - added: * term command - built in terminal window - fixes: * Using "gn" may select wrong text when wrapping. * Shell command completion has duplicates * Possible crash in term_wait() * qf_init_ext() is too long. * Using freed memory when changing terminal cursor color * maparg() and mapcheck() confuse empty and non-existing. * syn_id2cterm_bg() may be undefined. * :stopinsert changes the message position. * The netrw plugin does not work. ------------------------------------------------------------------ OBS-URL: https://build.opensuse.org/request/show/611530 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=495 --- disable-unreliable-tests.patch | 46 +++++++++++++++++---------------- vim-8.0-ttytype-test.patch | 18 ++++++------- vim-8.0.1568.tar.gz | 3 --- vim-8.1.0020.tar.gz | 3 +++ vim.changes | 19 ++++++++++++++ vim.spec | 6 ++--- vim73-no-static-libpython.patch | 18 ++++++------- 7 files changed, 67 insertions(+), 46 deletions(-) delete mode 100644 vim-8.0.1568.tar.gz create mode 100644 vim-8.1.0020.tar.gz diff --git a/disable-unreliable-tests.patch b/disable-unreliable-tests.patch index 6368d1a..72af046 100644 --- a/disable-unreliable-tests.patch +++ b/disable-unreliable-tests.patch @@ -1,8 +1,8 @@ -Index: vim-8.0.1358/src/testdir/test_alot.vim +Index: vim-8.1.0020/src/testdir/test_alot.vim =================================================================== ---- vim-8.0.1358.orig/src/testdir/test_alot.vim -+++ vim-8.0.1358/src/testdir/test_alot.vim -@@ -32,12 +32,10 @@ source test_join.vim +--- vim-8.1.0020.orig/src/testdir/test_alot.vim ++++ vim-8.1.0020/src/testdir/test_alot.vim +@@ -33,12 +33,10 @@ source test_join.vim source test_jumps.vim source test_lambda.vim source test_lispwords.vim @@ -15,7 +15,7 @@ Index: vim-8.0.1358/src/testdir/test_alot.vim source test_put.vim source test_recover.vim source test_reltime.vim -@@ -53,7 +51,6 @@ source test_tabpage.vim +@@ -54,7 +52,6 @@ source test_tabpage.vim source test_tagcase.vim source test_tagjump.vim source test_taglist.vim @@ -23,22 +23,24 @@ Index: vim-8.0.1358/src/testdir/test_alot.vim source test_true_false.vim source test_unlet.vim source test_virtualedit.vim -Index: vim-8.0.1358/src/testdir/Makefile +Index: vim-8.1.0020/src/testdir/Makefile =================================================================== ---- vim-8.0.1358.orig/src/testdir/Makefile -+++ vim-8.0.1358/src/testdir/Makefile -@@ -142,6 +142,3 @@ test_gui_init.res: test_gui_init.vim - @echo "$(RUN_GVIMTEST_WITH_GVIMRC)" >> vimcmd +--- vim-8.1.0020.orig/src/testdir/Makefile ++++ vim-8.1.0020/src/testdir/Makefile +@@ -144,8 +144,5 @@ test_gui_init.res: test_gui_init.vim $(RUN_VIMTEST) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $< @rm vimcmd -- + -opt_test.vim: ../option.c gen_opt_test.vim - $(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../option.c -Index: vim-8.0.1358/src/Makefile +- + test_xxd.res: + XXD=$(XXDPROG); export XXD; $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim test_xxd.vim +Index: vim-8.1.0020/src/Makefile =================================================================== ---- vim-8.0.1358.orig/src/Makefile -+++ vim-8.0.1358/src/Makefile -@@ -2225,7 +2225,6 @@ test_arglist \ +--- vim-8.1.0020.orig/src/Makefile ++++ vim-8.1.0020/src/Makefile +@@ -2243,7 +2243,6 @@ test_arglist \ test_netbeans \ test_normal \ test_number \ @@ -46,7 +48,7 @@ Index: vim-8.0.1358/src/Makefile test_packadd \ test_partial \ test_paste \ -@@ -2275,8 +2274,6 @@ test_arglist \ +@@ -2293,8 +2292,6 @@ test_arglist \ test_tagjump \ test_taglist \ test_tcl \ @@ -55,11 +57,11 @@ Index: vim-8.0.1358/src/Makefile test_textformat \ test_textobjects \ test_timers \ -Index: vim-8.0.1358/src/testdir/Make_all.mak +Index: vim-8.1.0020/src/testdir/Make_all.mak =================================================================== ---- vim-8.0.1358.orig/src/testdir/Make_all.mak -+++ vim-8.0.1358/src/testdir/Make_all.mak -@@ -138,7 +138,6 @@ NEW_TESTS = test_arabic.res \ +--- vim-8.1.0020.orig/src/testdir/Make_all.mak ++++ vim-8.1.0020/src/testdir/Make_all.mak +@@ -141,7 +141,6 @@ NEW_TESTS = test_arabic.res \ test_netbeans.res \ test_normal.res \ test_number.res \ @@ -67,7 +69,7 @@ Index: vim-8.0.1358/src/testdir/Make_all.mak test_packadd.res \ test_paste.res \ test_perl.res \ -@@ -168,8 +167,6 @@ NEW_TESTS = test_arabic.res \ +@@ -172,8 +171,6 @@ NEW_TESTS = test_arabic.res \ test_system.res \ test_tab.res \ test_tcl.res \ @@ -76,7 +78,7 @@ Index: vim-8.0.1358/src/testdir/Make_all.mak test_textformat.res \ test_textobjects.res \ test_undo.res \ -@@ -191,4 +188,3 @@ NEW_TESTS = test_arabic.res \ +@@ -197,4 +194,3 @@ NEW_TESTS = test_arabic.res \ # Explicit dependencies. test49.out: test49.vim diff --git a/vim-8.0-ttytype-test.patch b/vim-8.0-ttytype-test.patch index f758959..c9e8b35 100644 --- a/vim-8.0-ttytype-test.patch +++ b/vim-8.0-ttytype-test.patch @@ -1,21 +1,21 @@ -Index: vim-8.0.1358/src/testdir/test_options.vim +Index: vim-8.1.0020/src/testdir/test_options.vim =================================================================== ---- vim-8.0.1358.orig/src/testdir/test_options.vim -+++ vim-8.0.1358/src/testdir/test_options.vim +--- vim-8.1.0020.orig/src/testdir/test_options.vim ++++ vim-8.1.0020/src/testdir/test_options.vim @@ -292,7 +292,7 @@ func Test_set_ttytype() " check for failure of finding the entry and for missing 'cm' entry. try set ttytype=xxx -- call assert_report('set ttype=xxx did not fail') -+ "call assert_report('set ttype=xxx did not fail') +- call assert_report('set ttytype=xxx did not fail') ++ "call assert_report('set ttytype=xxx did not fail') catch /E522\|E437/ endtry -Index: vim-8.0.1358/src/testdir/test_startup.vim +Index: vim-8.1.0020/src/testdir/test_startup.vim =================================================================== ---- vim-8.0.1358.orig/src/testdir/test_startup.vim -+++ vim-8.0.1358/src/testdir/test_startup.vim -@@ -251,19 +251,6 @@ func Test_silent_ex_mode() +--- vim-8.1.0020.orig/src/testdir/test_startup.vim ++++ vim-8.1.0020/src/testdir/test_startup.vim +@@ -265,19 +265,6 @@ func Test_silent_ex_mode() call assert_notmatch('E315:', out) endfunc diff --git a/vim-8.0.1568.tar.gz b/vim-8.0.1568.tar.gz deleted file mode 100644 index d3a6567..0000000 --- a/vim-8.0.1568.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91607cfaae7c57b2763fbcfe77a4bbef26391d91b87fc8c375cc7cbea5825ebd -size 13519261 diff --git a/vim-8.1.0020.tar.gz b/vim-8.1.0020.tar.gz new file mode 100644 index 0000000..4a363b7 --- /dev/null +++ b/vim-8.1.0020.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cab8f5e6f6a430e1b4a767ea7d8b77ec264e068fe9bdc454b70a232fc0a365f +size 13646081 diff --git a/vim.changes b/vim.changes index 5c2de12..1ae2140 100644 --- a/vim.changes +++ b/vim.changes @@ -1,4 +1,23 @@ ------------------------------------------------------------------- +Wed May 23 10:15:50 UTC 2018 - mimi.vx@gmail.com + +- update to 8.1 revision 0020 +- refresh disable-unreliable-tests.patch vim-8.0-ttytype-test.patch +- refresh vim73-no-static-libpython.patch +- added: + * term command - built in terminal window +- fixes: + * Using "gn" may select wrong text when wrapping. + * Shell command completion has duplicates + * Possible crash in term_wait() + * qf_init_ext() is too long. + * Using freed memory when changing terminal cursor color + * maparg() and mapcheck() confuse empty and non-existing. + * syn_id2cterm_bg() may be undefined. + * :stopinsert changes the message position. + * The netrw plugin does not work. + +------------------------------------------------------------------ Wed Apr 4 00:00:57 UTC 2018 - stefan.bruens@rwth-aachen.de - Pre-convert gvim icons, otherwise building vim depends on diff --git a/vim.spec b/vim.spec index a958f35..4762205 100644 --- a/vim.spec +++ b/vim.spec @@ -16,10 +16,10 @@ # -%define pkg_version 8.0 -%define patchlevel 1568 +%define pkg_version 8.1 +%define patchlevel 0020 %define patchlevel_compact %{patchlevel} -%define VIM_SUBDIR vim80 +%define VIM_SUBDIR vim81 %define site_runtimepath %{_datadir}/vim/site %define make make VIMRCLOC=%{_sysconfdir} VIMRUNTIMEDIR=%{_datadir}/vim/current MAKE="make -e" %{?_smp_mflags} %bcond_without python2 diff --git a/vim73-no-static-libpython.patch b/vim73-no-static-libpython.patch index 9bf64b3..6e32867 100644 --- a/vim73-no-static-libpython.patch +++ b/vim73-no-static-libpython.patch @@ -1,13 +1,13 @@ -Index: vim-8.0.0092/src/configure.ac +Index: vim-8.1.0020/src/configure.ac =================================================================== ---- vim-8.0.0092.orig/src/configure.ac -+++ vim-8.0.0092/src/configure.ac -@@ -1203,7 +1203,7 @@ eof - if test "${vi_cv_var_python_version}" = "1.4"; then - vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a" - else -- vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" -+ vi_cv_path_python_plibs="-lpython${vi_cv_var_python_version}" +--- vim-8.1.0020.orig/src/configure.ac ++++ vim-8.1.0020/src/configure.ac +@@ -1252,7 +1252,7 @@ eof + vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python" fi + else +- vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" ++ vi_cv_path_python_plibs="-lpython${vi_cv_var_python_version}" dnl -- Check if the path contained in python_LINKFORSHARED is dnl usable for vim build. If not, make and try other + dnl candidates.