diff --git a/meson.build b/meson.build index ddddbb3f..f0614cc8 100644 --- a/meson.build +++ b/meson.build @@ -101,7 +101,7 @@ if not get_option('source-only') endforeach else lua_dep = dependency('', fallback: ['lua', 'lua_dep'], required : true, - default_options: default_fallback_options + ['default_library=static', 'line_editing=false', 'interpreter=false'] + default_options: default_fallback_options + ['default_library=static', 'line_editing=disabled', 'interpreter=false'] ) endif diff --git a/resources/include/lite_xl_plugin_api.h b/resources/include/lite_xl_plugin_api.h index 0c5e93e9..0f500059 100644 --- a/resources/include/lite_xl_plugin_api.h +++ b/resources/include/lite_xl_plugin_api.h @@ -31,9 +31,14 @@ * An example command would be: gcc -shared -o xxxxx.so xxxxx.c * You must not link to ANY lua library to avoid symbol collision. * - * This file contains stock configuration for a typical installation of Lua 5.4. + * This file contains stock configuration for a typical installation of Lua 5.4.6. * DO NOT MODIFY ANYTHING. MODIFYING STUFFS IN HERE WILL BREAK * COMPATIBILITY WITH LITE XL AND CAUSE UNDEBUGGABLE BUGS. + * + * For reference, here are a list of permalinks to previous version of this file that targets an older version of Lua. + * If you don't need functionalities offered by the new version, use the OLDEST FILE for backwards compatibility. + * + * - Lua 5.4.4: https://github.com/lite-xl/lite-xl/blob/397973067f14420b26e3b20a238a50016c0b75e2/resources/include/lite_xl_plugin_api.h **/ #ifndef LITE_XL_PLUGIN_API #define LITE_XL_PLUGIN_API @@ -1028,6 +1033,7 @@ extern const char lua_ident[]; SYMBOL_DECLARE(lua_State *, lua_newstate, lua_Alloc f, void *ud) SYMBOL_DECLARE(void, lua_close, lua_State *L) SYMBOL_DECLARE(lua_State *, lua_newthread, lua_State *L) +SYMBOL_DECLARE(int, lua_closethread, lua_State *L, lua_State *from) SYMBOL_DECLARE(int, lua_resetthread, lua_State *L) SYMBOL_DECLARE(lua_CFunction, lua_atpanic, lua_State *L, lua_CFunction panicf) @@ -1739,6 +1745,9 @@ SYMBOL_WRAP_DECL(void, lua_close, lua_State *L) { SYMBOL_WRAP_DECL(lua_State *, lua_newthread, lua_State *L) { return SYMBOL_WRAP_CALL(lua_newthread, L); } +SYMBOL_WRAP_DECL(int, lua_closethread, lua_State *L, lua_State *from) { + return SYMBOL_WRAP_CALL(lua_closethread, L, from); +} SYMBOL_WRAP_DECL(int, lua_resetthread, lua_State *L) { return SYMBOL_WRAP_CALL(lua_resetthread, L); } @@ -2351,6 +2360,7 @@ void lite_xl_plugin_init(void *XL) { IMPORT_SYMBOL(lua_newstate, lua_State *, lua_Alloc f, void *ud); IMPORT_SYMBOL(lua_close, void, lua_State *L); IMPORT_SYMBOL(lua_newthread, lua_State *, lua_State *L); + IMPORT_SYMBOL(lua_closethread, int, lua_State *L, lua_State *from); IMPORT_SYMBOL(lua_resetthread, int, lua_State *L); IMPORT_SYMBOL(lua_atpanic, lua_CFunction, lua_State *L, lua_CFunction panicf); IMPORT_SYMBOL(lua_version, lua_Number, lua_State *L); diff --git a/subprojects/lua.wrap b/subprojects/lua.wrap index 5a2d615b..16502616 100644 --- a/subprojects/lua.wrap +++ b/subprojects/lua.wrap @@ -1,12 +1,14 @@ [wrap-file] -directory = lua-5.4.4 -source_url = https://www.lua.org/ftp/lua-5.4.4.tar.gz -source_filename = lua-5.4.4.tar.gz -source_hash = 164c7849653b80ae67bec4b7473b884bf5cc8d2dca05653475ec2ed27b9ebf61 -patch_filename = lua_5.4.4-1_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/lua_5.4.4-1/get_patch -patch_hash = e61cd965c629d6543176f41a9f1cb9050edfd1566cf00ce768ff211086e40bdc +directory = lua-5.4.6 +source_url = https://www.lua.org/ftp/lua-5.4.6.tar.gz +source_filename = lua-5.4.6.tar.gz +source_hash = 7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88 +patch_filename = lua_5.4.6-3_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/lua_5.4.6-3/get_patch +patch_hash = 9b72a95422fd47f79f969d9abdb589ee95712d5512a5246f94e7e4f63d2cb7b7 +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/lua_5.4.6-3/lua-5.4.6.tar.gz +wrapdb_version = 5.4.6-3 [provide] lua-5.4 = lua_dep - +lua = lua_dep