From 3753d0ad67ab511af3dac400f8bb0a746a9d0961 Mon Sep 17 00:00:00 2001 From: Alfredo Jose Fernandes Palhares Date: Sun, 18 May 2014 23:50:10 +0100 Subject: [PATCH 1/4] Ignore temporary files. --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index ac39835..7fbd5b4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,8 @@ lualock apidocs/ apidocs/* + +# Temporary files +*swp +*swo +*~ From 5712925d70563495a0cbe85962ffc3af8c17edc0 Mon Sep 17 00:00:00 2001 From: Alfredo Jose Fernandes Palhares Date: Sun, 18 May 2014 23:50:48 +0100 Subject: [PATCH 2/4] luaL_reg was deprecated since Lua 5.1. Its luaL_Reg now. --- clib/cairo_surface.c | 2 +- clib/hook.c | 2 +- clib/image.c | 2 +- clib/timer.c | 2 +- clib/utils.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clib/cairo_surface.c b/clib/cairo_surface.c index d2b5e45..fa8aa09 100644 --- a/clib/cairo_surface.c +++ b/clib/cairo_surface.c @@ -52,7 +52,7 @@ static gint lualock_lua_cairo_surface_resize(lua_State *L) { } void lualock_lua_cairo_surface_init(lua_State *L) { - const struct luaL_reg lualock_cairo_surface_lib[] = + const struct luaL_Reg lualock_cairo_surface_lib[] = { { "show", lualock_lua_cairo_surface_show }, { "get_surface", lualock_lua_cairo_surface_get_surface }, diff --git a/clib/hook.c b/clib/hook.c index c5daa93..c771bb7 100644 --- a/clib/hook.c +++ b/clib/hook.c @@ -55,7 +55,7 @@ static gint lualock_lua_hook_connect(lua_State *L) { } void lualock_lua_hook_init(lua_State *L) { - const struct luaL_reg lualock_hook_lib[] = { + const struct luaL_Reg lualock_hook_lib[] = { { "connect", lualock_lua_hook_connect }, { NULL, NULL } }; diff --git a/clib/image.c b/clib/image.c index 73b0473..727fdd6 100644 --- a/clib/image.c +++ b/clib/image.c @@ -240,7 +240,7 @@ static gint lualock_lua_image_get_surface(lua_State *L) { } void lualock_lua_image_init(lua_State *L) { - const struct luaL_reg lualock_image_lib[] = + const struct luaL_Reg lualock_image_lib[] = { { "show", lualock_lua_image_show }, { "hide", lualock_lua_image_hide }, diff --git a/clib/timer.c b/clib/timer.c index a9d8b09..eebe5a9 100644 --- a/clib/timer.c +++ b/clib/timer.c @@ -88,7 +88,7 @@ static gint lualock_lua_timer_stop(lua_State *L) { } void lualock_lua_timer_init(lua_State *L) { - const struct luaL_reg lualock_timer_lib[] = { + const struct luaL_Reg lualock_timer_lib[] = { { "start", lualock_lua_timer_start }, { "stop", lualock_lua_timer_stop }, { NULL, NULL } diff --git a/clib/utils.c b/clib/utils.c index ff03a2a..f0cbd60 100644 --- a/clib/utils.c +++ b/clib/utils.c @@ -91,7 +91,7 @@ static gint lualock_lua_parse_color(lua_State *L) { } void lualock_lua_utils_init(lua_State *L) { - const struct luaL_reg lualock_utils_lib[] = { + const struct luaL_Reg lualock_utils_lib[] = { { "spawn", lualock_lua_spawn }, { "get_data_dir", lualock_lua_get_data_dir }, { "get_config_dir", lualock_lua_get_config_dir }, From 329bc339c3536945f0c2f68f6ef1abafd3451d07 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Mon, 19 May 2014 09:11:06 +0100 Subject: [PATCH 3/4] Force COMPAT_MODE. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f5e6a1f..96d5147 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ PKGS := gtk+-3.0 lua oocairo xscrnsaver x11 INCS := $(shell pkg-config --cflags $(PKGS)) LIBS := $(shell pkg-config --libs $(PKGS)) -lpam -CFLAGS := -Wall -Wextra -std=gnu99 -I. $(INCS) $(CFLAGS) +CFLAGS := -Wall -Wextra -std=gnu99 -I. $(INCS) -D LUA_COMPAT_MODULE $(CFLAGS) CPPFLAGS := -DLUALOCK_INSTALL_DIR=\"$(INSTALLDIR)/share/lualock\" \ -DLUALOCK_DATA_DIR=\"$(INSTALLDIR)/share/lualock/data\" $(CPPFLAGS) DEBUG := -g -DDEBUG From 734b8949d534ddaea125be47e84f98168eb27079 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Mon, 19 May 2014 09:14:57 +0100 Subject: [PATCH 4/4] Lua 5.2 very dodgy intial porting. Masterkorp monday mornings style. Also fuck the Archlinux liblua packager for not adding respecting compat_mode. --- clib/cairo_surface.c | 1 + clib/hook.c | 1 + clib/image.c | 2 +- clib/timer.c | 1 + clib/utils.c | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/clib/cairo_surface.c b/clib/cairo_surface.c index fa8aa09..f513f0f 100644 --- a/clib/cairo_surface.c +++ b/clib/cairo_surface.c @@ -1,3 +1,4 @@ +#define luaL_register(L,n,l) (luaL_openlib(L,(n),(l),0)) #include #include diff --git a/clib/hook.c b/clib/hook.c index c771bb7..84f5757 100644 --- a/clib/hook.c +++ b/clib/hook.c @@ -16,6 +16,7 @@ // MA 02110-1301, USA. // +#define luaL_register(L,n,l) (luaL_openlib(L,(n),(l),0)) #include #include diff --git a/clib/image.c b/clib/image.c index 727fdd6..9e37e67 100644 --- a/clib/image.c +++ b/clib/image.c @@ -258,7 +258,7 @@ void lualock_lua_image_init(lua_State *L) { lua_pushvalue(L, -1); lua_setfield(L, -2, "__index"); - luaL_register(L, NULL, lualock_image_lib); + luaL_setfuncs(L, lualock_image_lib, 0); lua_register(L, "image", lualock_lua_image_new); lua_pop(L, 1); } diff --git a/clib/timer.c b/clib/timer.c index eebe5a9..0501c8d 100644 --- a/clib/timer.c +++ b/clib/timer.c @@ -16,6 +16,7 @@ // MA 02110-1301, USA. // +#define luaL_register(L,n,l) (luaL_openlib(L,(n),(l),0)) #include #include #include diff --git a/clib/utils.c b/clib/utils.c index f0cbd60..f170777 100644 --- a/clib/utils.c +++ b/clib/utils.c @@ -1,3 +1,4 @@ +#define luaL_register(L,n,l) (luaL_openlib(L,(n),(l),0)) #include #include #include