]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-46907: Update Windows installer to SQLite 3.38.3. (GH-91995)
authorMariusz Felisiak <felisiak.mariusz@gmail.com>
Mon, 2 May 2022 15:02:54 +0000 (17:02 +0200)
committerGitHub <noreply@github.com>
Mon, 2 May 2022 15:02:54 +0000 (16:02 +0100)
Misc/NEWS.d/next/Windows/2022-04-27-19-36-56.bpo-46907.lfurlP.rst [new file with mode: 0644]
PCbuild/get_externals.bat
PCbuild/python.props
PCbuild/readme.txt
PCbuild/sqlite3.vcxproj

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 (file)
index 0000000..88ea9f9
--- /dev/null
@@ -0,0 +1 @@
+Update Windows installer to use SQLite 3.38.3.
index 35646edb2e9e8d7ef05fcd5d337a9105db7408d5..4241baadec4bd0d8f9718797e95b704576f9ffa1 100644 (file)
@@ -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
index baa6526378a75d88b99ad5f23263454ab1467a2d..e50fdc0aa61f35ec46f7cae33e34d117337a2242 100644 (file)
@@ -61,7 +61,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.38.2.0\</sqlite3Dir>
+    <sqlite3Dir>$(ExternalsDir)sqlite-3.38.3.0\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.8\</bz2Dir>
     <lzmaDir>$(ExternalsDir)xz-5.2.5\</lzmaDir>
     <libffiDir>$(ExternalsDir)libffi-3.4.2\</libffiDir>
index 4c99b867c52bddcaed2fb2660096a8479bbfe72e..da8947c938b51a44b4498ecbaea1657105c7f368 100644 (file)
@@ -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
index 310795c4e4d2023d8a7e33b6c3a3322453c50bff..c502d51833b91aa34001a062087249eea7f69d28 100644 (file)
@@ -98,7 +98,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(sqlite3Dir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>SQLITE_ENABLE_MATH_FUNCTIONS;SQLITE_ENABLE_JSON1;SQLITE_ENABLE_FTS4;SQLITE_ENABLE_FTS5;SQLITE_ENABLE_RTREE;SQLITE_OMIT_AUTOINIT;SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>SQLITE_ENABLE_MATH_FUNCTIONS;SQLITE_ENABLE_FTS4;SQLITE_ENABLE_FTS5;SQLITE_ENABLE_RTREE;SQLITE_OMIT_AUTOINIT;SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level1</WarningLevel>
     </ClCompile>
     <ResourceCompile>