From e6040604b3e12a2897274ed6c715c45eea524cb5 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Mon, 2 May 2022 17:02:54 +0200 Subject: [PATCH] bpo-46907: Update Windows installer to SQLite 3.38.3. (GH-91995) --- .../next/Windows/2022-04-27-19-36-56.bpo-46907.lfurlP.rst | 1 + PCbuild/get_externals.bat | 2 +- PCbuild/python.props | 2 +- PCbuild/readme.txt | 2 +- PCbuild/sqlite3.vcxproj | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 Misc/NEWS.d/next/Windows/2022-04-27-19-36-56.bpo-46907.lfurlP.rst diff --git a/Misc/NEWS.d/next/Windows/2022-04-27-19-36-56.bpo-46907.lfurlP.rst b/Misc/NEWS.d/next/Windows/2022-04-27-19-36-56.bpo-46907.lfurlP.rst new file mode 100644 index 00000000000..88ea9f93118 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2022-04-27-19-36-56.bpo-46907.lfurlP.rst @@ -0,0 +1 @@ +Update Windows installer to use SQLite 3.38.3. diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 35646edb2e9..4241baadec4 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -54,7 +54,7 @@ set libraries= set libraries=%libraries% bzip2-1.0.8 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.2 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1n -set libraries=%libraries% sqlite-3.38.2.0 +set libraries=%libraries% sqlite-3.38.3.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12.1 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.12.1 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6 diff --git a/PCbuild/python.props b/PCbuild/python.props index baa6526378a..e50fdc0aa61 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -61,7 +61,7 @@ $(EXTERNALS_DIR) $([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`)) $(ExternalsDir)\ - $(ExternalsDir)sqlite-3.38.2.0\ + $(ExternalsDir)sqlite-3.38.3.0\ $(ExternalsDir)bzip2-1.0.8\ $(ExternalsDir)xz-5.2.5\ $(ExternalsDir)libffi-3.4.2\ diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 4c99b867c52..da8947c938b 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -189,7 +189,7 @@ _ssl again when building. _sqlite3 - Wraps SQLite 3.38.2, which is itself built by sqlite3.vcxproj + Wraps SQLite 3.38.3, which is itself built by sqlite3.vcxproj Homepage: http://www.sqlite.org/ _tkinter diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj index 310795c4e4d..c502d51833b 100644 --- a/PCbuild/sqlite3.vcxproj +++ b/PCbuild/sqlite3.vcxproj @@ -98,7 +98,7 @@ $(sqlite3Dir);%(AdditionalIncludeDirectories) - SQLITE_ENABLE_MATH_FUNCTIONS;SQLITE_ENABLE_JSON1;SQLITE_ENABLE_FTS4;SQLITE_ENABLE_FTS5;SQLITE_ENABLE_RTREE;SQLITE_OMIT_AUTOINIT;SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) + SQLITE_ENABLE_MATH_FUNCTIONS;SQLITE_ENABLE_FTS4;SQLITE_ENABLE_FTS5;SQLITE_ENABLE_RTREE;SQLITE_OMIT_AUTOINIT;SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) Level1