Fix test error because lua update version 5.4.0
This commit is contained in:
parent
4a71359cd7
commit
14dd2dfe1a
56
Fix-vim-lua5.4.0-defines+luaL_typeerror-twice.patch
Normal file
56
Fix-vim-lua5.4.0-defines+luaL_typeerror-twice.patch
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
From ea3ebd50e2a4ec26ee503f352a1280e11e4af93b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Zdenek Dohnal <zdohnal@redhat.com>
|
||||||
|
Date: Tue, 14 Jul 2020 12:14:03 +0200
|
||||||
|
Subject: [PATCH] if_lua.c: new Lua 5.4.0 defines luaL_typeerror, so don't
|
||||||
|
define it twice
|
||||||
|
|
||||||
|
---
|
||||||
|
src/if_lua.c | 11 ++++++++++-
|
||||||
|
1 file changed, 10 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/if_lua.c b/src/if_lua.c
|
||||||
|
index 9b03c97..81faf92 100644
|
||||||
|
--- a/src/if_lua.c
|
||||||
|
+++ b/src/if_lua.c
|
||||||
|
@@ -109,6 +109,9 @@ static luaV_Funcref *luaV_pushfuncref(lua_State *L, char_u *name);
|
||||||
|
#define luaL_loadbufferx dll_luaL_loadbufferx
|
||||||
|
#define luaL_argerror dll_luaL_argerror
|
||||||
|
#endif
|
||||||
|
+#if LUA_VERSION_NUM >= 504
|
||||||
|
+#define luaL_typeerror dll_luaL_typeerror
|
||||||
|
+#endif
|
||||||
|
#define luaL_checkany dll_luaL_checkany
|
||||||
|
#define luaL_checklstring dll_luaL_checklstring
|
||||||
|
#define luaL_checkinteger dll_luaL_checkinteger
|
||||||
|
@@ -203,6 +206,9 @@ int (*dll_luaL_loadfilex) (lua_State *L, const char *filename, const char *mode)
|
||||||
|
int (*dll_luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz, const char *name, const char *mode);
|
||||||
|
int (*dll_luaL_argerror) (lua_State *L, int numarg, const char *extramsg);
|
||||||
|
#endif
|
||||||
|
+#if LUA_VERSION_NUM >= 504
|
||||||
|
+int (*dll_luaL_typeerror) (lua_State *L, int narg, const char *tname);
|
||||||
|
+#endif
|
||||||
|
void (*dll_luaL_checkany) (lua_State *L, int narg);
|
||||||
|
const char *(*dll_luaL_checklstring) (lua_State *L, int numArg, size_t *l);
|
||||||
|
lua_Integer (*dll_luaL_checkinteger) (lua_State *L, int numArg);
|
||||||
|
@@ -314,6 +320,9 @@ static const luaV_Reg luaV_dll[] = {
|
||||||
|
{"luaL_loadfilex", (luaV_function) &dll_luaL_loadfilex},
|
||||||
|
{"luaL_loadbufferx", (luaV_function) &dll_luaL_loadbufferx},
|
||||||
|
{"luaL_argerror", (luaV_function) &dll_luaL_argerror},
|
||||||
|
+#endif
|
||||||
|
+#if LUA_VERSION_NUM >= 504
|
||||||
|
+ {"luaL_typeerror", (luaV_function) &dll_luaL_typeerror},
|
||||||
|
#endif
|
||||||
|
{"luaL_checkany", (luaV_function) &dll_luaL_checkany},
|
||||||
|
{"luaL_checklstring", (luaV_function) &dll_luaL_checklstring},
|
||||||
|
@@ -443,7 +452,7 @@ lua_enabled(int verbose)
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#if LUA_VERSION_NUM > 501
|
||||||
|
+#if LUA_VERSION_NUM > 501 && LUA_VERSION_NUM < 504
|
||||||
|
static int
|
||||||
|
luaL_typeerror(lua_State *L, int narg, const char *tname)
|
||||||
|
{
|
||||||
|
--
|
||||||
|
2.23.0
|
||||||
|
|
||||||
9
vim.spec
9
vim.spec
@ -12,7 +12,7 @@
|
|||||||
Name: vim
|
Name: vim
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
Version: 8.2
|
Version: 8.2
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: Vim is a highly configurable text editor for efficiently creating and changing any kind of text.
|
Summary: Vim is a highly configurable text editor for efficiently creating and changing any kind of text.
|
||||||
License: Vim and MIT
|
License: Vim and MIT
|
||||||
URL: http://www.vim.org
|
URL: http://www.vim.org
|
||||||
@ -32,6 +32,7 @@ Patch0009: vim-7.4-globalsyntax.patch
|
|||||||
Patch0010: vim-7.4-releasestring-1318991.patch
|
Patch0010: vim-7.4-releasestring-1318991.patch
|
||||||
Patch0011: vim-8.0-copy-paste.patch
|
Patch0011: vim-8.0-copy-paste.patch
|
||||||
Patch0012: vim-python3-tests.patch
|
Patch0012: vim-python3-tests.patch
|
||||||
|
Patch0013: Fix-vim-lua5.4.0-defines+luaL_typeerror-twice.patch
|
||||||
|
|
||||||
Patch9000: bugfix-rm-modify-info-version.patch
|
Patch9000: bugfix-rm-modify-info-version.patch
|
||||||
|
|
||||||
@ -420,6 +421,12 @@ popd
|
|||||||
%{_mandir}/man1/evim.*
|
%{_mandir}/man1/evim.*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Aug 7 2020 wenzhanli<wenzhanli2@huawei.com> - 2:8.2-3
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:Fix make test because lua update version 5.4.0
|
||||||
|
|
||||||
* Mon Jun 15 2020 chengquan<chengquan3@huawei.com> -2:8.2-2
|
* Mon Jun 15 2020 chengquan<chengquan3@huawei.com> -2:8.2-2
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user