[lua-sql] Added patch for F-14 and up

Tim Niemueller timn at fedoraproject.org
Tue Mar 22 22:47:47 UTC 2011


commit a5557062627a2100ff44e0277130c374a28f798b
Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:   Tue Mar 22 23:47:25 2011 +0100

    Added patch for F-14 and up

 lua-sql-2.2.0-fedora.patch |   58 ++++++++++++++++++++++++++++++++++++++++++++
 lua-sql.spec               |    3 ++
 2 files changed, 61 insertions(+), 0 deletions(-)
---
diff --git a/lua-sql-2.2.0-fedora.patch b/lua-sql-2.2.0-fedora.patch
new file mode 100644
index 0000000..adb8a9a
--- /dev/null
+++ b/lua-sql-2.2.0-fedora.patch
@@ -0,0 +1,58 @@
+From 9ec61fb8e7c08f2f464c86678e874d466b8ceb3f Mon Sep 17 00:00:00 2001
+From: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
+Date: Tue, 22 Mar 2011 23:29:28 +0100
+Subject: [PATCH] sqlite3: fix compile errors on Fedora 15
+
+---
+ src/ls_sqlite3.c |   12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/ls_sqlite3.c b/src/ls_sqlite3.c
+index 0ddd496..cfd9a9a 100644
+--- a/src/ls_sqlite3.c
++++ b/src/ls_sqlite3.c
+@@ -114,12 +114,12 @@ static void push_column(lua_State *L, sqlite3_stmt *vm, int column) {
+     lua_pushnumber(L, sqlite3_column_double(vm, column));
+     break;
+   case SQLITE_TEXT:
+-    lua_pushlstring(L, sqlite3_column_text(vm, column),
+-		    sqlite3_column_bytes(vm, column));
++    lua_pushlstring(L, (const char *)sqlite3_column_text(vm, column),
++		    (size_t)sqlite3_column_bytes(vm, column));
+     break;
+   case SQLITE_BLOB:
+     lua_pushlstring(L, sqlite3_column_blob(vm, column),
+-		    sqlite3_column_bytes(vm, column));
++		    (size_t)sqlite3_column_bytes(vm, column));
+     break;
+   case SQLITE_NULL:
+     lua_pushnil(L);
+@@ -519,7 +519,7 @@ static int env_connect(lua_State *L)
+     }
+ 
+   if (lua_isnumber(L, 3)) {
+-  	sqlite3_busy_timeout(conn, lua_tonumber(L,3)); // TODO: remove this
++  	sqlite3_busy_timeout(conn, lua_tonumber(L,3)); /* TODO: remove this */
+   }
+ 
+   return create_connection(L, 1, conn);
+@@ -546,14 +546,14 @@ static int env_close (lua_State *L)
+ 
+ /*
+ ** Sets the timeout for a lock in the connection.
+-*/
+ static int opts_settimeout  (lua_State *L)
+ {
+ 	conn_data *conn = getconnection(L);
+ 	int milisseconds = luaL_checknumber(L, 2);
+-	lua_pushnumber(L, sqlite3_busy_timeout(conn, milisseconds));
++	lua_pushnumber(L, sqlite3_busy_timeout(conn->sql_conn, milisseconds));
+ 	return 1;
+ }
++*/
+ 
+ /*
+ ** Create metatables for each class of object.
+-- 
+1.7.4
+
diff --git a/lua-sql.spec b/lua-sql.spec
index c9f28b3..c044994 100644
--- a/lua-sql.spec
+++ b/lua-sql.spec
@@ -11,6 +11,7 @@ Group:          Development/Libraries
 License:        MIT
 URL:            http://www.keplerproject.org/luasql/
 Source0:        https://github.com/downloads/keplerproject/luasql/luasql-2.2.0.tar.gz
+Patch0:         lua-sql-2.2.0-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  lua >= %{luaver}, lua-devel >= %{luaver}
@@ -64,6 +65,7 @@ to PostgreSQL databases.
 
 %prep
 %setup -q -n luasql-%{version}
+%patch0 -p1 -b .fedora
 
 
 %build
@@ -111,6 +113,7 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Mar 22 2011 Tim Niemueller <tim at niemueller.de> - 2.2.0-1
 - Upgrade to latest stable release 2.2.0
 - Rebuilt for MySQL 5.5
+- Added patch for F-14 and up
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild


More information about the scm-commits mailing list