From bbad296bbc2d5d4cb5e3d7626023d75a03a6857c Mon Sep 17 00:00:00 2001 From: Osyotr Date: Tue, 23 Jan 2024 22:46:26 +0300 Subject: [PATCH] [sqlite3] Update to 3.45.0, add windows version info (#36302) --- ports/sqlite3/CMakeLists.txt | 3 ++- ports/sqlite3/portfile.cmake | 6 +++--- ports/sqlite3/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/sqlite3.json | 5 +++++ 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ports/sqlite3/CMakeLists.txt b/ports/sqlite3/CMakeLists.txt index f8e6ba6422..1144965d11 100644 --- a/ports/sqlite3/CMakeLists.txt +++ b/ports/sqlite3/CMakeLists.txt @@ -7,7 +7,7 @@ option(SQLITE3_SKIP_TOOLS "Disable build sqlite3 executable" OFF) set(PKGCONFIG_LIBS_PRIVATE "") -add_library(sqlite3 sqlite3.c) +add_library(sqlite3 sqlite3.c sqlite3.rc) target_include_directories(sqlite3 PUBLIC $ $) @@ -17,6 +17,7 @@ target_compile_definitions( $<$:SQLITE_DEBUG=1> $<$:SQLITE_ENABLE_SELECTTRACE> $<$:SQLITE_ENABLE_WHERETRACE> + $<$:RC_VERONLY> ) if (BUILD_SHARED_LIBS) diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index d5166f92fb..4dc157bb94 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -2,9 +2,9 @@ string(REGEX REPLACE "^([0-9]+)[.]([0-9]+)[.]([0-9]+)[.]([0-9]+)" "\\1,0\\2,0\\3 string(REGEX REPLACE "^([0-9]+),0*([0-9][0-9]),0*([0-9][0-9]),0*([0-9][0-9])," "\\1\\2\\3\\4" SQLITE_VERSION "${SQLITE_VERSION}") vcpkg_download_distfile(ARCHIVE - URLS "https://sqlite.org/2023/sqlite-amalgamation-${SQLITE_VERSION}.zip" - FILENAME "sqlite-amalgamation-${SQLITE_VERSION}.zip" - SHA512 5ef0e65ee92a088187376fa82ccb182dffa35391dd4dbcb3fafeb0a6f1602ced1e212753837079a9cad007d73d3f5b8a67ca1a6596eba6cf0c695052fa307392 + URLS "https://sqlite.org/2024/sqlite-autoconf-${SQLITE_VERSION}.tar.gz" + FILENAME "sqlite-autoconf-${SQLITE_VERSION}.zip" + SHA512 40ae9ba1dea234aacfecf44a6b1c0713c24348d8d475503c11f1d92ed2fffb54a765bbd0669f39aa09d20f42cbcfac4dedcf7e64f4421b8762eebfc66399aa9a ) vcpkg_extract_source_archive( diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json index 7011b3e553..fe6ec52560 100644 --- a/ports/sqlite3/vcpkg.json +++ b/ports/sqlite3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sqlite3", - "version": "3.43.2", - "port-version": 1, + "version": "3.45.0", "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", "homepage": "https://sqlite.org/", "license": "blessing", diff --git a/versions/baseline.json b/versions/baseline.json index d88441cdf0..3bd803cf95 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8209,8 +8209,8 @@ "port-version": 1 }, "sqlite3": { - "baseline": "3.43.2", - "port-version": 1 + "baseline": "3.45.0", + "port-version": 0 }, "sqlitecpp": { "baseline": "3.3.1", diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json index c4b99c07c7..d75987b3f5 100644 --- a/versions/s-/sqlite3.json +++ b/versions/s-/sqlite3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "537fe5086cb7cad8b2c24f4182b0777b81d7c175", + "version": "3.45.0", + "port-version": 0 + }, { "git-tree": "73056e20fb351b2c6978b351c74112223791eb25", "version": "3.43.2",