[arch-commits] Commit in luasql/repos/community-i686 (4 files)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Tue Jul 1 12:23:55 UTC 2014
Date: Tuesday, July 1, 2014 @ 14:23:55
Author: spupykin
Revision: 114049
archrelease: copy trunk to community-i686
Added:
luasql/repos/community-i686/PKGBUILD
(from rev 114048, luasql/trunk/PKGBUILD)
luasql/repos/community-i686/lua52.patch
(from rev 114048, luasql/trunk/lua52.patch)
Deleted:
luasql/repos/community-i686/PKGBUILD
luasql/repos/community-i686/lua52.patch
-------------+
PKGBUILD | 120 ++++++------
lua52.patch | 566 +++++++++++++++++++++++++++++-----------------------------
2 files changed, 343 insertions(+), 343 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2014-07-01 12:23:47 UTC (rev 114048)
+++ PKGBUILD 2014-07-01 12:23:55 UTC (rev 114049)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Sébastien Luttringer <seblu at archlinux.org>
-# Contributor: Anders Bergh <anders1 at gmail.com>
-
-pkgbase=luasql
-pkgname=('lua-sql-mysql' 'lua-sql-postgres' 'lua-sql-sqlite')
-pkgver=2.2.0
-pkgrel=3
-arch=('i686' 'x86_64')
-url='http://www.keplerproject.org/luasql/'
-license=('MIT')
-makedepends=('lua' 'libmariadbclient' 'postgresql-libs' 'sqlite')
-source=("https://github.com/downloads/keplerproject/luasql/luasql-$pkgver.tar.gz"
- 'lua52.patch')
-md5sums=('59d72db444c6369c936d4f03694db6b7'
- 'a1d6083215e7a83cfc08621b6998914c')
-
-build() {
- cd $pkgbase-$pkgver
- patch -p1 < "$srcdir/lua52.patch"
- msg2 'Building sqlite support'
- make T=sqlite3 PREFIX=/usr DRIVER_LIBS='-lsqlite3' DRIVER_INCS='-fPIC -std=c99'
- msg2 'Building PostgreSQL support'
- make T=postgres PREFIX=/usr DRIVER_LIBS='-lpq' DRIVER_INCS='-fPIC'
- msg2 'Building MySQL support'
- make T=mysql PREFIX=/usr DRIVER_LIBS="$(mysql_config --libs)" \
- DRIVER_INCS="$(mysql_config --include) -fPIC"
-}
-
-package_lua-sql-mysql() {
- pkgdesc='MySQL module for Lua'
- depends=('lua' 'libmariadbclient')
- conflicts=('luasql-mysql')
- replaces=('luasql-mysql')
-
- cd $pkgbase-$pkgver
- install -Dm644 src/mysql.so "$pkgdir/usr/lib/lua/5.2/luasql/mysql.so"
- install -Dm644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html"
-}
-
-package_lua-sql-postgres() {
- pkgdesc='PostgreSQL module for Lua'
- depends=('lua' 'postgresql-libs')
-
- cd $pkgbase-$pkgver
- install -Dm644 src/postgres.so "$pkgdir/usr/lib/lua/5.2/luasql/postgres.so"
- install -Dm644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html"
-}
-
-package_lua-sql-sqlite() {
- pkgdesc='SQLite module for Lua'
- depends=('lua' 'sqlite')
-
- cd $pkgbase-$pkgver
- install -Dm644 src/sqlite3.so "$pkgdir/usr/lib/lua/5.2/luasql/sqlite3.so"
- install -Dm644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: luasql/repos/community-i686/PKGBUILD (from rev 114048, luasql/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2014-07-01 12:23:55 UTC (rev 114049)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Sébastien Luttringer <seblu at archlinux.org>
+# Contributor: Anders Bergh <anders1 at gmail.com>
+
+pkgbase=luasql
+pkgname=('lua-sql-mysql' 'lua-sql-postgres' 'lua-sql-sqlite')
+pkgver=2.2.0
+pkgrel=4
+arch=('i686' 'x86_64')
+url='http://www.keplerproject.org/luasql/'
+license=('MIT')
+makedepends=('lua' 'libmariadbclient' 'postgresql-libs' 'sqlite')
+source=("https://github.com/downloads/keplerproject/luasql/luasql-$pkgver.tar.gz"
+ 'lua52.patch')
+md5sums=('59d72db444c6369c936d4f03694db6b7'
+ 'a1d6083215e7a83cfc08621b6998914c')
+
+build() {
+ cd $pkgbase-$pkgver
+ patch -p1 < "$srcdir/lua52.patch"
+ msg2 'Building sqlite support'
+ make T=sqlite3 PREFIX=/usr DRIVER_LIBS='-lsqlite3' DRIVER_INCS='-fPIC -std=c99'
+ msg2 'Building PostgreSQL support'
+ make T=postgres PREFIX=/usr DRIVER_LIBS='-lpq' DRIVER_INCS='-fPIC'
+ msg2 'Building MySQL support'
+ make T=mysql PREFIX=/usr DRIVER_LIBS="$(mysql_config --libs)" \
+ DRIVER_INCS="$(mysql_config --include) -fPIC"
+}
+
+package_lua-sql-mysql() {
+ pkgdesc='MySQL module for Lua'
+ depends=('lua' 'libmariadbclient')
+ conflicts=('luasql-mysql')
+ replaces=('luasql-mysql')
+
+ cd $pkgbase-$pkgver
+ install -Dm644 src/mysql.so "$pkgdir/usr/lib/lua/5.2/luasql/mysql.so"
+ install -Dm644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html"
+}
+
+package_lua-sql-postgres() {
+ pkgdesc='PostgreSQL module for Lua'
+ depends=('lua' 'postgresql-libs')
+
+ cd $pkgbase-$pkgver
+ install -Dm644 src/postgres.so "$pkgdir/usr/lib/lua/5.2/luasql/postgres.so"
+ install -Dm644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html"
+}
+
+package_lua-sql-sqlite() {
+ pkgdesc='SQLite module for Lua'
+ depends=('lua' 'sqlite')
+
+ cd $pkgbase-$pkgver
+ install -Dm644 src/sqlite3.so "$pkgdir/usr/lib/lua/5.2/luasql/sqlite3.so"
+ install -Dm644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: lua52.patch
===================================================================
--- lua52.patch 2014-07-01 12:23:47 UTC (rev 114048)
+++ lua52.patch 2014-07-01 12:23:55 UTC (rev 114049)
@@ -1,283 +0,0 @@
-diff -wbBur luasql-2.2.0/src/ls_firebird.c luasql-2.2.0.my/src/ls_firebird.c
---- luasql-2.2.0/src/ls_firebird.c 2009-10-20 20:38:38.000000000 +0400
-+++ luasql-2.2.0.my/src/ls_firebird.c 2012-11-14 19:06:50.508901839 +0400
-@@ -1008,13 +1008,13 @@
- ** Create metatables for each class of object.
- */
- static void create_metatables (lua_State *L) {
-- struct luaL_reg environment_methods[] = {
-+ struct luaL_Reg environment_methods[] = {
- {"__gc", env_gc},
- {"close", env_close},
- {"connect", env_connect},
- {NULL, NULL},
- };
-- struct luaL_reg connection_methods[] = {
-+ struct luaL_Reg connection_methods[] = {
- {"__gc", conn_gc},
- {"close", conn_close},
- {"execute", conn_execute},
-@@ -1024,7 +1024,7 @@
- {"escape", conn_escape},
- {NULL, NULL},
- };
-- struct luaL_reg cursor_methods[] = {
-+ struct luaL_Reg cursor_methods[] = {
- {"__gc", cur_gc},
- {"close", cur_close},
- {"fetch", cur_fetch},
-@@ -1043,7 +1043,7 @@
- ** driver open method.
- */
- LUASQL_API int luaopen_luasql_firebird (lua_State *L) {
-- struct luaL_reg driver[] = {
-+ struct luaL_Reg driver[] = {
- {"firebird", create_environment},
- {NULL, NULL},
- };
-diff -wbBur luasql-2.2.0/src/ls_mysql.c luasql-2.2.0.my/src/ls_mysql.c
---- luasql-2.2.0/src/ls_mysql.c 2009-10-20 20:38:38.000000000 +0400
-+++ luasql-2.2.0.my/src/ls_mysql.c 2012-11-14 19:06:56.782236770 +0400
-@@ -511,13 +511,13 @@
- ** Create metatables for each class of object.
- */
- static void create_metatables (lua_State *L) {
-- struct luaL_reg environment_methods[] = {
-+ struct luaL_Reg environment_methods[] = {
- {"__gc", env_close},
- {"close", env_close},
- {"connect", env_connect},
- {NULL, NULL},
- };
-- struct luaL_reg connection_methods[] = {
-+ struct luaL_Reg connection_methods[] = {
- {"__gc", conn_close},
- {"close", conn_close},
- {"escape", escape_string},
-@@ -528,7 +528,7 @@
- {"getlastautoid", conn_getlastautoid},
- {NULL, NULL},
- };
-- struct luaL_reg cursor_methods[] = {
-+ struct luaL_Reg cursor_methods[] = {
- {"__gc", cur_close},
- {"close", cur_close},
- {"getcolnames", cur_getcolnames},
-@@ -562,7 +562,7 @@
- ** driver open method.
- */
- LUASQL_API int luaopen_luasql_mysql (lua_State *L) {
-- struct luaL_reg driver[] = {
-+ struct luaL_Reg driver[] = {
- {"mysql", create_environment},
- {NULL, NULL},
- };
-diff -wbBur luasql-2.2.0/src/ls_oci8.c luasql-2.2.0.my/src/ls_oci8.c
---- luasql-2.2.0/src/ls_oci8.c 2009-10-20 20:38:38.000000000 +0400
-+++ luasql-2.2.0.my/src/ls_oci8.c 2012-11-14 19:06:39.182232288 +0400
-@@ -814,13 +814,13 @@
- ** Create metatables for each class of object.
- */
- static void create_metatables (lua_State *L) {
-- struct luaL_reg environment_methods[] = {
-+ struct luaL_Reg environment_methods[] = {
- {"__gc", env_close},
- {"close", env_close},
- {"connect", env_connect},
- {NULL, NULL},
- };
-- struct luaL_reg connection_methods[] = {
-+ struct luaL_Reg connection_methods[] = {
- {"__gc", conn_close},
- {"close", conn_close},
- {"execute", conn_execute},
-@@ -829,7 +829,7 @@
- {"setautocommit", conn_setautocommit},
- {NULL, NULL},
- };
-- struct luaL_reg cursor_methods[] = {
-+ struct luaL_Reg cursor_methods[] = {
- {"__gc", cur_close},
- {"close", cur_close},
- {"getcolnames", cur_getcolnames},
-@@ -850,7 +850,7 @@
- ** driver open method.
- */
- LUASQL_API int luaopen_luasql_oci8 (lua_State *L) {
-- struct luaL_reg driver[] = {
-+ struct luaL_Reg driver[] = {
- {"oci8", create_environment},
- {NULL, NULL},
- };
-diff -wbBur luasql-2.2.0/src/ls_odbc.c luasql-2.2.0.my/src/ls_odbc.c
---- luasql-2.2.0/src/ls_odbc.c 2009-10-20 20:38:38.000000000 +0400
-+++ luasql-2.2.0.my/src/ls_odbc.c 2012-11-14 19:06:53.652235973 +0400
-@@ -638,13 +638,13 @@
- ** Create metatables for each class of object.
- */
- static void create_metatables (lua_State *L) {
-- struct luaL_reg environment_methods[] = {
-+ struct luaL_Reg environment_methods[] = {
- {"__gc", env_close},
- {"close", env_close},
- {"connect", env_connect},
- {NULL, NULL},
- };
-- struct luaL_reg connection_methods[] = {
-+ struct luaL_Reg connection_methods[] = {
- {"__gc", conn_close},
- {"close", conn_close},
- {"execute", conn_execute},
-@@ -653,7 +653,7 @@
- {"setautocommit", conn_setautocommit},
- {NULL, NULL},
- };
-- struct luaL_reg cursor_methods[] = {
-+ struct luaL_Reg cursor_methods[] = {
- {"__gc", cur_close},
- {"close", cur_close},
- {"fetch", cur_fetch},
-@@ -701,7 +701,7 @@
- ** driver open method.
- */
- LUASQL_API int luaopen_luasql_odbc (lua_State *L) {
-- struct luaL_reg driver[] = {
-+ struct luaL_Reg driver[] = {
- {"odbc", create_environment},
- {NULL, NULL},
- };
-diff -wbBur luasql-2.2.0/src/ls_postgres.c luasql-2.2.0.my/src/ls_postgres.c
---- luasql-2.2.0/src/ls_postgres.c 2009-10-20 20:38:38.000000000 +0400
-+++ luasql-2.2.0.my/src/ls_postgres.c 2012-11-14 19:06:47.275567683 +0400
-@@ -551,13 +551,13 @@
- ** Create metatables for each class of object.
- */
- static void create_metatables (lua_State *L) {
-- struct luaL_reg environment_methods[] = {
-+ struct luaL_Reg environment_methods[] = {
- {"__gc", env_gc},
- {"close", env_close},
- {"connect", env_connect},
- {NULL, NULL},
- };
-- struct luaL_reg connection_methods[] = {
-+ struct luaL_Reg connection_methods[] = {
- {"__gc", conn_gc},
- {"close", conn_close},
- {"escape", conn_escape},
-@@ -567,7 +567,7 @@
- {"setautocommit", conn_setautocommit},
- {NULL, NULL},
- };
-- struct luaL_reg cursor_methods[] = {
-+ struct luaL_Reg cursor_methods[] = {
- {"__gc", cur_gc},
- {"close", cur_close},
- {"getcolnames", cur_getcolnames},
-@@ -600,7 +600,7 @@
- ** driver open method.
- */
- LUASQL_API int luaopen_luasql_postgres (lua_State *L) {
-- struct luaL_reg driver[] = {
-+ struct luaL_Reg driver[] = {
- {"postgres", create_environment},
- {NULL, NULL},
- };
-diff -wbBur luasql-2.2.0/src/ls_sqlite3.c luasql-2.2.0.my/src/ls_sqlite3.c
---- luasql-2.2.0/src/ls_sqlite3.c 2009-10-20 20:38:38.000000000 +0400
-+++ luasql-2.2.0.my/src/ls_sqlite3.c 2012-11-14 19:06:26.115562295 +0400
-@@ -560,13 +560,13 @@
- */
- static void create_metatables (lua_State *L)
- {
-- struct luaL_reg environment_methods[] = {
-+ struct luaL_Reg environment_methods[] = {
- {"__gc", env_close},
- {"close", env_close},
- {"connect", env_connect},
- {NULL, NULL},
- };
-- struct luaL_reg connection_methods[] = {
-+ struct luaL_Reg connection_methods[] = {
- {"__gc", conn_close},
- {"close", conn_close},
- {"escape", conn_escape},
-@@ -577,7 +577,7 @@
- {"getlastautoid", conn_getlastautoid},
- {NULL, NULL},
- };
-- struct luaL_reg cursor_methods[] = {
-+ struct luaL_Reg cursor_methods[] = {
- {"__gc", cur_close},
- {"close", cur_close},
- {"getcolnames", cur_getcolnames},
-@@ -611,7 +611,7 @@
- */
- LUASQL_API int luaopen_luasql_sqlite3(lua_State *L)
- {
-- struct luaL_reg driver[] = {
-+ struct luaL_Reg driver[] = {
- {"sqlite3", create_environment},
- {NULL, NULL},
- };
-diff -wbBur luasql-2.2.0/src/ls_sqlite.c luasql-2.2.0.my/src/ls_sqlite.c
---- luasql-2.2.0/src/ls_sqlite.c 2009-10-20 20:38:38.000000000 +0400
-+++ luasql-2.2.0.my/src/ls_sqlite.c 2012-11-14 19:06:43.845566808 +0400
-@@ -518,13 +518,13 @@
- */
- static void create_metatables (lua_State *L)
- {
-- struct luaL_reg environment_methods[] = {
-+ struct luaL_Reg environment_methods[] = {
- {"__gc", env_close},
- {"close", env_close},
- {"connect", env_connect},
- {NULL, NULL},
- };
-- struct luaL_reg connection_methods[] = {
-+ struct luaL_Reg connection_methods[] = {
- {"__gc", conn_close},
- {"close", conn_close},
- {"escape", conn_escape},
-@@ -534,7 +534,7 @@
- {"setautocommit", conn_setautocommit},
- {NULL, NULL},
- };
-- struct luaL_reg cursor_methods[] = {
-+ struct luaL_Reg cursor_methods[] = {
- {"__gc", cur_close},
- {"close", cur_close},
- {"getcolnames", cur_getcolnames},
-@@ -568,7 +568,7 @@
- */
- LUASQL_API int luaopen_luasql_sqlite(lua_State *L)
- {
-- struct luaL_reg driver[] = {
-+ struct luaL_Reg driver[] = {
- {"sqlite", create_environment},
- {NULL, NULL},
- };
-diff -wbBur luasql-2.2.0/src/luasql.c luasql-2.2.0.my/src/luasql.c
---- luasql-2.2.0/src/luasql.c 2009-10-20 20:38:38.000000000 +0400
-+++ luasql-2.2.0.my/src/luasql.c 2012-11-14 19:06:32.412230565 +0400
-@@ -60,7 +60,7 @@
- /*
- ** Create a metatable and leave it on top of the stack.
- */
--LUASQL_API int luasql_createmeta (lua_State *L, const char *name, const luaL_reg *methods) {
-+LUASQL_API int luasql_createmeta (lua_State *L, const char *name, const luaL_Reg *methods) {
- if (!luaL_newmetatable (L, name))
- return 0;
-
-diff -wbBur luasql-2.2.0/src/luasql.h luasql-2.2.0.my/src/luasql.h
---- luasql-2.2.0/src/luasql.h 2009-10-20 20:38:38.000000000 +0400
-+++ luasql-2.2.0.my/src/luasql.h 2012-11-14 19:06:29.002229695 +0400
-@@ -22,7 +22,7 @@
-
- LUASQL_API int luasql_faildirect (lua_State *L, const char *err);
- LUASQL_API int luasql_failmsg (lua_State *L, const char *err, const char *m);
--LUASQL_API int luasql_createmeta (lua_State *L, const char *name, const luaL_reg *methods);
-+LUASQL_API int luasql_createmeta (lua_State *L, const char *name, const luaL_Reg *methods);
- LUASQL_API void luasql_setmeta (lua_State *L, const char *name);
- LUASQL_API void luasql_set_info (lua_State *L);
-
Copied: luasql/repos/community-i686/lua52.patch (from rev 114048, luasql/trunk/lua52.patch)
===================================================================
--- lua52.patch (rev 0)
+++ lua52.patch 2014-07-01 12:23:55 UTC (rev 114049)
@@ -0,0 +1,283 @@
+diff -wbBur luasql-2.2.0/src/ls_firebird.c luasql-2.2.0.my/src/ls_firebird.c
+--- luasql-2.2.0/src/ls_firebird.c 2009-10-20 20:38:38.000000000 +0400
++++ luasql-2.2.0.my/src/ls_firebird.c 2012-11-14 19:06:50.508901839 +0400
+@@ -1008,13 +1008,13 @@
+ ** Create metatables for each class of object.
+ */
+ static void create_metatables (lua_State *L) {
+- struct luaL_reg environment_methods[] = {
++ struct luaL_Reg environment_methods[] = {
+ {"__gc", env_gc},
+ {"close", env_close},
+ {"connect", env_connect},
+ {NULL, NULL},
+ };
+- struct luaL_reg connection_methods[] = {
++ struct luaL_Reg connection_methods[] = {
+ {"__gc", conn_gc},
+ {"close", conn_close},
+ {"execute", conn_execute},
+@@ -1024,7 +1024,7 @@
+ {"escape", conn_escape},
+ {NULL, NULL},
+ };
+- struct luaL_reg cursor_methods[] = {
++ struct luaL_Reg cursor_methods[] = {
+ {"__gc", cur_gc},
+ {"close", cur_close},
+ {"fetch", cur_fetch},
+@@ -1043,7 +1043,7 @@
+ ** driver open method.
+ */
+ LUASQL_API int luaopen_luasql_firebird (lua_State *L) {
+- struct luaL_reg driver[] = {
++ struct luaL_Reg driver[] = {
+ {"firebird", create_environment},
+ {NULL, NULL},
+ };
+diff -wbBur luasql-2.2.0/src/ls_mysql.c luasql-2.2.0.my/src/ls_mysql.c
+--- luasql-2.2.0/src/ls_mysql.c 2009-10-20 20:38:38.000000000 +0400
++++ luasql-2.2.0.my/src/ls_mysql.c 2012-11-14 19:06:56.782236770 +0400
+@@ -511,13 +511,13 @@
+ ** Create metatables for each class of object.
+ */
+ static void create_metatables (lua_State *L) {
+- struct luaL_reg environment_methods[] = {
++ struct luaL_Reg environment_methods[] = {
+ {"__gc", env_close},
+ {"close", env_close},
+ {"connect", env_connect},
+ {NULL, NULL},
+ };
+- struct luaL_reg connection_methods[] = {
++ struct luaL_Reg connection_methods[] = {
+ {"__gc", conn_close},
+ {"close", conn_close},
+ {"escape", escape_string},
+@@ -528,7 +528,7 @@
+ {"getlastautoid", conn_getlastautoid},
+ {NULL, NULL},
+ };
+- struct luaL_reg cursor_methods[] = {
++ struct luaL_Reg cursor_methods[] = {
+ {"__gc", cur_close},
+ {"close", cur_close},
+ {"getcolnames", cur_getcolnames},
+@@ -562,7 +562,7 @@
+ ** driver open method.
+ */
+ LUASQL_API int luaopen_luasql_mysql (lua_State *L) {
+- struct luaL_reg driver[] = {
++ struct luaL_Reg driver[] = {
+ {"mysql", create_environment},
+ {NULL, NULL},
+ };
+diff -wbBur luasql-2.2.0/src/ls_oci8.c luasql-2.2.0.my/src/ls_oci8.c
+--- luasql-2.2.0/src/ls_oci8.c 2009-10-20 20:38:38.000000000 +0400
++++ luasql-2.2.0.my/src/ls_oci8.c 2012-11-14 19:06:39.182232288 +0400
+@@ -814,13 +814,13 @@
+ ** Create metatables for each class of object.
+ */
+ static void create_metatables (lua_State *L) {
+- struct luaL_reg environment_methods[] = {
++ struct luaL_Reg environment_methods[] = {
+ {"__gc", env_close},
+ {"close", env_close},
+ {"connect", env_connect},
+ {NULL, NULL},
+ };
+- struct luaL_reg connection_methods[] = {
++ struct luaL_Reg connection_methods[] = {
+ {"__gc", conn_close},
+ {"close", conn_close},
+ {"execute", conn_execute},
+@@ -829,7 +829,7 @@
+ {"setautocommit", conn_setautocommit},
+ {NULL, NULL},
+ };
+- struct luaL_reg cursor_methods[] = {
++ struct luaL_Reg cursor_methods[] = {
+ {"__gc", cur_close},
+ {"close", cur_close},
+ {"getcolnames", cur_getcolnames},
+@@ -850,7 +850,7 @@
+ ** driver open method.
+ */
+ LUASQL_API int luaopen_luasql_oci8 (lua_State *L) {
+- struct luaL_reg driver[] = {
++ struct luaL_Reg driver[] = {
+ {"oci8", create_environment},
+ {NULL, NULL},
+ };
+diff -wbBur luasql-2.2.0/src/ls_odbc.c luasql-2.2.0.my/src/ls_odbc.c
+--- luasql-2.2.0/src/ls_odbc.c 2009-10-20 20:38:38.000000000 +0400
++++ luasql-2.2.0.my/src/ls_odbc.c 2012-11-14 19:06:53.652235973 +0400
+@@ -638,13 +638,13 @@
+ ** Create metatables for each class of object.
+ */
+ static void create_metatables (lua_State *L) {
+- struct luaL_reg environment_methods[] = {
++ struct luaL_Reg environment_methods[] = {
+ {"__gc", env_close},
+ {"close", env_close},
+ {"connect", env_connect},
+ {NULL, NULL},
+ };
+- struct luaL_reg connection_methods[] = {
++ struct luaL_Reg connection_methods[] = {
+ {"__gc", conn_close},
+ {"close", conn_close},
+ {"execute", conn_execute},
+@@ -653,7 +653,7 @@
+ {"setautocommit", conn_setautocommit},
+ {NULL, NULL},
+ };
+- struct luaL_reg cursor_methods[] = {
++ struct luaL_Reg cursor_methods[] = {
+ {"__gc", cur_close},
+ {"close", cur_close},
+ {"fetch", cur_fetch},
+@@ -701,7 +701,7 @@
+ ** driver open method.
+ */
+ LUASQL_API int luaopen_luasql_odbc (lua_State *L) {
+- struct luaL_reg driver[] = {
++ struct luaL_Reg driver[] = {
+ {"odbc", create_environment},
+ {NULL, NULL},
+ };
+diff -wbBur luasql-2.2.0/src/ls_postgres.c luasql-2.2.0.my/src/ls_postgres.c
+--- luasql-2.2.0/src/ls_postgres.c 2009-10-20 20:38:38.000000000 +0400
++++ luasql-2.2.0.my/src/ls_postgres.c 2012-11-14 19:06:47.275567683 +0400
+@@ -551,13 +551,13 @@
+ ** Create metatables for each class of object.
+ */
+ static void create_metatables (lua_State *L) {
+- struct luaL_reg environment_methods[] = {
++ struct luaL_Reg environment_methods[] = {
+ {"__gc", env_gc},
+ {"close", env_close},
+ {"connect", env_connect},
+ {NULL, NULL},
+ };
+- struct luaL_reg connection_methods[] = {
++ struct luaL_Reg connection_methods[] = {
+ {"__gc", conn_gc},
+ {"close", conn_close},
+ {"escape", conn_escape},
+@@ -567,7 +567,7 @@
+ {"setautocommit", conn_setautocommit},
+ {NULL, NULL},
+ };
+- struct luaL_reg cursor_methods[] = {
++ struct luaL_Reg cursor_methods[] = {
+ {"__gc", cur_gc},
+ {"close", cur_close},
+ {"getcolnames", cur_getcolnames},
+@@ -600,7 +600,7 @@
+ ** driver open method.
+ */
+ LUASQL_API int luaopen_luasql_postgres (lua_State *L) {
+- struct luaL_reg driver[] = {
++ struct luaL_Reg driver[] = {
+ {"postgres", create_environment},
+ {NULL, NULL},
+ };
+diff -wbBur luasql-2.2.0/src/ls_sqlite3.c luasql-2.2.0.my/src/ls_sqlite3.c
+--- luasql-2.2.0/src/ls_sqlite3.c 2009-10-20 20:38:38.000000000 +0400
++++ luasql-2.2.0.my/src/ls_sqlite3.c 2012-11-14 19:06:26.115562295 +0400
+@@ -560,13 +560,13 @@
+ */
+ static void create_metatables (lua_State *L)
+ {
+- struct luaL_reg environment_methods[] = {
++ struct luaL_Reg environment_methods[] = {
+ {"__gc", env_close},
+ {"close", env_close},
+ {"connect", env_connect},
+ {NULL, NULL},
+ };
+- struct luaL_reg connection_methods[] = {
++ struct luaL_Reg connection_methods[] = {
+ {"__gc", conn_close},
+ {"close", conn_close},
+ {"escape", conn_escape},
+@@ -577,7 +577,7 @@
+ {"getlastautoid", conn_getlastautoid},
+ {NULL, NULL},
+ };
+- struct luaL_reg cursor_methods[] = {
++ struct luaL_Reg cursor_methods[] = {
+ {"__gc", cur_close},
+ {"close", cur_close},
+ {"getcolnames", cur_getcolnames},
+@@ -611,7 +611,7 @@
+ */
+ LUASQL_API int luaopen_luasql_sqlite3(lua_State *L)
+ {
+- struct luaL_reg driver[] = {
++ struct luaL_Reg driver[] = {
+ {"sqlite3", create_environment},
+ {NULL, NULL},
+ };
+diff -wbBur luasql-2.2.0/src/ls_sqlite.c luasql-2.2.0.my/src/ls_sqlite.c
+--- luasql-2.2.0/src/ls_sqlite.c 2009-10-20 20:38:38.000000000 +0400
++++ luasql-2.2.0.my/src/ls_sqlite.c 2012-11-14 19:06:43.845566808 +0400
+@@ -518,13 +518,13 @@
+ */
+ static void create_metatables (lua_State *L)
+ {
+- struct luaL_reg environment_methods[] = {
++ struct luaL_Reg environment_methods[] = {
+ {"__gc", env_close},
+ {"close", env_close},
+ {"connect", env_connect},
+ {NULL, NULL},
+ };
+- struct luaL_reg connection_methods[] = {
++ struct luaL_Reg connection_methods[] = {
+ {"__gc", conn_close},
+ {"close", conn_close},
+ {"escape", conn_escape},
+@@ -534,7 +534,7 @@
+ {"setautocommit", conn_setautocommit},
+ {NULL, NULL},
+ };
+- struct luaL_reg cursor_methods[] = {
++ struct luaL_Reg cursor_methods[] = {
+ {"__gc", cur_close},
+ {"close", cur_close},
+ {"getcolnames", cur_getcolnames},
+@@ -568,7 +568,7 @@
+ */
+ LUASQL_API int luaopen_luasql_sqlite(lua_State *L)
+ {
+- struct luaL_reg driver[] = {
++ struct luaL_Reg driver[] = {
+ {"sqlite", create_environment},
+ {NULL, NULL},
+ };
+diff -wbBur luasql-2.2.0/src/luasql.c luasql-2.2.0.my/src/luasql.c
+--- luasql-2.2.0/src/luasql.c 2009-10-20 20:38:38.000000000 +0400
++++ luasql-2.2.0.my/src/luasql.c 2012-11-14 19:06:32.412230565 +0400
+@@ -60,7 +60,7 @@
+ /*
+ ** Create a metatable and leave it on top of the stack.
+ */
+-LUASQL_API int luasql_createmeta (lua_State *L, const char *name, const luaL_reg *methods) {
++LUASQL_API int luasql_createmeta (lua_State *L, const char *name, const luaL_Reg *methods) {
+ if (!luaL_newmetatable (L, name))
+ return 0;
+
+diff -wbBur luasql-2.2.0/src/luasql.h luasql-2.2.0.my/src/luasql.h
+--- luasql-2.2.0/src/luasql.h 2009-10-20 20:38:38.000000000 +0400
++++ luasql-2.2.0.my/src/luasql.h 2012-11-14 19:06:29.002229695 +0400
+@@ -22,7 +22,7 @@
+
+ LUASQL_API int luasql_faildirect (lua_State *L, const char *err);
+ LUASQL_API int luasql_failmsg (lua_State *L, const char *err, const char *m);
+-LUASQL_API int luasql_createmeta (lua_State *L, const char *name, const luaL_reg *methods);
++LUASQL_API int luasql_createmeta (lua_State *L, const char *name, const luaL_Reg *methods);
+ LUASQL_API void luasql_setmeta (lua_State *L, const char *name);
+ LUASQL_API void luasql_set_info (lua_State *L);
+
More information about the arch-commits
mailing list