From 757ecc97eeb1eb49dca526333fb30fbc4edc213b Mon Sep 17 00:00:00 2001 From: Tomasz Kalisiak Date: Wed, 28 May 2025 09:26:11 +0200 Subject: [PATCH] [sqlitecpp] Upgrade to 3.3.3 (#45547) --- ports/sqlitecpp/fix_dependency.patch | 8 ++++---- ports/sqlitecpp/portfile.cmake | 2 +- ports/sqlitecpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sqlitecpp.json | 5 +++++ 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ports/sqlitecpp/fix_dependency.patch b/ports/sqlitecpp/fix_dependency.patch index 2277ca6e0b..79fe8b8134 100644 --- a/ports/sqlitecpp/fix_dependency.patch +++ b/ports/sqlitecpp/fix_dependency.patch @@ -1,21 +1,21 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index df5693d..e5723d0 100644 +index 50362fb..5d7c22f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -295,9 +295,9 @@ else (SQLITECPP_INTERNAL_SQLITE) +@@ -325,9 +325,9 @@ else (SQLITECPP_INTERNAL_SQLITE) target_link_libraries(SQLiteCpp PRIVATE ${sqlcipher_LIBRARY}) endif() else() - find_package (SQLite3 REQUIRED) + find_package (unofficial-sqlite3 CONFIG) - message(STATUS "Link to sqlite3 system library") + message(STATUS "Link to sqlite3 system library ${SQLite3_VERSION}") - target_link_libraries(SQLiteCpp PUBLIC SQLite::SQLite3) + target_link_libraries(SQLiteCpp PRIVATE unofficial::sqlite3::sqlite3) if(SQLite3_VERSION VERSION_LESS "3.19") set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT") endif() diff --git a/cmake/SQLiteCppConfig.cmake.in b/cmake/SQLiteCppConfig.cmake.in -index 2b48df4..d0feda9 100644 +index 7d0941c..d0feda9 100644 --- a/cmake/SQLiteCppConfig.cmake.in +++ b/cmake/SQLiteCppConfig.cmake.in @@ -1,6 +1,6 @@ diff --git a/ports/sqlitecpp/portfile.cmake b/ports/sqlitecpp/portfile.cmake index bedd84603f..fb749fce18 100644 --- a/ports/sqlitecpp/portfile.cmake +++ b/ports/sqlitecpp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO "SRombauts/SQLiteCpp" REF ${VERSION} HEAD_REF master - SHA512 e65695765756570d3b2df9151c968f76d434b9ec1dbcffa71e6b58a0cad005dc60c03ac826269d0292ecda2ad2abfbf2acd1cb71fb11967f53ff58140ea133fd + SHA512 23193108faaca4c1c7b0a05178bfdbb772a4e14dc145af1b3a7b35efe05a94b07200bdd5551afde44ab5eb3c6aeabbd70cfb0d710dc2750a8280e06fba94c494 PATCHES fix_dependency.patch add_runtime_destination.patch diff --git a/ports/sqlitecpp/vcpkg.json b/ports/sqlitecpp/vcpkg.json index 4214ab8422..7f3baf69e3 100644 --- a/ports/sqlitecpp/vcpkg.json +++ b/ports/sqlitecpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sqlitecpp", - "version": "3.3.2", + "version": "3.3.3", "description": "SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper.", "homepage": "https://github.com/SRombauts/SQLiteCpp", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 1711199bd3..0c23556e49 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8965,7 +8965,7 @@ "port-version": 0 }, "sqlitecpp": { - "baseline": "3.3.2", + "baseline": "3.3.3", "port-version": 0 }, "sqlpp11": { diff --git a/versions/s-/sqlitecpp.json b/versions/s-/sqlitecpp.json index fed1de2120..c5490be0de 100644 --- a/versions/s-/sqlitecpp.json +++ b/versions/s-/sqlitecpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d0741a4558bd9187854a03140417fcdf2679941", + "version": "3.3.3", + "port-version": 0 + }, { "git-tree": "5ae20f010448408508d0ec198f3166f6f9794f69", "version": "3.3.2",