OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Jun-2007 18:12:32
Branch: HEAD Handle: 2007062017123100
Modified files:
openpkg-src/sqlite sqlite.patch sqlite.spec
Log:
add optional FTS2 support (Full Text Search 2)
Summary:
Revision Changes Path
1.33 +69 -11 openpkg-src/sqlite/sqlite.patch
1.142 +4 -0 openpkg-src/sqlite/sqlite.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sqlite/sqlite.patch
============================================================================
$ cvs diff -u -r1.32 -r1.33 sqlite.patch
--- openpkg-src/sqlite/sqlite.patch 20 Jun 2007 12:48:34 -0000 1.32
+++ openpkg-src/sqlite/sqlite.patch 20 Jun 2007 16:12:31 -0000 1.33
@@ -1,7 +1,7 @@
Index: Makefile.in
--- Makefile.in.orig 2007-06-14 22:54:38 +0200
-+++ Makefile.in 2007-06-18 19:20:18 +0200
-@@ -130,6 +130,12 @@
++++ Makefile.in 2007-06-20 18:09:00 +0200
+@@ -130,6 +130,18 @@
vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbefifo.lo vdbemem.lo \
where.lo utf.lo legacy.lo vtab.lo
@@ -11,10 +11,16 @@
+LIBOBJ += fts1.lo fts1_hash.lo fts1_porter.lo fts1_tokenizer1.lo
+endif
+
++# FTS2 support
++ifdef FTS2
++TCC += -DSQLITE_ENABLE_FTS2
++LIBOBJ += fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer1.lo
++endif
++
# All of the source code files.
#
SRC = \
-@@ -409,7 +415,7 @@
+@@ -409,7 +421,7 @@
cp $(TOP)/src/parse.y .
./lemon$(BEXE) $(OPTS) parse.y
mv parse.h parse.h.temp
@@ -23,7 +29,7 @@
pragma.lo: $(TOP)/src/pragma.c $(HDR)
$(LTCOMPILE) -c $(TOP)/src/pragma.c
-@@ -498,6 +504,14 @@
+@@ -498,6 +510,23 @@
-o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \
libsqlite3.la $(LIBTCL)
@@ -35,12 +41,21 @@
+ $(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
fulltest: testfixture$(TEXE) sqlite3$(TEXE)
./testfixture $(TOP)/test/all.test
Index: ext/fts1/fts1.c
--- ext/fts1/fts1.c.orig 2007-06-12 14:18:00 +0200
-+++ ext/fts1/fts1.c 2007-06-18 19:20:18 +0200
++++ ext/fts1/fts1.c 2007-06-20 18:09:00 +0200
@@ -19,11 +19,7 @@
#endif
@@ -55,7 +70,7 @@
#include <ctype.h>
Index: ext/fts1/fts1_porter.c
--- ext/fts1/fts1_porter.c.orig 2007-06-12 14:18:00 +0200
-+++ ext/fts1/fts1_porter.c 2007-06-18 19:20:18 +0200
++++ ext/fts1/fts1_porter.c 2007-06-20 18:09:00 +0200
@@ -26,11 +26,7 @@
@@ -70,7 +85,50 @@
#include <ctype.h>
Index: ext/fts1/fts1_tokenizer1.c
--- ext/fts1/fts1_tokenizer1.c.orig 2007-06-12 14:18:00 +0200
-+++ ext/fts1/fts1_tokenizer1.c 2007-06-18 19:20:18 +0200
++++ ext/fts1/fts1_tokenizer1.c 2007-06-20 18:09:00 +0200
+@@ -18,11 +18,7 @@
+
+
+ #include <assert.h>
+-#if !defined(__APPLE__)
+-#include <malloc.h>
+-#else
+ #include <stdlib.h>
+-#endif
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
+Index: ext/fts2/fts2.c
+--- ext/fts2/fts2.c.orig 2007-06-13 15:29:40 +0200
++++ ext/fts2/fts2.c 2007-06-20 18:10:05 +0200
+@@ -269,9 +269,6 @@
+ #endif
+
+ #include <assert.h>
+-#if !defined(__APPLE__)
+-#include <malloc.h>
+-#endif
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+Index: ext/fts2/fts2_porter.c
+--- ext/fts2/fts2_porter.c.orig 2007-06-12 14:18:00 +0200
++++ ext/fts2/fts2_porter.c 2007-06-20 18:09:35 +0200
+@@ -26,11 +26,7 @@
+
+
+ #include <assert.h>
+-#if !defined(__APPLE__)
+-#include <malloc.h>
+-#else
+ #include <stdlib.h>
+-#endif
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
+Index: ext/fts2/fts2_tokenizer1.c
+--- ext/fts2/fts2_tokenizer1.c.orig 2007-06-12 14:18:00 +0200
++++ ext/fts2/fts2_tokenizer1.c 2007-06-20 18:09:46 +0200
@@ -18,11 +18,7 @@
@@ -85,7 +143,7 @@
#include <ctype.h>
Index: sqlite3.pc.in
--- sqlite3.pc.in.orig 2004-07-19 06:25:47 +0200
-+++ sqlite3.pc.in 2007-06-18 19:20:18 +0200
++++ sqlite3.pc.in 2007-06-20 18:09:00 +0200
@@ -8,5 +8,5 @@
Name: SQLite
Description: SQL database engine
@@ -95,7 +153,7 @@
Cflags: -I${includedir}
Index: sqliteodbc-0.74/Makefile.in
--- sqliteodbc-0.74/Makefile.in.orig 2007-02-04 12:23:36 +0100
-+++ sqliteodbc-0.74/Makefile.in 2007-06-18 19:20:18 +0200
++++ sqliteodbc-0.74/Makefile.in 2007-06-20 18:09:00 +0200
@@ -6,7 +6,7 @@
CC = @CC@
INSTALL = @INSTALL@
@@ -121,8 +179,8 @@
uninstall-3:
$(LIBTOOL) --mode=uninstall \
Index: src/shell.c
---- src/shell.c 4 May 2007 13:15:56 -0000 1.162
-+++ src/shell.c 20 Jun 2007 12:43:54 -0000
+--- src/shell.c.orig 2007-06-12 14:18:01 +0200
++++ src/shell.c 2007-06-20 18:09:00 +0200
@@ -1753,6 +1753,7 @@
char *home_dir = NULL;
const char *sqliterc = sqliterc_override;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sqlite/sqlite.spec
============================================================================
$ cvs diff -u -r1.141 -r1.142 sqlite.spec
--- openpkg-src/sqlite/sqlite.spec 20 Jun 2007 12:48:34 -0000 1.141
+++ openpkg-src/sqlite/sqlite.spec 20 Jun 2007 16:12:31 -0000 1.142
@@ -45,6 +45,7 @@
%option with_readline no
%option with_threads no
%option with_fts1 no
+%option with_fts2 no
%option with_odbc no
# list of sources
@@ -145,6 +146,9 @@
%if "%{with_fts1}" == "yes"
MFLAGS="$MFLAGS FTS1=1"
%endif
+%if "%{with_fts2}" == "yes"
+ MFLAGS="$MFLAGS FTS2=1"
+%endif
%{l_make} %{l_mflags -O} $MFLAGS
# optionally build ODBC driver
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
