pool/vim
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 622530 from editors

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/622530
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vim?expand=0&rev=213
This commit is contained in:
Dominique Leuenberger 2018-07-17 07:39:43 +00:00 committed by Git OBS Bridge
commit 1784c0e243
12 changed files with 221 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
disable-unreliable-tests.patch
View File

@ -1,7 +1,7 @@
Index: vim-8.1.0020/src/testdir/test_alot.vim
Index: vim-8.1.0178/src/testdir/test_alot.vim
===================================================================
--- vim-8.1.0020.orig/src/testdir/test_alot.vim
+++ vim-8.1.0020/src/testdir/test_alot.vim
--- vim-8.1.0178.orig/src/testdir/test_alot.vim
+++ vim-8.1.0178/src/testdir/test_alot.vim
@@ -33,12 +33,10 @@ source test_join.vim
source test_jumps.vim
source test_lambda.vim
@ -23,10 +23,10 @@ Index: vim-8.1.0020/src/testdir/test_alot.vim
source test_true_false.vim
source test_unlet.vim
source test_virtualedit.vim
Index: vim-8.1.0020/src/testdir/Makefile
Index: vim-8.1.0178/src/testdir/Makefile
===================================================================
--- vim-8.1.0020.orig/src/testdir/Makefile
+++ vim-8.1.0020/src/testdir/Makefile
--- vim-8.1.0178.orig/src/testdir/Makefile
+++ vim-8.1.0178/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
@ -36,32 +36,11 @@ Index: vim-8.1.0020/src/testdir/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
Index: vim-8.1.0178/src/testdir/Make_all.mak
===================================================================
--- 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 \
- test_options \
test_packadd \
test_partial \
test_paste \
@@ -2293,8 +2292,6 @@ test_arglist \
test_tagjump \
test_taglist \
test_tcl \
- test_terminal \
- test_terminal_fail \
test_textformat \
test_textobjects \
test_timers \
Index: vim-8.1.0020/src/testdir/Make_all.mak
===================================================================
--- 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 \
--- vim-8.1.0178.orig/src/testdir/Make_all.mak
+++ vim-8.1.0178/src/testdir/Make_all.mak
@@ -140,7 +140,6 @@ NEW_TESTS = test_arabic.res \
test_netbeans.res \
test_normal.res \
test_number.res \
@ -78,7 +57,7 @@ Index: vim-8.1.0020/src/testdir/Make_all.mak
test_textformat.res \
test_textobjects.res \
test_undo.res \
@@ -197,4 +194,3 @@ NEW_TESTS = test_arabic.res \
@@ -198,4 +195,3 @@ NEW_TESTS = test_arabic.res \
# Explicit dependencies.
test49.out: test49.vim

101
u_lua53_on_32bit.patch Normal file
View File

