diff options
Diffstat (limited to 'dist/Android.patch')
| -rw-r--r-- | dist/Android.patch | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/dist/Android.patch b/dist/Android.patch index 307a832..7ecbecb 100644 --- a/dist/Android.patch +++ b/dist/Android.patch @@ -1,5 +1,5 @@ ---- orig/shell.c 2018-04-17 11:53:05.520972146 +0100 -+++ shell.c 2019-03-14 19:26:19.523122555 +0000 +--- orig/shell.c 2019-06-11 15:05:36.341739007 -0700 ++++ shell.c 2019-06-11 15:05:36.401739332 -0700 @@ -87,6 +87,12 @@ #endif #include <ctype.h> @@ -13,33 +13,33 @@ #if !defined(_WIN32) && !defined(WIN32) # include <signal.h> -@@ -10389,6 +10395,23 @@ - editFunc, 0, 0); +@@ -11698,6 +11704,23 @@ sqlite3_create_function(p->db, "edit", 2, SQLITE_UTF8, 0, editFunc, 0, 0); + #endif + -+ // Begin Android Add -+ #ifndef NO_ANDROID_FUNCS -+ AIcu_initializeIcuOrDie(); -+ int err = register_localized_collators(p->db, "en_US", 0); -+ if (err != SQLITE_OK) { -+ fprintf(stderr, "register_localized_collators() failed\n"); -+ exit(1); -+ } -+ err = register_android_functions(p->db, 0); -+ if (err != SQLITE_OK) { -+ fprintf(stderr, "register_android_functions() failed\n"); -+ exit(1); -+ } -+ #endif -+ // End Android Add ++// Begin Android Add ++#ifndef NO_ANDROID_FUNCS ++ AIcu_initializeIcuOrDie(); ++ int err = register_localized_collators(p->db, "en_US", 0); ++ if (err != SQLITE_OK) { ++ fprintf(stderr, "register_localized_collators() failed\n"); ++ exit(1); ++ } ++ err = register_android_functions(p->db, 0); ++ if (err != SQLITE_OK) { ++ fprintf(stderr, "register_android_functions() failed\n"); ++ exit(1); ++ } ++#endif ++// End Android Add + if( p->openMode==SHELL_OPEN_ZIPFILE ){ char *zSql = sqlite3_mprintf( "CREATE VIRTUAL TABLE zip USING zipfile(%Q);", p->zDbFilename); ---- orig/sqlite3.c 2019-03-11 19:52:44.237549639 +0000 -+++ sqlite3.c 2019-03-11 19:52:44.293549396 +0000 -@@ -30672,6 +30672,10 @@ +--- orig/sqlite3.c 2019-06-11 15:05:36.393739289 -0700 ++++ sqlite3.c 2019-06-11 15:05:36.449739593 -0700 +@@ -32438,6 +32438,10 @@ # include <sys/mount.h> #endif @@ -50,7 +50,7 @@ #ifdef HAVE_UTIME # include <utime.h> #endif -@@ -31422,6 +31426,12 @@ +@@ -33197,6 +33201,12 @@ #if defined(FD_CLOEXEC) && (!defined(O_CLOEXEC) || O_CLOEXEC==0) osFcntl(fd, F_SETFD, osFcntl(fd, F_GETFD, 0) | FD_CLOEXEC); #endif @@ -63,7 +63,7 @@ } return fd; } -@@ -31954,7 +31964,13 @@ +@@ -33777,7 +33787,13 @@ ** and move on. */ static void robust_close(unixFile *pFile, int h, int lineno){ @@ -77,7 +77,7 @@ unixLogErrorAtLine(SQLITE_IOERR_CLOSE, "close", pFile ? pFile->zPath : 0, lineno); } -@@ -34428,7 +34444,7 @@ +@@ -36310,7 +36326,7 @@ SimulateIOError( rc=1 ); if( rc!=0 ){ storeLastErrno((unixFile*)id, errno); @@ -86,7 +86,7 @@ } *pSize = buf.st_size; -@@ -34464,7 +34480,7 @@ +@@ -36346,7 +36362,7 @@ struct stat buf; /* Used to hold return values of fstat() */ if( osFstat(pFile->h, &buf) ){ @@ -95,7 +95,7 @@ } nSize = ((nByte+pFile->szChunk-1) / pFile->szChunk) * pFile->szChunk; -@@ -35139,7 +35155,7 @@ +@@ -37032,7 +37048,7 @@ ** with the same permissions. */ if( osFstat(pDbFd->h, &sStat) ){ @@ -104,7 +104,7 @@ goto shm_open_err; } -@@ -118054,7 +118070,7 @@ +@@ -123984,7 +124000,7 @@ } if( pDb->pSchema->file_format>SQLITE_MAX_FILE_FORMAT ){ sqlite3SetString(pzErrMsg, db, "unsupported file format"); @@ -113,7 +113,7 @@ goto initone_error_out; } -@@ -152769,13 +152785,25 @@ +@@ -164271,13 +164287,25 @@ ** module with sqlite. */ if( SQLITE_OK==rc |