gunnar: server/sqlite sqlite.patch.v2, NONE, 1.1 sqlite.patch.v3, NONE, 1.1 sqlite.patch, 1.1, NONE

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/sqlite
In directory doto:/tmp/cvs-serv26003

Added Files:
	sqlite.patch.v2 sqlite.patch.v3 
Removed Files:
	sqlite.patch 
Log Message:
Rename the sqlite v2 patch, add the sqlite v3 patch.

--- NEW FILE: sqlite.patch.v2 ---
Index: sqlite-2.8.17/configure
--- sqlite-2.8.17/configure.orig	2005-04-24 00:43:23 +0200
+++ sqlite-2.8.17/configure	2006-12-18 09:51:03 +0100
@@ -20450,7 +20450,10 @@
   TARGET_HAVE_READLINE=0
 fi
 
-
+if [ "$ac_cv_lib_readline_readline" = "no" ]
+then
+    TARGET_HAVE_READLINE=0
+fi
 
 #########
 # Figure out whether or not we have a "usleep()" function.
Index: sqlite-2.8.17/src/encode.c
--- sqlite-2.8.17/src/encode.c.orig	2005-04-24 00:43:22 +0200
+++ sqlite-2.8.17/src/encode.c	2007-02-23 15:28:03 +0100
@@ -176,6 +176,8 @@
   int i, e;
   unsigned char c;
   e = *(in++);
+  if (e == 0)
+    return 0;
   i = 0;
   while( (c = *(in++))!=0 ){
     if( c==1 ){

--- NEW FILE: sqlite.patch.v3 ---
Index: Makefile.in
--- Makefile.in.orig	2008-10-14 20:07:37 +0200
+++ Makefile.in	2008-10-15 19:59:08 +0200
@@ -179,6 +179,30 @@
 LIBOBJ = $(OBJS$(USE_AMALGAMATION))
 
 
+# FTS1 support
+ifdef FTS1
+TCC    += -DSQLITE_ENABLE_FTS1 -I$(TOP)/ext/fts1
+LIBOBJ += fts1.lo fts1_hash.lo fts1_porter.lo fts1_tokenizer1.lo
+endif
+
+# FTS2 support
+ifdef FTS2
+TCC    += -DSQLITE_ENABLE_FTS2 -I$(TOP)/ext/fts2
+LIBOBJ += fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer1.lo
+endif
+
+# FTS3 support
+ifdef FTS3
+TCC    += -DSQLITE_ENABLE_FTS3 -I$(TOP)/ext/fts3
+LIBOBJ += fts3.lo fts3_hash.lo fts3_porter.lo fts3_icu.lo fts3_tokenizer1.lo fts3_tokenizer.lo
+endif
+
+# RTREE support
+ifdef RTREE
+TCC    += -DSQLITE_ENABLE_RTREE -I$(TOP)/ext/rtree
+LIBOBJ += rtree.lo
+endif
+
 # All of the source code files.
 #
 SRC = \
@@ -786,3 +810,38 @@
 sqlite3.dll: $(REAL_LIBOBJ) sqlite3.def
 	$(TCC) -shared -o $@ sqlite3.def \
 		-Wl,"--strip-all" $(REAL_LIBOBJ)
+
+fts1.lo:	$(TOP)/ext/fts1/fts1.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1.c
+fts1_hash.lo:	$(TOP)/ext/fts1/fts1_hash.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_hash.c
+fts1_porter.lo:	$(TOP)/ext/fts1/fts1_porter.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_porter.c
+fts1_tokenizer1.lo:	$(TOP)/ext/fts1/fts1_tokenizer1.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_tokenizer1.c
+
+fts2.lo:	$(TOP)/ext/fts2/fts2.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2.c
+fts2_hash.lo:	$(TOP)/ext/fts2/fts2_hash.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_hash.c
+fts2_porter.lo:	$(TOP)/ext/fts2/fts2_porter.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_porter.c
+fts2_tokenizer1.lo:	$(TOP)/ext/fts2/fts2_tokenizer1.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_tokenizer1.c
+
+fts3.lo:	$(TOP)/ext/fts3/fts3.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3.c
+fts3_hash.lo:	$(TOP)/ext/fts3/fts3_hash.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_hash.c
+fts3_icu.lo:	$(TOP)/ext/fts3/fts3_icu.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_icu.c
+fts3_porter.lo:	$(TOP)/ext/fts3/fts3_porter.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_porter.c
+fts3_tokenizer.lo:	$(TOP)/ext/fts3/fts3_tokenizer.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_tokenizer.c
+fts3_tokenizer1.lo:	$(TOP)/ext/fts3/fts3_tokenizer1.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_tokenizer1.c
+
+rtree.lo:	$(TOP)/ext/rtree/rtree.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/rtree/rtree.c
+
Index: sqlite3.pc.in
--- sqlite3.pc.in.orig	2008-10-14 20:07:39 +0200
+++ sqlite3.pc.in	2008-10-15 19:59:34 +0200
@@ -8,6 +8,5 @@
 Name: SQLite
 Description: SQL database engine
 Version: @RELEASE@
-Libs: -L${libdir} -lsqlite3
-Libs.private: @LIBS@
+Libs: -L${libdir} -lsqlite3 @LIBS@
 Cflags: -I${includedir}

--- sqlite.patch DELETED ---