- Update to 3.4.2

- Now FTS1 and FTS2 works fine.

Repocopy from:	databases/sqlite3
Repocopied by:	marcus

7 files changed, 9 insertions, 87 deletions

diff --git a/databases/sqlite34/files/fts2_patch-Makefile.in b/databases/sqlite34/files/fts2_patch-Makefile.in
index b079a8501121..5809bcb9d6c2 100644
--- a/databases/sqlite34/files/fts2_patch-Makefile.in
+++ b/databases/sqlite34/files/fts2_patch-Makefile.in
@@ -1,16 +1,16 @@
 --- Makefile.in.orig	2007-06-28 09:46:18.000000000 -0300
-+++ Makefile.in	2007-08-10 08:47:35.000000000 -0300
++++ Makefile.in	2008-03-05 22:07:49.000000000 -0300
 @@ -128,7 +128,8 @@
           select.lo table.lo tokenize.lo trigger.lo update.lo \
           util.lo vacuum.lo \
           vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbefifo.lo vdbemem.lo \
 -         where.lo utf.lo legacy.lo vtab.lo
 +         where.lo utf.lo legacy.lo vtab.lo \
-+         fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer.lo fts2_tokenizer1.lo
++         fts2.lo fts2_hash.lo fts2_porter.lo fts2_icu.lo fts2_tokenizer.lo fts2_tokenizer1.lo
  
  # All of the source code files.
  #
-@@ -198,6 +199,15 @@
+@@ -198,6 +199,16 @@
    $(TOP)/ext/fts1/fts1_tokenizer.h \
    $(TOP)/ext/fts1/fts1_tokenizer1.c
  
@@ -20,13 +20,14 @@
 +  $(TOP)/ext/fts2/fts2_hash.c \
 +  $(TOP)/ext/fts2/fts2_hash.h \
 +  $(TOP)/ext/fts2/fts2_porter.c \
++  $(TOP)/ext/fts2/fts2_icu.c \
 +  $(TOP)/ext/fts2/fts2_tokenizer.c \
 +  $(TOP)/ext/fts2/fts2_tokenizer.h \
 +  $(TOP)/ext/fts2/fts2_tokenizer1.c
  
  # Source code to the test files.
  #
-@@ -261,6 +271,11 @@
+@@ -261,6 +272,11 @@
    $(TOP)/ext/fts1/fts1_hash.h \
    $(TOP)/ext/fts1/fts1_tokenizer.h
  
@@ -38,7 +39,7 @@
  # Header files used by the VDBE submodule
  #
  VDBEHDR = \
-@@ -482,6 +497,21 @@
+@@ -482,6 +498,24 @@
  where.lo:	$(TOP)/src/where.c $(HDR)
  	$(LTCOMPILE) -c $(TOP)/src/where.c
  
@@ -51,6 +52,9 @@
 +fts2_porter.lo:	$(TOP)/ext/fts2/fts2_porter.c $(HDR)
 +	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_porter.c
 +
++fts2_icu.lo:	$(TOP)/ext/fts2/fts2_icu.c $(HDR)
++	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_icu.c
++
 +fts2_tokenizer.lo:	$(TOP)/ext/fts2/fts2_tokenizer.c $(HDR)
 +	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_tokenizer.c
 +
diff --git a/databases/sqlite34/files/patch-ext__fts1__fts1.c b/databases/sqlite34/files/patch-ext__fts1__fts1.c
deleted file mode 100644
index 8357e5832668..000000000000
--- a/databases/sqlite34/files/patch-ext__fts1__fts1.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ext/fts1/fts1.c.orig	Sun Oct  8 06:16:32 2006
-+++ ext/fts1/fts1.c	Sun Dec  3 14:44:46 2006
-@@ -19,11 +19,7 @@
- #endif
- 
- #include <assert.h>
--#if !defined(__APPLE__)
--#include <malloc.h>
--#else
- #include <stdlib.h>
--#endif
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
diff --git a/databases/sqlite34/files/patch-ext__fts1__fts1_porter.c b/databases/sqlite34/files/patch-ext__fts1__fts1_porter.c
deleted file mode 100644
index 6185bf94dcd5..000000000000
--- a/databases/sqlite34/files/patch-ext__fts1__fts1_porter.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ext/fts1/fts1_porter.c.orig	Sun Oct  1 13:01:13 2006
-+++ ext/fts1/fts1_porter.c	Sun Dec  3 14:45:17 2006
-@@ -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>
diff --git a/databases/sqlite34/files/patch-ext__fts1__fts1_tokenizer1.c b/databases/sqlite34/files/patch-ext__fts1__fts1_tokenizer1.c
deleted file mode 100644
index 438019e54f9d..000000000000
--- a/databases/sqlite34/files/patch-ext__fts1__fts1_tokenizer1.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ext/fts1/fts1_tokenizer1.c.orig	Sat Sep 30 08:57:33 2006
-+++ ext/fts1/fts1_tokenizer1.c	Sun Dec  3 14:45:56 2006
-@@ -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>
diff --git a/databases/sqlite34/files/patch-ext__fts2__fts2.c b/databases/sqlite34/files/patch-ext__fts2__fts2.c
deleted file mode 100644
index b68f8f3a4a64..000000000000
--- a/databases/sqlite34/files/patch-ext__fts2__fts2.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ext/fts2/fts2.c.orig	Fri Jun  8 12:31:37 2007
-+++ ext/fts2/fts2.c	Fri Jun  8 12:32:16 2007
-@@ -269,9 +269,6 @@
- #endif
- 
- #include <assert.h>
--#if !defined(__APPLE__)
--#include <malloc.h>
--#endif
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
diff --git a/databases/sqlite34/files/patch-ext__fts2__fts2_porter.c b/databases/sqlite34/files/patch-ext__fts2__fts2_porter.c
deleted file mode 100644
index 0ed308c4f012..000000000000
--- a/databases/sqlite34/files/patch-ext__fts2__fts2_porter.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ext/fts2/fts2_porter.c.orig	Fri Jun  8 12:31:44 2007
-+++ ext/fts2/fts2_porter.c	Fri Jun  8 12:32:21 2007
-@@ -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>
diff --git a/databases/sqlite34/files/patch-ext__fts2__fts2_tokenizer1.c b/databases/sqlite34/files/patch-ext__fts2__fts2_tokenizer1.c
deleted file mode 100644
index 1f539b950b31..000000000000
--- a/databases/sqlite34/files/patch-ext__fts2__fts2_tokenizer1.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ext/fts2/fts2_tokenizer1.c.orig	Fri Jun  8 12:31:51 2007
-+++ ext/fts2/fts2_tokenizer1.c	Fri Jun  8 12:32:26 2007
-@@ -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>