Bladeren bron

improve FTS3/FTS4 support

Ralf S. Engelschall 13 jaren geleden
bovenliggende
commit
b67d1bada0
1 gewijzigde bestanden met toevoegingen van 13 en 13 verwijderingen
  1. 13 13
      sqlite/sqlite.patch

+ 13 - 13
sqlite/sqlite.patch

@@ -1,13 +1,13 @@
 Index: Makefile.in
---- Makefile.in.orig	2012-03-20 15:20:13.000000000 +0100
-+++ Makefile.in	2012-03-21 19:52:35.000000000 +0100
+--- Makefile.in.orig	2012-05-14 05:12:27.000000000 +0200
++++ Makefile.in	2012-05-14 20:54:52.000000000 +0200
 @@ -188,6 +188,21 @@
  #
  LIBOBJ = $(LIBOBJS$(USE_AMALGAMATION))
  
 +# FTS3 support
 +ifdef FTS3
-+TCC    += -DSQLITE_ENABLE_FTS3 -I$(TOP)/ext/fts3
++TCC    += -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -I$(TOP)/ext/fts3
 +endif
 +
 +# RTREE support
@@ -42,8 +42,8 @@ Index: Makefile.in
  # Rules to build the 'testfixture' application.
  #
 Index: configure
---- configure.orig	2012-03-20 15:20:13.000000000 +0100
-+++ configure	2012-03-21 19:52:35.000000000 +0100
+--- configure.orig	2012-05-14 05:12:27.000000000 +0200
++++ configure	2012-05-14 20:54:38.000000000 +0200
 @@ -6008,11 +6008,7 @@
  if $ac_preproc_ok; then
    :
@@ -58,8 +58,8 @@ Index: configure
  
  ac_ext=c
 Index: ext/regexp/regexp.c
---- ext/regexp/regexp.c.orig	2012-03-21 19:52:35.000000000 +0100
-+++ ext/regexp/regexp.c	2012-03-21 19:52:35.000000000 +0100
+--- ext/regexp/regexp.c.orig	2012-05-14 20:54:38.000000000 +0200
++++ ext/regexp/regexp.c	2012-05-14 20:54:38.000000000 +0200
 @@ -0,0 +1,147 @@
 +/*
 + * SQLite REGEXP(regex, string) function
@@ -209,8 +209,8 @@ Index: ext/regexp/regexp.c
 +#endif
 +
 Index: sqlite3.pc.in
---- sqlite3.pc.in.orig	2012-03-20 15:20:13.000000000 +0100
-+++ sqlite3.pc.in	2012-03-21 19:52:35.000000000 +0100
+--- sqlite3.pc.in.orig	2012-05-14 05:12:27.000000000 +0200
++++ sqlite3.pc.in	2012-05-14 20:54:38.000000000 +0200
 @@ -8,6 +8,5 @@
  Name: SQLite
  Description: SQL database engine
@@ -220,8 +220,8 @@ Index: sqlite3.pc.in
 +Libs: -L${libdir} -lsqlite3 @LIBS@
  Cflags: -I${includedir}
 Index: src/main.c
---- src/main.c.orig	2012-03-20 15:20:13.000000000 +0100
-+++ src/main.c	2012-03-21 19:52:35.000000000 +0100
+--- src/main.c.orig	2012-05-14 05:12:27.000000000 +0200
++++ src/main.c	2012-05-14 20:54:38.000000000 +0200
 @@ -2298,6 +2298,13 @@
    }
  #endif
@@ -237,8 +237,8 @@ Index: src/main.c
  
    /* -DSQLITE_DEFAULT_LOCKING_MODE=1 makes EXCLUSIVE the default locking
 Index: src/mem1.c
---- src/mem1.c.orig	2012-03-20 15:20:13.000000000 +0100
-+++ src/mem1.c	2012-03-21 19:54:18.000000000 +0100
+--- src/mem1.c.orig	2012-05-14 05:12:27.000000000 +0200
++++ src/mem1.c	2012-05-14 20:54:38.000000000 +0200
 @@ -87,7 +87,7 @@
  
  #if (defined(_MSC_VER) && !defined(SQLITE_WITHOUT_MSIZE)) \