@ -0,0 +1,101 @@
From 856aeb0d94f88d93fe1753c02b51ad57edc2f8c5 Mon Sep 17 00:00:00 2001
From: "K.Takata" <kentkt@csc.jp>
Date: Thu, 5 Jul 2018 23:22:47 +0900
Subject: [PATCH 1/2] if_lua: Fix coding style
---
src/if_lua.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/if_lua.c b/src/if_lua.c
index df0ef34545..1e3208c862 100644
--- a/src/if_lua.c
+++ b/src/if_lua.c
@@ -960,7 +960,8 @@ luaV_dict_newindex(lua_State *L)
luaL_error(L, "dict is locked");
if (key != NULL && *key == NUL)
luaL_error(L, "empty key");
- if (!lua_isnil(L, 3)) { /* read value? */
+ if (!lua_isnil(L, 3)) /* read value? */
+ {
luaV_checktypval(L, 3, &v, "setting dict item");
if (d->dv_scope == VAR_DEF_SCOPE && v.v_type == VAR_FUNC)
luaL_error(L, "cannot assign funcref to builtin scope");
@@ -1066,7 +1067,8 @@ luaV_funcref_call(lua_State *L)
f->args.vval.v_list = list_alloc();
rettv.v_type = VAR_UNKNOWN; /* as in clear_tv */
- for (i = 0; i < n; i++) {
+ for (i = 0; i < n; i++)
+ {
luaV_checktypval(L, i + 2, &v, "calling funcref");
list_append_tv(f->args.vval.v_list, &v);
}
@@ -1519,13 +1521,16 @@ luaV_list(lua_State *L)
else
{
luaV_newlist(L, l);
- if (initarg) { /* traverse table to init dict */
+ if (initarg) /* traverse table to init list */
+ {
int notnil, i = 0;
typval_T v;
- do {
+ do
+ {
lua_rawgeti(L, 1, ++i);
notnil = !lua_isnil(L, -1);
- if (notnil) {
+ if (notnil)
+ {
luaV_checktypval(L, -1, &v, "vim.list");
list_append_tv(l, &v);
}
@@ -1564,7 +1569,8 @@ luaV_dict(lua_State *L)
luaL_error(L, "table has empty key");
luaV_checktypval(L, -2, &v, "vim.dict"); /* value */
di = dictitem_alloc(key);
- if (di == NULL || dict_add(d, di) == FAIL) {
+ if (di == NULL || dict_add(d, di) == FAIL)
+ {
vim_free(di);
lua_pushnil(L);
return 1;
From 7664e9060a6921f248c917e78ad6f4f19e9774b3 Mon Sep 17 00:00:00 2001
From: "K.Takata" <kentkt@csc.jp>
Date: Thu, 5 Jul 2018 23:23:33 +0900
Subject: [PATCH 2/2] if_lua: Fix Lua 5.3 on 32-bit systems
---
src/if_lua.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/if_lua.c b/src/if_lua.c
index 1e3208c862..e30680941c 100644
--- a/src/if_lua.c
+++ b/src/if_lua.c
@@ -253,14 +253,23 @@ void (*dll_lua_pushcclosure) (lua_State *L, lua_CFunction fn, int n);
void (*dll_lua_pushboolean) (lua_State *L, int b);
void (*dll_lua_pushlightuserdata) (lua_State *L, void *p);
void (*dll_lua_getfield) (lua_State *L, int idx, const char *k);
+#if LUA_VERSION_NUM <= 502
void (*dll_lua_rawget) (lua_State *L, int idx);
void (*dll_lua_rawgeti) (lua_State *L, int idx, int n);
+#else
+int (*dll_lua_rawget) (lua_State *L, int idx);
+int (*dll_lua_rawgeti) (lua_State *L, int idx, lua_Integer n);
+#endif
void (*dll_lua_createtable) (lua_State *L, int narr, int nrec);
void *(*dll_lua_newuserdata) (lua_State *L, size_t sz);
int (*dll_lua_getmetatable) (lua_State *L, int objindex);
void (*dll_lua_setfield) (lua_State *L, int idx, const char *k);
void (*dll_lua_rawset) (lua_State *L, int idx);
+#if LUA_VERSION_NUM <= 502
void (*dll_lua_rawseti) (lua_State *L, int idx, int n);
+#else
+void (*dll_lua_rawseti) (lua_State *L, int idx, lua_Integer n);
+#endif
int (*dll_lua_setmetatable) (lua_State *L, int objindex);
int (*dll_lua_next) (lua_State *L, int idx);
/* libs */

12
vim-7.3-filetype_changes.patch
View File

@ -1,8 +1,8 @@
Index: vim-8.0.0000/runtime/filetype.vim
Index: vim-8.1.0178/runtime/filetype.vim
===================================================================
--- vim-8.0.0000.orig/runtime/filetype.vim
+++ vim-8.0.0000/runtime/filetype.vim
@@ -414,6 +414,9 @@ au BufNewFile,BufRead *.css setf css
--- vim-8.1.0178.orig/runtime/filetype.vim
+++ vim-8.1.0178/runtime/filetype.vim
@@ -311,6 +311,9 @@ au BufNewFile,BufRead *.css setf css
" Century Term Command Scripts (*.cmd too)
au BufNewFile,BufRead *.con setf cterm
@ -12,10 +12,10 @@ Index: vim-8.0.0000/runtime/filetype.vim
" Changelog
au BufNewFile,BufRead changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch
\ setf debchangelog
Index: vim-8.0.0000/runtime/syntax/changes.vim
Index: vim-8.1.0178/runtime/syntax/changes.vim
===================================================================
--- /dev/null
+++ vim-8.0.0000/runtime/syntax/changes.vim
+++ vim-8.1.0178/runtime/syntax/changes.vim
@@ -0,0 +1,41 @@
+" Vim syntax file
+" Filename: changes.vim

12
vim-7.3-filetype_ftl.patch
View File

@ -1,8 +1,8 @@
Index: vim-8.0.0000/runtime/filetype.vim
Index: vim-8.1.0178/runtime/filetype.vim
===================================================================
--- vim-8.0.0000.orig/runtime/filetype.vim
+++ vim-8.0.0000/runtime/filetype.vim
@@ -2770,3 +2770,7 @@ endfunc
--- vim-8.1.0178.orig/runtime/filetype.vim
+++ vim-8.1.0178/runtime/filetype.vim
@@ -2150,3 +2150,7 @@ endfunc
" Restore 'cpoptions'
let &cpo = s:cpo_save
unlet s:cpo_save
@ -10,10 +10,10 @@ Index: vim-8.0.0000/runtime/filetype.vim
+" FreeMarker templates
+au BufNewFile,BufRead *.ftl setf ftl
+
Index: vim-8.0.0000/runtime/syntax/ftl.vim
Index: vim-8.1.0178/runtime/syntax/ftl.vim
===================================================================
--- /dev/null
+++ vim-8.0.0000/runtime/syntax/ftl.vim
+++ vim-8.1.0178/runtime/syntax/ftl.vim
@@ -0,0 +1,36 @@
+" Vim syntax file
+" Language: FreeMarker Template Language (FTL)

14
vim-7.3-filetype_spec.patch
View File

@ -1,8 +1,8 @@
Index: vim-8.0.1358/runtime/filetype.vim
Index: vim-8.1.0178/runtime/filetype.vim
===================================================================
--- vim-8.0.1358.orig/runtime/filetype.vim
+++ vim-8.0.1358/runtime/filetype.vim
@@ -1543,7 +1543,7 @@ au BufNewFile,BufRead *.hog,snort.conf,v
--- vim-8.1.0178.orig/runtime/filetype.vim
+++ vim-8.1.0178/runtime/filetype.vim
@@ -1556,7 +1556,7 @@ au BufNewFile,BufRead *.hog,snort.conf,v
au BufNewFile,BufRead *.rules call dist#ft#FTRules()
" Spec (Linux RPM)
@ -11,10 +11,10 @@ Index: vim-8.0.1358/runtime/filetype.vim
" Speedup (AspenTech plant simulator)
au BufNewFile,BufRead *.speedup,*.spdata,*.spd setf spup
Index: vim-8.0.1358/runtime/syntax/spec.vim
Index: vim-8.1.0178/runtime/syntax/spec.vim
===================================================================
--- vim-8.0.1358.orig/runtime/syntax/spec.vim
+++ vim-8.0.1358/runtime/syntax/spec.vim
--- vim-8.1.0178.orig/runtime/syntax/spec.vim
+++ vim-8.1.0178/runtime/syntax/spec.vim
@@ -102,7 +102,7 @@ syn case ignore
"%% PreAmble Section %%
"Copyright and Serial were deprecated by License and Epoch

8
vim-7.3-help_tags.patch
View File

@ -1,8 +1,8 @@
Index: vim-8.0.0000/runtime/doc/Makefile
Index: vim-8.1.0178/runtime/doc/Makefile
===================================================================
--- vim-8.0.0000.orig/runtime/doc/Makefile
+++ vim-8.0.0000/runtime/doc/Makefile
@@ -313,6 +313,7 @@ all: tags vim.man evim.man vimdiff.man v
--- vim-8.1.0178.orig/runtime/doc/Makefile
+++ vim-8.1.0178/runtime/doc/Makefile
@@ -317,6 +317,7 @@ all: tags vim.man evim.man vimdiff.man v
# Use Vim to generate the tags file. Can only be used when Vim has been
# compiled and installed. Supports multiple languages.
vimtags: $(DOCS)

8
vim-7.3-name_vimrc.patch
View File

@ -1,8 +1,8 @@
Index: vim-8.0.0000/src/feature.h
Index: vim-8.1.0178/src/feature.h
===================================================================
--- vim-8.0.0000.orig/src/feature.h
+++ vim-8.0.0000/src/feature.h
@@ -934,12 +934,13 @@
--- vim-8.1.0178.orig/src/feature.h
+++ vim-8.1.0178/src/feature.h
@@ -917,12 +917,13 @@
* SYS_VIMRC_FILE Name of the system-wide .vimrc file.
*/
/* #define SYS_VIMRC_FILE "/etc/vimrc" */

8
vim-7.4-filetype_apparmor.patch
View File

@ -1,8 +1,8 @@
Index: vim-8.0.0000/runtime/filetype.vim
Index: vim-8.1.0178/runtime/filetype.vim
===================================================================
--- vim-8.0.0000.orig/runtime/filetype.vim
+++ vim-8.0.0000/runtime/filetype.vim
@@ -115,6 +115,10 @@ au BufNewFile,BufRead proftpd.conf* cal
--- vim-8.1.0178.orig/runtime/filetype.vim
+++ vim-8.1.0178/runtime/filetype.vim
@@ -98,6 +98,10 @@ au BufNewFile,BufRead proftpd.conf* cal
" Apache config file
au BufNewFile,BufRead .htaccess,*/etc/httpd/*.conf setf apache

3
vim-8.1.0115.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6af39d4c9ca042e928a3d7d1cb86427803f53153158401c7d635a1e8f1712409
size 13722407

3
vim-8.1.0179.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:45f9bb4bee5d75d60caad45c9f5707cd2c1f6a202eb8c343b89f0acf8b369b2e
size 13755618

61
vim.changes
View File

@ -1,3 +1,64 @@
-------------------------------------------------------------------
Fri Jul 13 14:10:46 UTC 2018 - mimi.vx@gmail.com
- update to 8.1.0179
- add u_lua53_on_32bit.patch - fix lua53 support on 32bit
* Redundant condition for boundary check
-------------------------------------------------------------------
Thu Jul 12 20:01:14 UTC 2018 - mimi.vx@gmail.com
- update to 8.1 revision 8.1.0178
- refresh disable-unreliable-tests.patch
vim-7.3-filetype_changes.patch
vim-7.3-filetype_ftl.patch
vim-7.3-filetype_spec.patch
vim-7.3-help_tags.patch
vim-7.3-name_vimrc.patch
vim-7.4-filetype_apparmor.patch
* Warning for passing pointer to non-pointer argument.
* Overlapping string argument for strcpy().
* Marks test fails in very wide window
* After paging up and down fold line is wrong.
* 'viminfofile' option does not behave like a file name.
* Typing CTRL-W n in a terminal window causes ml_get error.
* Invalid memory use with complicated pattern.
* Calling message_filtered() a bit too often.
* output of :marks is too short with multi-byte chars
* lock flag in new dictitem is reset in many places
* using dict_add_nr_str() is clumsy
* :clist output can be very long.
* luaeval('vim.buffer().name') returns an error.
* Danish and German man pages are not installed.
* Buffer not updated with 'autoread' set if file was deleted.
* completion for user names does not work for a prefix.
* GUI: input() fails if CTRL-C was pressed before
* Evim.man missing from the distribution.
* Crash with "set smarttab shiftwidth=0 softtabstop=-1".
* Build with SHADOWDIR fails.
* session is wrong with multiple tabs when :lcd was used
* Memory leak when using :tcl expr command.
* Compiler warning when building with Python 3.7.
* Matchit and matchparen don't handle E363.
* Xterm and vt320 builtin termcap missing keypad keys.
* cexpr no longer jumps to the first error.
* Recording into a register has focus events.
* Negative value of 'softtabstop' not used correctly.
* Undo message delays screen update for CTRL-O u.
* Lua interface does not support funcref.
* tagfiles() can have duplicate entries
* ":profdel func" does not work if func was called already
* still some xterm-like terminals get a stray "p"
* Build failure when disabling the session feature.
* Various problems with 'vartabstop'.
* Virtual edit replace with multi-byte fails at end of line.
* has('vcon') returns true even for non-win32 terminal.
* Crash when using ballooneval related to 'vartabstop'.
* Buffer 'modified' set even when :sort has no changes.
* Duplicate error message for put command.
* URL in install program still points to SourceForge.
* display problem with 'vartabstop' and 'linebreak'
-------------------------------------------------------------------
Mon Jun 25 10:32:38 UTC 2018 - mimi.vx@gmail.com

15
vim.spec
View File

@ -17,7 +17,7 @@
%define pkg_version 8.1
%define patchlevel 0115
%define patchlevel 0179
%define patchlevel_compact %{patchlevel}
%define VIM_SUBDIR vim81
%define site_runtimepath %{_datadir}/vim/site
@ -66,6 +66,8 @@ Patch23: vim-8.0-ttytype-test.patch
Patch24: disable-unreliable-tests.patch
Patch100: vim73-no-static-libpython.patch
Patch101: vim-8.0.1568-defaults.patch
# Patch-FIX-Upstream: Fix build with lua-5.3 on 32bit platforms gh#3157
Patch102: u_lua53_on_32bit.patch
BuildRequires: autoconf
BuildRequires: db-devel
BuildRequires: fdupes
@ -170,6 +172,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
%patch24 -p1
%patch100 -p1
%patch101 -p1
%patch102 -p1
cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} .
# Unreliable tests
@ -323,6 +326,10 @@ rm -rf %{buildroot}%{_mandir}/pl.UTF-8/
rm -rf %{buildroot}%{_mandir}/ru.KOI8-R/
rm -rf %{buildroot}%{_mandir}/it.ISO8859-1/
rm -rf %{buildroot}%{_mandir}/it.UTF-8/
rm -rf %{buildroot}%{_mandir}/da.UTF-8/
rm -rf %{buildroot}%{_mandir}/de.UTF-8/
rm -rf %{buildroot}%{_mandir}/da.ISO8859-1/
rm -rf %{buildroot}%{_mandir}/de.ISO8859-1/
# remove unnecessary files
rm -rf %{buildroot}%{_datadir}/applications/vim.desktop
@ -401,6 +408,12 @@ fi
%{_bindir}/xxd
# man pages
%{_mandir}/man1/*
%dir %{_mandir}/da
%dir %{_mandir}/da/man1/
%{_mandir}/da/man1/*
%dir %{_mandir}/de
%dir %{_mandir}/de/man1/
%{_mandir}/de/man1/*
%dir %{_mandir}/fr
%dir %{_mandir}/fr/man1/
%{_mandir}/fr/man1/*