bpo-38380: Update macOS & Windows builds to SQLite v3.31.1 (GH-18678)

Automerge-Triggered-By: @zooba
(cherry picked from commit 1382c3289bcfd34ac6811fdf9aa5bc09ca8c320e)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 6c6c5d2048d19bf56f5f8e33ad7d07697ff4a2b3..81d3f4643f4411f9416d6de46465978b916dbded 100755 (executable)
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -313,9 +313,9 @@ def library_recipes():
                   ),
           ),
           dict(
-              name="SQLite 3.28.0",
-              url="https://www.sqlite.org/2019/sqlite-autoconf-3280000.tar.gz",
-              checksum='3c68eb400f8354605736cd55400e1572',
+              name="SQLite 3.31.1",
+              url="https://sqlite.org/2020/sqlite-autoconf-3310100.tar.gz",
+              checksum='2d0a553534c521504e3ac3ad3b90f125',
               extra_cflags=('-Os '
                             '-DSQLITE_ENABLE_FTS5 '
                             '-DSQLITE_ENABLE_FTS4 '

diff --git a/Misc/NEWS.d/next/Windows/2020-02-28-23-51-27.bpo-38380.TpOBCj.rst b/Misc/NEWS.d/next/Windows/2020-02-28-23-51-27.bpo-38380.TpOBCj.rst
new file mode 100644 (file)
index 0000000..521075d
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2020-02-28-23-51-27.bpo-38380.TpOBCj.rst
@@ -0,0 +1 @@
+Update Windows builds to use SQLite 3.31.1

diff --git a/Misc/NEWS.d/next/macOS/2020-02-28-23-51-47.bpo-38380.u-ySyA.rst b/Misc/NEWS.d/next/macOS/2020-02-28-23-51-47.bpo-38380.u-ySyA.rst
new file mode 100644 (file)
index 0000000..908281b
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2020-02-28-23-51-47.bpo-38380.u-ySyA.rst
@@ -0,0 +1 @@
+Update macOS builds to use SQLite 3.31.1

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 83596989e4f1fc384fb47115a88cab554dd8a5c5..cbf193b665c52bf9e1f87e43352bfee4a3441c3b 100644 (file)
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -50,7 +50,7 @@ echo.Fetching external libraries...
 set libraries=
 set libraries=%libraries%                                       bzip2-1.0.6
 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.1d
-set libraries=%libraries%                                       sqlite-3.28.0.0
+set libraries=%libraries%                                       sqlite-3.31.1.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.9.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6

diff --git a/PCbuild/python.props b/PCbuild/python.props
index 6de150be02a5a1fcb0d3ec982bd0cea9cf2ba55f..7ff32a81b6a520f99aed6886ec97414917eff234 100644 (file)
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -46,7 +46,7 @@
     <ExternalsDir>$(EXTERNALS_DIR)</ExternalsDir>
     <ExternalsDir Condition="$(ExternalsDir) == ''">$([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`))</ExternalsDir>
     <ExternalsDir Condition="!HasTrailingSlash($(ExternalsDir))">$(ExternalsDir)\</ExternalsDir>
-    <sqlite3Dir>$(ExternalsDir)sqlite-3.28.0.0\</sqlite3Dir>
+    <sqlite3Dir>$(ExternalsDir)sqlite-3.31.1.0\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <lzmaDir>$(ExternalsDir)xz-5.2.2\</lzmaDir>
     <opensslDir>$(ExternalsDir)openssl-1.1.1d\</opensslDir>

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 664e97f3111b58b8d3ebc36be24d60291203143c..9c521fa52d8981c1f19b5e48849b2036a89ad075 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -184,7 +184,7 @@ _ssl
     again when building.
 
 _sqlite3
-    Wraps SQLite 3.28.0.0, which is itself built by sqlite3.vcxproj
+    Wraps SQLite 3.31.1.0, which is itself built by sqlite3.vcxproj
     Homepage:
         http://www.sqlite.org/
 _tkinter