Skip to content

Commit

Permalink
[tinyorm] Update to v0.37.3 (microsoft#38388)
Browse files Browse the repository at this point in the history
Bugfix release.

New TinyDrivers feature can't be enabled in vcpkg as it violates the
Maintainer guide: Do not use features to implement alternatives

- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [x] The "supports" clause reflects platforms that may be fixed by this
new version.
- [x] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [x] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.
  • Loading branch information
silverqx authored May 6, 2024
1 parent 675281d commit 28b1cf6
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 32 deletions.
9 changes: 6 additions & 3 deletions ports/tinyorm/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO silverqx/TinyORM
REF "v${VERSION}"
SHA512 ba3bf73972a6265663122e2c260354cf213dcdcf7bfd1f7a6a7eb43eb11e06fbed581b3f6ce28898eb60a85d0c9bfe45bfaa9596d92b62ca40702ede9856b183
SHA512 f82702d712f845624698f799c7f5d2b30b7d2138f6c4c15e7ca50b316254b55b6606f60ce4356d7156b615b636a6b16e2d1923901825759e54ab60499c4f04cd
HEAD_REF main
PATCHES
suppress-warning-STL4043.patch
)

# STL4043 _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING already defined, see:
# https://github.com/silverqx/TinyORM/blob/main/cmake/CommonModules/TinyCommon.cmake#L122

vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
PREFIX TINYORM
Expand All @@ -24,8 +25,10 @@ vcpkg_check_features(
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DCMAKE_CXX_SCAN_FOR_MODULES:BOOL=OFF
-DCMAKE_EXPORT_PACKAGE_REGISTRY:BOOL=OFF
-DBUILD_TESTS:BOOL=OFF
-DBUILD_TREE_DEPLOY:BOOL=OFF
-DTINY_PORT:STRING=${PORT}
-DTINY_VCPKG:BOOL=ON
-DVERBOSE_CONFIGURE:BOOL=ON
Expand Down
18 changes: 0 additions & 18 deletions ports/tinyorm/suppress-warning-STL4043.patch

This file was deleted.

20 changes: 11 additions & 9 deletions ports/tinyorm/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "tinyorm",
"version-semver": "0.36.5",
"port-version": 2,
"version-semver": "0.37.3",
"maintainers": "Silver Zachara <[email protected]>",
"description": "Modern C++ ORM library for Qt framework",
"homepage": "https://github.com/silverqx/TinyORM",
Expand All @@ -12,10 +11,7 @@
"dependencies": [
{
"name": "qtbase",
"default-features": false,
"features": [
"sql"
]
"default-features": false
},
"range-v3",
"tabulate",
Expand All @@ -34,6 +30,12 @@
"tom"
],
"features": {
"build-mysql-driver": {
"description": "Build TinyDrivers MySQL database driver (provided by TinyDrivers)",
"dependencies": [
"libmysql"
]
},
"disable-thread-local": {
"description": "Remove all thread_local storage duration specifiers (disables multi-threading support)"
},
Expand All @@ -50,7 +52,7 @@
"description": "Enable ORM-related source code (without it only the query builder is compiled)"
},
"sql-mysql": {
"description": "Build Qt SQL Driver for MySQL",
"description": "Build Qt SQL MySQL database driver (provided by QtSql)",
"dependencies": [
{
"name": "qtbase",
Expand All @@ -62,7 +64,7 @@
]
},
"sql-psql": {
"description": "Build Qt SQL Driver for PostgreSQL",
"description": "Build Qt SQL PostgreSQL database driver (provided by QtSql)",
"dependencies": [
{
"name": "qtbase",
Expand All @@ -74,7 +76,7 @@
]
},
"sql-sqlite": {
"description": "Build Qt SQL Driver for SQLite",
"description": "Build Qt SQL SQLite database driver (provided by QtSql)",
"dependencies": [
{
"name": "qtbase",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -8713,8 +8713,8 @@
"port-version": 0
},
"tinyorm": {
"baseline": "0.36.5",
"port-version": 2
"baseline": "0.37.3",
"port-version": 0
},
"tinyply": {
"baseline": "2.3.4",
Expand Down
5 changes: 5 additions & 0 deletions versions/t-/tinyorm.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0ad6d66e3a6fd539a71bb6cb331ff27c5bcff17a",
"version-semver": "0.37.3",
"port-version": 0
},
{
"git-tree": "4c2e5cc9f6f5dc6e526f1aae55d90485a0b8562d",
"version-semver": "0.36.5",
Expand Down

0 comments on commit 28b1cf6

Please sign in to comment.