diff options
author | 2007-03-10 15:38:12 +0000 | |
---|---|---|
committer | 2007-03-10 15:38:12 +0000 | |
commit | 9bb29efe9f1cc9a2b7f483555f01a192b6a9c374 (patch) | |
tree | 3a0af46ced4f60eee8027b58cbd952389aab8c6d /www-client/elinks/files | |
parent | Added xfce-extra/xarchiver arj to p.use.mask (diff) | |
download | historical-9bb29efe9f1cc9a2b7f483555f01a192b6a9c374.tar.gz historical-9bb29efe9f1cc9a2b7f483555f01a192b6a9c374.tar.bz2 historical-9bb29efe9f1cc9a2b7f483555f01a192b6a9c374.zip |
Fix support for >Guile-1.6.8 and Lua 5.1.
Package-Manager: portage-2.1.2.2
Diffstat (limited to 'www-client/elinks/files')
-rw-r--r-- | www-client/elinks/files/elinks-0.11.2-lua-5.1.patch | 16 | ||||
-rw-r--r-- | www-client/elinks/files/elinks-0.11.2-lua-5.patch | 60 |
2 files changed, 76 insertions, 0 deletions
diff --git a/www-client/elinks/files/elinks-0.11.2-lua-5.1.patch b/www-client/elinks/files/elinks-0.11.2-lua-5.1.patch new file mode 100644 index 000000000000..20db8a484598 --- /dev/null +++ b/www-client/elinks/files/elinks-0.11.2-lua-5.1.patch @@ -0,0 +1,16 @@ +diff -Naurp elinks-0.11.2/src/scripting/lua/core.c elinks-0.11.2-lua/src/scripting/lua/core.c +--- elinks-0.11.2/src/scripting/lua/core.c 2006-11-19 14:46:37.000000000 +0100 ++++ elinks-0.11.2-lua/src/scripting/lua/core.c 2007-03-10 15:34:47.000000000 +0100 +@@ -646,11 +646,7 @@ init_lua(struct module *module) + { + L = lua_open(); + +- luaopen_base(L); +- luaopen_table(L); +- luaopen_io(L); +- luaopen_string(L); +- luaopen_math(L); ++ luaL_openlibs(L); + + lua_register(L, LUA_ALERT, l_alert); + lua_register(L, "current_url", l_current_url); diff --git a/www-client/elinks/files/elinks-0.11.2-lua-5.patch b/www-client/elinks/files/elinks-0.11.2-lua-5.patch new file mode 100644 index 000000000000..2b4bf611d8be --- /dev/null +++ b/www-client/elinks/files/elinks-0.11.2-lua-5.patch @@ -0,0 +1,60 @@ +diff -Naur elinks-0.11.1.orig/configure.in elinks-0.11.1/configure.in +--- elinks-0.11.1.orig/configure.in 2006-01-29 14:10:33.000000000 +0100 ++++ elinks-0.11.1/configure.in 2006-03-01 17:32:58.000000000 +0100 +@@ -739,7 +739,7 @@ + for luadir in "$withval" "" /usr /usr/local; do + for suffix in "" 50 51; do + if test "$cf_result" = no; then +- LUA_LIBS="-llua$suffix -llualib$suffix -lm" ++ LUA_LIBS="`pkg-config --libs lua`" + + if test ! -z "$luadir"; then + LUA_LIBS="-L$luadir/lib $LUA_LIBS" +@@ -754,10 +754,10 @@ + AC_TRY_LINK([ #include <lua.h> + #include <lualib.h>], + [ lua_State *L = lua_open(); +- lua_baselibopen(L); +- lua_mathlibopen(L); +- lua_strlibopen(L); +- lua_tablibopen(L); ++ luaopen_base(L); ++ luaopen_math(L); ++ luaopen_string(L); ++ luaopen_table(L); + lua_pushboolean(L, 1); + lua_close(L);], + cf_result=yes, cf_result=no) +diff -Naur elinks-0.11.1.orig/src/scripting/lua/core.c elinks-0.11.1/src/scripting/lua/core.c +--- elinks-0.11.1.orig/src/scripting/lua/core.c 2006-01-29 14:10:39.000000000 +0100 ++++ elinks-0.11.1/src/scripting/lua/core.c 2006-03-01 17:41:43.000000000 +0100 +@@ -633,7 +633,7 @@ + if (file_can_read(file)) { + int oldtop = lua_gettop(S); + +- if (lua_dofile(S, file) != 0) ++ if (luaL_dofile(S, file) != 0) + sleep(3); /* Let some time to see error messages. */ + lua_settop(S, oldtop); + } +@@ -755,7 +755,7 @@ + int oldtop = lua_gettop(L); + + if (prepare_lua(ses) == 0) { +- lua_dostring(L, expr); ++ luaL_dostring(L, expr); + lua_settop(L, oldtop); + finish_lua(); + } +diff -Naur elinks-0.11.1.orig/src/scripting/lua/hooks.c elinks-0.11.1/src/scripting/lua/hooks.c +--- elinks-0.11.1.orig/src/scripting/lua/hooks.c 2006-01-29 14:10:39.000000000 +0100 ++++ elinks-0.11.1/src/scripting/lua/hooks.c 2006-03-01 17:41:07.000000000 +0100 +@@ -200,7 +200,7 @@ + script_hook_quit(va_list ap, void *data) + { + if (!prepare_lua(NULL)) { +- lua_dostring(lua_state, "if quit_hook then quit_hook() end"); ++ luaL_dostring(lua_state, "if quit_hook then quit_hook() end"); + finish_lua(); + } + |