diff options
author | obache <obache> | 2013-10-27 13:01:33 +0000 |
---|---|---|
committer | obache <obache> | 2013-10-27 13:01:33 +0000 |
commit | 849607760a70a1e7bbdb8180607471263d2f4e35 (patch) | |
tree | f54995429b9b66f627d49bc1e396a066b9d6d83c /databases/lua-tokyocabinet/patches | |
parent | e4af9ef2d8d48a0842f33b4ec9e7d724b65858ca (diff) | |
download | pkgsrc-849607760a70a1e7bbdb8180607471263d2f4e35.tar.gz |
Update lua-tokyocabinet to 1.10, with lua-5.2 fixes.
Diffstat (limited to 'databases/lua-tokyocabinet/patches')
-rw-r--r-- | databases/lua-tokyocabinet/patches/patch-ab | 6 | ||||
-rw-r--r-- | databases/lua-tokyocabinet/patches/patch-tokyocabinet.c | 102 |
2 files changed, 105 insertions, 3 deletions
diff --git a/databases/lua-tokyocabinet/patches/patch-ab b/databases/lua-tokyocabinet/patches/patch-ab index 34d1e938813..901444ba789 100644 --- a/databases/lua-tokyocabinet/patches/patch-ab +++ b/databases/lua-tokyocabinet/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2009/05/24 12:37:36 obache Exp $ +$NetBSD: patch-ab,v 1.3 2013/10/27 13:01:33 obache Exp $ ---- configure.orig 2009-05-15 06:33:40.000000000 +0000 +--- configure.orig 2010-09-19 23:13:57.000000000 +0000 +++ configure -@@ -1790,16 +1790,13 @@ MYCOMMANDFILES="tcutest.lua tchtest.lua +@@ -2000,16 +2000,13 @@ MYCOMMANDFILES="tcutest.lua tchtest.lua MYLUALIBDIR="" # Building flags diff --git a/databases/lua-tokyocabinet/patches/patch-tokyocabinet.c b/databases/lua-tokyocabinet/patches/patch-tokyocabinet.c new file mode 100644 index 00000000000..ebcbf799094 --- /dev/null +++ b/databases/lua-tokyocabinet/patches/patch-tokyocabinet.c @@ -0,0 +1,102 @@ +$NetBSD: patch-tokyocabinet.c,v 1.1 2013/10/27 13:01:33 obache Exp $ + +* Lua 5.2 API change + +--- tokyocabinet.c.orig 2010-09-19 23:14:07.000000000 +0000 ++++ tokyocabinet.c +@@ -369,7 +369,7 @@ int luaopen_tokyocabinet(lua_State *lua) + + /* convert a table of Lua into a list object of TC */ + static TCLIST *tabletotclist(lua_State *lua, int index){ +- int len = lua_objlen(lua, index); ++ int len = lua_rawlen(lua, index); + TCLIST *list = tclistnew2(len); + for(int i = 1; i <= len; i++){ + lua_rawgeti(lua, index, i); +@@ -536,7 +536,7 @@ static int util_pack(lua_State *lua){ + lua_rawseti(lua, aidx, eidx++); + break; + case LUA_TTABLE: +- len = lua_objlen(lua, i); ++ len = lua_rawlen(lua, i); + for(int j = 1; j <= len; j++){ + lua_rawgeti(lua, i, j); + lua_rawseti(lua, aidx, eidx++); +@@ -1200,7 +1200,7 @@ static int util_ucs(lua_State *lua){ + lua_error(lua); + } + if(lua_type(lua, 1) == LUA_TTABLE){ +- int anum = lua_objlen(lua, 1); ++ int anum = lua_rawlen(lua, 1); + uint16_t *ary = tcmalloc(sizeof(*ary) * anum + 1); + for(int i = 1; i <= anum; i++){ + lua_rawgeti(lua, 1, i); +@@ -1260,7 +1260,7 @@ static int util_dist(lua_State *lua){ + static int util_isect(lua_State *lua){ + int argc = lua_gettop(lua); + if(argc == 1 && lua_type(lua, 1) == LUA_TTABLE){ +- int len = lua_objlen(lua, 1); ++ int len = lua_rawlen(lua, 1); + for(int i = 1; i <= len; i++){ + lua_rawgeti(lua, 1, i); + if(lua_type(lua, -1) == LUA_TTABLE){ +@@ -1279,7 +1279,7 @@ static int util_isect(lua_State *lua){ + int rnum = 0; + for(int i = 1; i <= argc; i++){ + if(lua_type(lua, i) != LUA_TTABLE) continue; +- int len = lua_objlen(lua, i); ++ int len = lua_rawlen(lua, i); + if(len < 1){ + lua_settop(lua, 0); + lua_newtable(lua); +@@ -1293,7 +1293,7 @@ static int util_isect(lua_State *lua){ + TCMAP *latter = NULL; + for(int i = 1; i <= argc; i++){ + if(lua_type(lua, i) != LUA_TTABLE) continue; +- int len = lua_objlen(lua, i); ++ int len = lua_rawlen(lua, i); + if(former){ + latter = tcmapnew2(tclmin(len, tcmaprnum(former))); + for(int j = 1; j <= len; j++){ +@@ -1338,7 +1338,7 @@ static int util_isect(lua_State *lua){ + TCMAP *freq = tcmapnew2(rnum); + for(int i = 1; i <= argc; i++){ + if(lua_type(lua, i) != LUA_TTABLE) continue; +- int len = lua_objlen(lua, i); ++ int len = lua_rawlen(lua, i); + TCMAP *uniq = tcmapnew2(len); + for(int j = 1; j <= len; j++){ + lua_rawgeti(lua, i, j); +@@ -1379,7 +1379,7 @@ static int util_isect(lua_State *lua){ + static int util_union(lua_State *lua){ + int argc = lua_gettop(lua); + if(argc == 1 && lua_type(lua, 1) == LUA_TTABLE){ +- int len = lua_objlen(lua, 1); ++ int len = lua_rawlen(lua, 1); + for(int i = 1; i <= len; i++){ + lua_rawgeti(lua, 1, i); + if(lua_type(lua, -1) == LUA_TTABLE){ +@@ -1397,12 +1397,12 @@ static int util_union(lua_State *lua){ + int rnum = 0; + for(int i = 1; i <= argc; i++){ + if(lua_type(lua, i) != LUA_TTABLE) continue; +- rnum += lua_objlen(lua, i); ++ rnum += lua_rawlen(lua, i); + } + TCMAP *result = tcmapnew2(rnum); + for(int i = 1; i <= argc; i++){ + if(lua_type(lua, i) != LUA_TTABLE) continue; +- int len = lua_objlen(lua, i); ++ int len = lua_rawlen(lua, i); + for(int j = 1; j <= len; j++){ + lua_rawgeti(lua, i, j); + size_t size; +@@ -6400,7 +6400,7 @@ static int tdbqry_metasearch(lua_State * + lua_error(lua); + } + TDBQRY *qry = data->qry; +- int num = lua_objlen(lua, 2); ++ int num = lua_rawlen(lua, 2); + TDBQRY **qrys = tcmalloc(sizeof(*qrys) * (num + 1)); + int qnum = 0; + qrys[qnum++] = qry; |