Index: third_party/sqlite/patches/0007-Custom-shell.c-helpers-to-load-Chromium-s-ICU-data.patch |
diff --git a/third_party/sqlite/patches/0009-Custom-shell.c-helpers-to-load-Chromium-s-ICU-data.patch b/third_party/sqlite/patches/0007-Custom-shell.c-helpers-to-load-Chromium-s-ICU-data.patch |
similarity index 88% |
rename from third_party/sqlite/patches/0009-Custom-shell.c-helpers-to-load-Chromium-s-ICU-data.patch |
rename to third_party/sqlite/patches/0007-Custom-shell.c-helpers-to-load-Chromium-s-ICU-data.patch |
index a8d2ad0d8cf27ceead97cfce4254a9b3cd9a70c6..48cf68c262c2ac4e56505bfb56099e9bb8fe3261 100644 |
--- a/third_party/sqlite/patches/0009-Custom-shell.c-helpers-to-load-Chromium-s-ICU-data.patch |
+++ b/third_party/sqlite/patches/0007-Custom-shell.c-helpers-to-load-Chromium-s-ICU-data.patch |
@@ -1,7 +1,7 @@ |
-From 787cbd4344a6ab9c5915b77dfd02f91697f60b01 Mon Sep 17 00:00:00 2001 |
+From c7020c4c8f2e786436804819d11ca2e4b9878a5f Mon Sep 17 00:00:00 2001 |
From: "tc@google.com" <tc@google.com> |
Date: Tue, 6 Jan 2009 22:39:41 +0000 |
-Subject: [PATCH 09/23] Custom shell.c helpers to load Chromium's ICU data. |
+Subject: [PATCH 07/16] Custom shell.c helpers to load Chromium's ICU data. |
History uses fts3 with an icu-based segmenter. These changes allow building a |
sqlite3 binary for Linux or Windows which can read those files. |
@@ -36,10 +36,10 @@ index e631816..f60f1a1 100644 |
# Nothing for unix. |
# |
diff --git a/third_party/sqlite/src/main.mk b/third_party/sqlite/src/main.mk |
-index 65dd690..d20103f 100644 |
+index 2189fd6..54b5b35 100644 |
--- a/third_party/sqlite/src/main.mk |
+++ b/third_party/sqlite/src/main.mk |
-@@ -358,7 +358,7 @@ libsqlite3.a: $(LIBOBJ) |
+@@ -395,7 +395,7 @@ libsqlite3.a: $(LIBOBJ) |
sqlite3$(EXE): $(TOP)/src/shell.c libsqlite3.a sqlite3.h |
$(TCCX) $(READLINE_FLAGS) -o sqlite3$(EXE) \ |
@@ -47,14 +47,14 @@ index 65dd690..d20103f 100644 |
+ $(TOP)/src/shell.c $(SHELL_ICU) \ |
libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB) |
- # This target creates a directory named "tsrc" and fills it with |
+ mptester$(EXE): sqlite3.c $(TOP)/mptest/mptest.c |
diff --git a/third_party/sqlite/src/src/shell.c b/third_party/sqlite/src/src/shell.c |
-index aab70b2..ffb4698 100644 |
+index 3ca4b09..0951481 100644 |
--- a/third_party/sqlite/src/src/shell.c |
+++ b/third_party/sqlite/src/src/shell.c |
-@@ -2663,6 +2663,16 @@ int main(int argc, char **argv){ |
- int i; |
- int rc = 0; |
+@@ -3963,6 +3963,16 @@ int main(int argc, char **argv){ |
+ signal(SIGINT, interrupt_handler); |
+ #endif |
+ /* Begin evanm patch. */ |
+#if !defined(__APPLE__) |
@@ -66,9 +66,9 @@ index aab70b2..ffb4698 100644 |
+#endif /* !defined(__APPLE__) */ |
+ /* End evanm patch. */ |
+ |
- Argv0 = argv[0]; |
- main_init(&data); |
- stdin_is_interactive = isatty(0); |
+ /* Do an initial pass through the command-line argument to locate |
+ ** the name of the database file, the name of the initialization file, |
+ ** the size of the alternative malloc heap, |
diff --git a/third_party/sqlite/src/src/shell_icu_linux.c b/third_party/sqlite/src/src/shell_icu_linux.c |
new file mode 100644 |
index 0000000..4ad0e42 |