diff --git a/deps/defines.gypi b/deps/defines.gypi index 51aaafe1e..3ab1b7997 100644 --- a/deps/defines.gypi +++ b/deps/defines.gypi @@ -17,13 +17,10 @@ 'SQLITE_DQS=0', 'SQLITE_ENABLE_COLUMN_METADATA', 'SQLITE_ENABLE_DBSTAT_VTAB', - 'SQLITE_ENABLE_DESERIALIZE', 'SQLITE_ENABLE_FTS3', 'SQLITE_ENABLE_FTS3_PARENTHESIS', - 'SQLITE_ENABLE_FTS4', 'SQLITE_ENABLE_FTS5', 'SQLITE_ENABLE_GEOPOLY', - 'SQLITE_ENABLE_JSON1', 'SQLITE_ENABLE_MATH_FUNCTIONS', 'SQLITE_ENABLE_RTREE', 'SQLITE_ENABLE_STAT4', @@ -36,6 +33,5 @@ 'SQLITE_SOUNDEX', 'SQLITE_THREADSAFE=2', 'SQLITE_TRACE_SIZE_LIMIT=32', - 'SQLITE_USE_URI=0', ], } diff --git a/deps/download.sh b/deps/download.sh index ccd203c93..f1e354872 100755 --- a/deps/download.sh +++ b/deps/download.sh @@ -38,13 +38,10 @@ SQLITE_DEFAULT_WAL_SYNCHRONOUS=1 SQLITE_DQS=0 SQLITE_ENABLE_COLUMN_METADATA SQLITE_ENABLE_DBSTAT_VTAB -SQLITE_ENABLE_DESERIALIZE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS -SQLITE_ENABLE_FTS4 SQLITE_ENABLE_FTS5 SQLITE_ENABLE_GEOPOLY -SQLITE_ENABLE_JSON1 SQLITE_ENABLE_MATH_FUNCTIONS SQLITE_ENABLE_RTREE SQLITE_ENABLE_STAT4 @@ -57,7 +54,6 @@ SQLITE_OMIT_TCL_VARIABLE SQLITE_SOUNDEX SQLITE_THREADSAFE=2 SQLITE_TRACE_SIZE_LIMIT=32 -SQLITE_USE_URI=0 " # ========== START SCRIPT ========== # @@ -90,12 +86,14 @@ cp sqlite3.c sqlite3.h sqlite3ext.h "$OUTPUT/" || exit 1 echo "applying patches..." cd "$DEPS" || exit 1 +shopt -s nullglob for patch in patches/*.patch; do # If a patch fails, just skip it an move on. # By default `patch` tries to be clever and reverse the patch, so we have to specify `--forward`. # If the patch fails, we # don't write .orig and .rej files, so we have to specify `--no-backup-if-mismatch` and `--reject-file=-`. patch --batch --forward --no-backup-if-mismatch --reject-file=- -p2 < "$patch" done +shopt -u nullglob echo "updating gyp configs..." GYP="$DEPS/defines.gypi" diff --git a/deps/patches/.gitkeep b/deps/patches/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/deps/patches/1208.patch b/deps/patches/1208.patch deleted file mode 100644 index 08d88ca56..000000000 --- a/deps/patches/1208.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/deps/sqlite3/sqlite3.c b/deps/sqlite3/sqlite3.c -index b1a807f..38bd1e6 100644 ---- a/deps/sqlite3/sqlite3.c -+++ b/deps/sqlite3/sqlite3.c -@@ -24887,8 +24887,8 @@ static const struct { - /* 1 */ { 6, "minute", 7.7379e+12, 60.0 }, - /* 2 */ { 4, "hour", 1.2897e+11, 3600.0 }, - /* 3 */ { 3, "day", 5373485.0, 86400.0 }, -- /* 4 */ { 5, "month", 176546.0, 30.0*86400.0 }, -- /* 5 */ { 4, "year", 14713.0, 365.0*86400.0 }, -+ /* 4 */ { 5, "month", 176546.0, 2592000.0 }, -+ /* 5 */ { 4, "year", 14713.0, 31536000.0 }, - }; - - /* diff --git a/docs/compilation.md b/docs/compilation.md index 4c9d2bba8..fbef3ce00 100644 --- a/docs/compilation.md +++ b/docs/compilation.md @@ -61,13 +61,10 @@ SQLITE_DEFAULT_WAL_SYNCHRONOUS=1 SQLITE_DQS=0 SQLITE_ENABLE_COLUMN_METADATA SQLITE_ENABLE_DBSTAT_VTAB -SQLITE_ENABLE_DESERIALIZE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS -SQLITE_ENABLE_FTS4 SQLITE_ENABLE_FTS5 SQLITE_ENABLE_GEOPOLY -SQLITE_ENABLE_JSON1 SQLITE_ENABLE_MATH_FUNCTIONS SQLITE_ENABLE_RTREE SQLITE_ENABLE_STAT4 @@ -80,5 +77,4 @@ SQLITE_OMIT_TCL_VARIABLE SQLITE_SOUNDEX SQLITE_THREADSAFE=2 SQLITE_TRACE_SIZE_LIMIT=32 -SQLITE_USE_URI=0 ```