From c85a0f1e778a9fe2421151926954e7b3ed172d83 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Sat, 23 May 2020 12:36:59 +0200 Subject: [PATCH 1/6] bpo-40741: Update Windows and macOS installers to use SQLite 3.32.1 --- Mac/BuildScript/build-installer.py | 6 +++--- .../next/Windows/2020-05-23-12-33-32.bpo-40741.HiDjF3.rst | 1 + .../next/macOS/2020-05-23-12-34-23.bpo-40741.mRnhCM.rst | 1 + PCbuild/get_externals.bat | 2 +- PCbuild/python.props | 2 +- PCbuild/readme.txt | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 Misc/NEWS.d/next/Windows/2020-05-23-12-33-32.bpo-40741.HiDjF3.rst create mode 100644 Misc/NEWS.d/next/macOS/2020-05-23-12-34-23.bpo-40741.mRnhCM.rst diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 76553c93a49570..6da5380a7b8faf 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -313,9 +313,9 @@ def library_recipes(): ), ), dict( - name="SQLite 3.31.1", - url="https://sqlite.org/2020/sqlite-autoconf-3310100.tar.gz", - checksum='2d0a553534c521504e3ac3ad3b90f125', + name="SQLite 3.32.1", + url="https://sqlite.org/2020/sqlite-autoconf-3320100.tar.gz", + checksum='bc7afc06f1e30b09ac930957af68d723', extra_cflags=('-Os ' '-DSQLITE_ENABLE_FTS5 ' '-DSQLITE_ENABLE_FTS4 ' diff --git a/Misc/NEWS.d/next/Windows/2020-05-23-12-33-32.bpo-40741.HiDjF3.rst b/Misc/NEWS.d/next/Windows/2020-05-23-12-33-32.bpo-40741.HiDjF3.rst new file mode 100644 index 00000000000000..4893ed8b4f0504 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2020-05-23-12-33-32.bpo-40741.HiDjF3.rst @@ -0,0 +1 @@ +Update Windows builds to use SQLite 3.32.1 diff --git a/Misc/NEWS.d/next/macOS/2020-05-23-12-34-23.bpo-40741.mRnhCM.rst b/Misc/NEWS.d/next/macOS/2020-05-23-12-34-23.bpo-40741.mRnhCM.rst new file mode 100644 index 00000000000000..71a4d29f568a64 --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2020-05-23-12-34-23.bpo-40741.mRnhCM.rst @@ -0,0 +1 @@ +Update macOS builds to use SQLite 3.32.1 diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index fa27cdf369d9a5..8fffc6efe00fca 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 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1f -set libraries=%libraries% sqlite-3.31.1.0 +set libraries=%libraries% sqlite-3.32.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 d1d16d61be8694..24c555f71349f3 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -56,7 +56,7 @@ $(EXTERNALS_DIR) $([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`)) $(ExternalsDir)\ - $(ExternalsDir)sqlite-3.31.1.0\ + $(ExternalsDir)sqlite-3.32.1.0\ $(ExternalsDir)bzip2-1.0.6\ $(ExternalsDir)xz-5.2.2\ $(ExternalsDir)libffi\ diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 4d4a706b8e4b96..c3fdcbef94b7f7 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -185,7 +185,7 @@ _ssl again when building. _sqlite3 - Wraps SQLite 3.31.1.0, which is itself built by sqlite3.vcxproj + Wraps SQLite 3.32.1.0, which is itself built by sqlite3.vcxproj Homepage: http://www.sqlite.org/ _tkinter From e0bb9e5efa41bac40c2ef4ff49c796fec7329aa7 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Mon, 8 Jun 2020 08:48:55 +0200 Subject: [PATCH 2/6] Remove macOS part from PR (see GH-20705) --- Mac/BuildScript/build-installer.py | 6 +++--- .../next/macOS/2020-05-23-12-34-23.bpo-40741.mRnhCM.rst | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 Misc/NEWS.d/next/macOS/2020-05-23-12-34-23.bpo-40741.mRnhCM.rst diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 6da5380a7b8faf..76553c93a49570 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -313,9 +313,9 @@ def library_recipes(): ), ), dict( - name="SQLite 3.32.1", - url="https://sqlite.org/2020/sqlite-autoconf-3320100.tar.gz", - checksum='bc7afc06f1e30b09ac930957af68d723', + 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/macOS/2020-05-23-12-34-23.bpo-40741.mRnhCM.rst b/Misc/NEWS.d/next/macOS/2020-05-23-12-34-23.bpo-40741.mRnhCM.rst deleted file mode 100644 index 71a4d29f568a64..00000000000000 --- a/Misc/NEWS.d/next/macOS/2020-05-23-12-34-23.bpo-40741.mRnhCM.rst +++ /dev/null @@ -1 +0,0 @@ -Update macOS builds to use SQLite 3.32.1 From a05a0e1b7d2f557eeee5a5dbcae327bfb104cdc7 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Mon, 8 Jun 2020 08:56:58 +0200 Subject: [PATCH 3/6] Bump Windows build to SQLite 3.32.2 --- .../next/Windows/2020-05-23-12-33-32.bpo-40741.HiDjF3.rst | 2 +- PCbuild/get_externals.bat | 2 +- PCbuild/python.props | 2 +- PCbuild/readme.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Misc/NEWS.d/next/Windows/2020-05-23-12-33-32.bpo-40741.HiDjF3.rst b/Misc/NEWS.d/next/Windows/2020-05-23-12-33-32.bpo-40741.HiDjF3.rst index 4893ed8b4f0504..30fde1d5c952c3 100644 --- a/Misc/NEWS.d/next/Windows/2020-05-23-12-33-32.bpo-40741.HiDjF3.rst +++ b/Misc/NEWS.d/next/Windows/2020-05-23-12-33-32.bpo-40741.HiDjF3.rst @@ -1 +1 @@ -Update Windows builds to use SQLite 3.32.1 +Update Windows builds to use SQLite 3.32.2 diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 8fffc6efe00fca..f9950310bb5f59 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 if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1f -set libraries=%libraries% sqlite-3.32.1.0 +set libraries=%libraries% sqlite-3.32.2.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 24c555f71349f3..624e32f690ca1e 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -56,7 +56,7 @@ $(EXTERNALS_DIR) $([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`)) $(ExternalsDir)\ - $(ExternalsDir)sqlite-3.32.1.0\ + $(ExternalsDir)sqlite-3.32.2.0\ $(ExternalsDir)bzip2-1.0.6\ $(ExternalsDir)xz-5.2.2\ $(ExternalsDir)libffi\ diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index c3fdcbef94b7f7..11596404ffb0cc 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -185,7 +185,7 @@ _ssl again when building. _sqlite3 - Wraps SQLite 3.32.1.0, which is itself built by sqlite3.vcxproj + Wraps SQLite 3.32.2.0, which is itself built by sqlite3.vcxproj Homepage: http://www.sqlite.org/ _tkinter From 1a9b7bef836c6702da7f7df10ff192513b2c1236 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Mon, 8 Jun 2020 08:58:48 +0200 Subject: [PATCH 4/6] Nitpick: End NEWS entry with a period --- .../next/Windows/2020-05-23-12-33-32.bpo-40741.HiDjF3.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Misc/NEWS.d/next/Windows/2020-05-23-12-33-32.bpo-40741.HiDjF3.rst b/Misc/NEWS.d/next/Windows/2020-05-23-12-33-32.bpo-40741.HiDjF3.rst index 30fde1d5c952c3..9df2b9e24539d8 100644 --- a/Misc/NEWS.d/next/Windows/2020-05-23-12-33-32.bpo-40741.HiDjF3.rst +++ b/Misc/NEWS.d/next/Windows/2020-05-23-12-33-32.bpo-40741.HiDjF3.rst @@ -1 +1 @@ -Update Windows builds to use SQLite 3.32.2 +Update Windows builds to use SQLite 3.32.2. From cf417e2dde77a1f16bcd41046d658a50717ffe58 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Mon, 8 Jun 2020 20:13:07 +0200 Subject: [PATCH 5/6] Update version number in PCbuild/readme.txt --- PCbuild/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 11596404ffb0cc..d5e140c333e88e 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -185,7 +185,7 @@ _ssl again when building. _sqlite3 - Wraps SQLite 3.32.2.0, which is itself built by sqlite3.vcxproj + Wraps SQLite 3.32.2, which is itself built by sqlite3.vcxproj Homepage: http://www.sqlite.org/ _tkinter From d93f22f3ef96d470df825d2d4c18faea4337fc67 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Mon, 8 Jun 2020 20:14:14 +0200 Subject: [PATCH 6/6] Prev. commit was just for kicking the CI This reverts commit cf417e2dde77a1f16bcd41046d658a50717ffe58. --- PCbuild/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index d5e140c333e88e..11596404ffb0cc 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -185,7 +185,7 @@ _ssl again when building. _sqlite3 - Wraps SQLite 3.32.2, which is itself built by sqlite3.vcxproj + Wraps SQLite 3.32.2.0, which is itself built by sqlite3.vcxproj Homepage: http://www.sqlite.org/ _tkinter