| Index: third_party/sqlite/patches/0005-Custom-shell.c-helpers-to-load-Chromium-s-ICU-data.patch
|
| diff --git a/third_party/sqlite/patches/0006-Custom-shell.c-helpers-to-load-Chromium-s-ICU-data.patch b/third_party/sqlite/patches/0005-Custom-shell.c-helpers-to-load-Chromium-s-ICU-data.patch
|
| similarity index 90%
|
| rename from third_party/sqlite/patches/0006-Custom-shell.c-helpers-to-load-Chromium-s-ICU-data.patch
|
| rename to third_party/sqlite/patches/0005-Custom-shell.c-helpers-to-load-Chromium-s-ICU-data.patch
|
| index 873c4688a614c0b6735b93b6962ea3485665b750..355684cf96c0bd6408cf937d105895e5a248b7dd 100644
|
| --- a/third_party/sqlite/patches/0006-Custom-shell.c-helpers-to-load-Chromium-s-ICU-data.patch
|
| +++ b/third_party/sqlite/patches/0005-Custom-shell.c-helpers-to-load-Chromium-s-ICU-data.patch
|
| @@ -1,7 +1,7 @@
|
| -From 5628b1aa2f0207924e6c39f46266b396a7fe374c Mon Sep 17 00:00:00 2001
|
| +From 8802205af36bcbcbeeac3c32d6dd292dda6f4344 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 06/13] Custom shell.c helpers to load Chromium's ICU data.
|
| +Subject: [PATCH 05/10] 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.
|
| @@ -18,10 +18,10 @@ Original review URL: https://codereview.chromium.org/42250
|
| create mode 100644 third_party/sqlite/src/src/shell_icu_win.c
|
|
|
| diff --git a/third_party/sqlite/src/Makefile.linux-gcc b/third_party/sqlite/src/Makefile.linux-gcc
|
| -index 952e8d1..30ac8bb 100644
|
| +index a1dec21affea..c59886b087e2 100644
|
| --- a/third_party/sqlite/src/Makefile.linux-gcc
|
| +++ b/third_party/sqlite/src/Makefile.linux-gcc
|
| -@@ -81,6 +81,13 @@ OPTS += -DSQLITE_MEMDEBUG=1
|
| +@@ -77,6 +77,13 @@ OPTS += -DSQLITE_MEMDEBUG=1
|
| # TODO(shess) I can't see why I need this setting.
|
| OPTS += -DOS_UNIX=1
|
|
|
| @@ -36,10 +36,10 @@ index 952e8d1..30ac8bb 100644
|
| # Nothing for unix.
|
| #
|
| diff --git a/third_party/sqlite/src/main.mk b/third_party/sqlite/src/main.mk
|
| -index 26f9f15..3ff3647 100644
|
| +index b46c5bbc9ced..a8e8ffe27562 100644
|
| --- a/third_party/sqlite/src/main.mk
|
| +++ b/third_party/sqlite/src/main.mk
|
| -@@ -476,7 +476,7 @@ libsqlite3.a: $(LIBOBJ)
|
| +@@ -498,7 +498,7 @@ libsqlite3.a: $(LIBOBJ)
|
|
|
| sqlite3$(EXE): $(TOP)/src/shell.c libsqlite3.a sqlite3.h
|
| $(TCCX) $(READLINE_FLAGS) -o sqlite3$(EXE) $(SHELL_OPT) \
|
| @@ -49,10 +49,10 @@ index 26f9f15..3ff3647 100644
|
| sqldiff$(EXE): $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h
|
| $(TCCX) -o sqldiff$(EXE) -DSQLITE_THREADSAFE=0 \
|
| diff --git a/third_party/sqlite/src/src/shell.c b/third_party/sqlite/src/src/shell.c
|
| -index b7a7abc..b1d5087 100644
|
| +index 0e553d9fbb6f..33377da521d3 100644
|
| --- a/third_party/sqlite/src/src/shell.c
|
| +++ b/third_party/sqlite/src/src/shell.c
|
| -@@ -4645,6 +4645,16 @@ int SQLITE_CDECL main(int argc, char **argv){
|
| +@@ -5849,6 +5849,16 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
|
| }
|
| #endif
|
|
|
| @@ -71,7 +71,7 @@ index b7a7abc..b1d5087 100644
|
| ** 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
|
| +index 000000000000..4ad0e42d2293
|
| --- /dev/null
|
| +++ b/third_party/sqlite/src/src/shell_icu_linux.c
|
| @@ -0,0 +1,27 @@
|
| @@ -104,7 +104,7 @@ index 0000000..4ad0e42
|
| +}
|
| diff --git a/third_party/sqlite/src/src/shell_icu_win.c b/third_party/sqlite/src/src/shell_icu_win.c
|
| new file mode 100644
|
| -index 0000000..67ebbf4
|
| +index 000000000000..67ebbf4fbdb4
|
| --- /dev/null
|
| +++ b/third_party/sqlite/src/src/shell_icu_win.c
|
| @@ -0,0 +1,32 @@
|
| @@ -141,5 +141,5 @@ index 0000000..67ebbf4
|
| + return 1;
|
| +}
|
| --
|
| -2.5.0
|
| +2.11.0
|
|
|
|
|