From 835211a10de680a81bac2bfd85a0c02ceb9fa50d Mon Sep 17 00:00:00 2001 From: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com> Date: Sat, 8 Jan 2022 18:10:31 +0530 Subject: [PATCH 1/4] bpo-45925: Update Windows and Mac installers to sqlite 3.37.2 --- Mac/BuildScript/build-installer.py | 6 +++--- PCbuild/get_externals.bat | 2 +- PCbuild/python.props | 2 +- PCbuild/readme.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 0f8924bb727402..7e89a3bc82ae24 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -358,9 +358,9 @@ def library_recipes(): ), ), dict( - name="SQLite 3.36.0", - url="https://sqlite.org/2021/sqlite-autoconf-3360000.tar.gz", - checksum='f5752052fc5b8e1b539af86a3671eac7', + name="SQLite 3.37.2", + url="https://sqlite.org/2022/sqlite-autoconf-3370200.tar.gz", + checksum='683cc5312ee74e71079c14d24b7a6d27', extra_cflags=('-Os ' '-DSQLITE_ENABLE_FTS5 ' '-DSQLITE_ENABLE_FTS4 ' diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 7126d8afd000b2..5b0fe640eb84e1 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -54,7 +54,7 @@ set libraries= set libraries=%libraries% bzip2-1.0.6 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.4.2 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1m -set libraries=%libraries% sqlite-3.36.0.0 +set libraries=%libraries% sqlite-3.37.2.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.12.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6 diff --git a/PCbuild/python.props b/PCbuild/python.props index 70827883f48385..c614c151c90343 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.36.0.0\ + $(ExternalsDir)sqlite-3.37.2.0\ $(ExternalsDir)bzip2-1.0.6\ $(ExternalsDir)xz-5.2.2\ $(ExternalsDir)libffi-3.4.2\ diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 26b42a803206cb..9f5a513445d5f3 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -189,7 +189,7 @@ _ssl again when building. _sqlite3 - Wraps SQLite 3.36.0, which is itself built by sqlite3.vcxproj + Wraps SQLite 3.37.2, which is itself built by sqlite3.vcxproj Homepage: http://www.sqlite.org/ _tkinter From ba97bfd3fbb292e00c867914b0c80b0de6f40175 Mon Sep 17 00:00:00 2001 From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com> Date: Sat, 8 Jan 2022 12:43:32 +0000 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?= =?UTF-8?q?rb=5Fit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Misc/NEWS.d/next/Build/2022-01-08-12-43-31.bpo-45925.38F3NO.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Build/2022-01-08-12-43-31.bpo-45925.38F3NO.rst diff --git a/Misc/NEWS.d/next/Build/2022-01-08-12-43-31.bpo-45925.38F3NO.rst b/Misc/NEWS.d/next/Build/2022-01-08-12-43-31.bpo-45925.38F3NO.rst new file mode 100644 index 00000000000000..0183ae5167c7f5 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2022-01-08-12-43-31.bpo-45925.38F3NO.rst @@ -0,0 +1 @@ +Updated Windows and Mac installers to sqlite 3.37.2. \ No newline at end of file From de087732e52336152022ed3bfe6f5b101461c37d Mon Sep 17 00:00:00 2001 From: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com> Date: Fri, 28 Jan 2022 11:03:24 +0530 Subject: [PATCH 3/4] Update Misc/NEWS.d/next/Build/2022-01-08-12-43-31.bpo-45925.38F3NO.rst Co-authored-by: Erlend Egeberg Aasland --- Misc/NEWS.d/next/Build/2022-01-08-12-43-31.bpo-45925.38F3NO.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Misc/NEWS.d/next/Build/2022-01-08-12-43-31.bpo-45925.38F3NO.rst b/Misc/NEWS.d/next/Build/2022-01-08-12-43-31.bpo-45925.38F3NO.rst index 0183ae5167c7f5..e802912bfcff71 100644 --- a/Misc/NEWS.d/next/Build/2022-01-08-12-43-31.bpo-45925.38F3NO.rst +++ b/Misc/NEWS.d/next/Build/2022-01-08-12-43-31.bpo-45925.38F3NO.rst @@ -1 +1 @@ -Updated Windows and Mac installers to sqlite 3.37.2. \ No newline at end of file +Update Windows installer to use SQLite 3.37.2. \ No newline at end of file From ec18ac593c5c50f7466f5a2c9e128b174be505df Mon Sep 17 00:00:00 2001 From: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com> Date: Fri, 28 Jan 2022 11:04:19 +0530 Subject: [PATCH 4/4] Update Mac/BuildScript/build-installer.py Co-authored-by: Erlend Egeberg Aasland --- Mac/BuildScript/build-installer.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 7e89a3bc82ae24..0f8924bb727402 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -358,9 +358,9 @@ def library_recipes(): ), ), dict( - name="SQLite 3.37.2", - url="https://sqlite.org/2022/sqlite-autoconf-3370200.tar.gz", - checksum='683cc5312ee74e71079c14d24b7a6d27', + name="SQLite 3.36.0", + url="https://sqlite.org/2021/sqlite-autoconf-3360000.tar.gz", + checksum='f5752052fc5b8e1b539af86a3671eac7', extra_cflags=('-Os ' '-DSQLITE_ENABLE_FTS5 ' '-DSQLITE_ENABLE_FTS4 '