From 314700af63365179819abe72d3714ab495941d43 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Tue, 22 Oct 2024 12:37:37 +0800 Subject: [PATCH] [sqlite-orm] update to 1.9 (#41660) --- ports/sqlite-orm/fix-uwp.patch | 16 ---------------- ports/sqlite-orm/portfile.cmake | 5 ++--- ports/sqlite-orm/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/sqlite-orm.json | 5 +++++ 5 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 ports/sqlite-orm/fix-uwp.patch diff --git a/ports/sqlite-orm/fix-uwp.patch b/ports/sqlite-orm/fix-uwp.patch deleted file mode 100644 index 736fee7a46..0000000000 --- a/ports/sqlite-orm/fix-uwp.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 945d275..8ca2de4 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -162,6 +162,11 @@ if (MSVC) - # C4458: declaration of 'symbol' hides class member - /wd4458) - endif() -+ if (CMAKE_CXX_FLAGS MATCHES "/D_UNICODE") -+ # explicitly set the entry point of the executable file, -+ # otherwise for some reason the linker will not pick up `wmain`, which is provided by the static Catch2 library -+ target_link_options(unit_tests PRIVATE "/ENTRY:wmainCRTStartup") -+ endif() - endif() - - target_precompile_headers(unit_tests PRIVATE diff --git a/ports/sqlite-orm/portfile.cmake b/ports/sqlite-orm/portfile.cmake index b6b1898509..94c5a1e4cf 100644 --- a/ports/sqlite-orm/portfile.cmake +++ b/ports/sqlite-orm/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fnc12/sqlite_orm - REF v1.8.2 - SHA512 65479c02246d96bfa0a6a5ed749e15650e71114c1145d17bd48f1a57560c9f494148253064f720dd43773ac9971a85635c9d4927f3b336590188339b3d656b33 + REF "v${VERSION}" + SHA512 a9a31b534d9374364672d698a1d08ba3d0b2c06d91a3fc38c3fcf73eb2efc272f118bb05c5b4ea720ceac01f54ee02debd86de31cad645001ed2b8db943ebe33 HEAD_REF master PATCHES fix-dependency.patch - fix-uwp.patch #https://github.com/fnc12/sqlite_orm/pull/1295 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/sqlite-orm/vcpkg.json b/ports/sqlite-orm/vcpkg.json index 35b9dae65e..8a46f21f9f 100644 --- a/ports/sqlite-orm/vcpkg.json +++ b/ports/sqlite-orm/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sqlite-orm", - "version": "1.8.2", - "port-version": 2, + "version": "1.9", "description": "SQLite ORM light header only library for modern C++", "homepage": "https://github.com/fnc12/sqlite_orm", "license": "AGPL-3.0-or-later OR MIT", diff --git a/versions/baseline.json b/versions/baseline.json index d74289c58d..9ecd0e0140 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8573,8 +8573,8 @@ "port-version": 0 }, "sqlite-orm": { - "baseline": "1.8.2", - "port-version": 2 + "baseline": "1.9", + "port-version": 0 }, "sqlite3": { "baseline": "3.46.1", diff --git a/versions/s-/sqlite-orm.json b/versions/s-/sqlite-orm.json index 1fa0c678c5..6df750a672 100644 --- a/versions/s-/sqlite-orm.json +++ b/versions/s-/sqlite-orm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "199d90fac299fcdcb22eaaeb3aaceea4490da339", + "version": "1.9", + "port-version": 0 + }, { "git-tree": "bcff94e1b22d04049a76d0a46dc0fbda9ca5bae7", "version": "1.8.2",