From e732da23b69bfbceef51da1bd95f1f9a8a9fb494 Mon Sep 17 00:00:00 2001
From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
Date: Fri, 1 Dec 2023 18:02:41 +0800
Subject: [PATCH] [tinyorm] Suppress warning STL4043 (#35432)

---
 ports/tinyorm/portfile.cmake                 |  7 +++++--
 ports/tinyorm/suppress-warning-STL4043.patch | 18 ++++++++++++++++++
 ports/tinyorm/vcpkg.json                     |  2 +-
 versions/baseline.json                       |  2 +-
 versions/t-/tinyorm.json                     |  5 +++++
 5 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 ports/tinyorm/suppress-warning-STL4043.patch

diff --git a/ports/tinyorm/portfile.cmake b/ports/tinyorm/portfile.cmake
index 0f4d22ca5b..74d14ea3b6 100644
--- a/ports/tinyorm/portfile.cmake
+++ b/ports/tinyorm/portfile.cmake
@@ -1,9 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO silverqx/TinyORM
-    REF v0.36.5
+    REF "v${VERSION}"
     SHA512 ba3bf73972a6265663122e2c260354cf213dcdcf7bfd1f7a6a7eb43eb11e06fbed581b3f6ce28898eb60a85d0c9bfe45bfaa9596d92b62ca40702ede9856b183
     HEAD_REF main
+    PATCHES
+        suppress-warning-STL4043.patch
 )
 
 vcpkg_check_features(
@@ -27,7 +29,6 @@ vcpkg_cmake_configure(
         -DTINY_PORT:STRING=${PORT}
         -DTINY_VCPKG:BOOL=ON
         -DVERBOSE_CONFIGURE:BOOL=ON
-        -DWARNINGS_AS_ERRORS=FALSE
         ${FEATURE_OPTIONS}
 )
 
@@ -38,3 +39,5 @@ vcpkg_cmake_config_fixup()
 if(TINYORM_TOM_EXAMPLE)
     vcpkg_copy_tools(TOOL_NAMES tom AUTO_CLEAN)
 endif()
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/tinyorm/suppress-warning-STL4043.patch b/ports/tinyorm/suppress-warning-STL4043.patch
new file mode 100644
index 0000000000..8c048d0a42
--- /dev/null
+++ b/ports/tinyorm/suppress-warning-STL4043.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8b6f2cd..7a2e32f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,6 +41,13 @@ project(${TinyOrm_ns}
+ set(CMAKE_CXX_STANDARD 20)
+ set(CMAKE_CXX_STANDARD_REQUIRED YES)
+ set(CMAKE_CXX_EXTENSIONS OFF)
++
++if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
++    if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "19.38.32914.95")
++        add_compile_options(-D_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING)
++    endif()
++endif()
++
+ # Set the AUTOMOC property explicitly only when needed (eg. unit tests need AUTOMOC)
+ set(CMAKE_AUTOMOC OFF)
+ 
diff --git a/ports/tinyorm/vcpkg.json b/ports/tinyorm/vcpkg.json
index 5f26da6cdf..6ec027afc0 100644
--- a/ports/tinyorm/vcpkg.json
+++ b/ports/tinyorm/vcpkg.json
@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "tinyorm",
   "version-semver": "0.36.5",
-  "port-version": 1,
+  "port-version": 2,
   "maintainers": "Silver Zachara <silver.zachara@gmail.com>",
   "description": "Modern C++ ORM library for Qt framework",
   "homepage": "https://github.com/silverqx/TinyORM",
diff --git a/versions/baseline.json b/versions/baseline.json
index 264fee955f..594d1b2cb9 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -8478,7 +8478,7 @@
     },
     "tinyorm": {
       "baseline": "0.36.5",
-      "port-version": 1
+      "port-version": 2
     },
     "tinyply": {
       "baseline": "2.3.4",
diff --git a/versions/t-/tinyorm.json b/versions/t-/tinyorm.json
index 73c327c483..bc3e3b68e1 100644
--- a/versions/t-/tinyorm.json
+++ b/versions/t-/tinyorm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4c2e5cc9f6f5dc6e526f1aae55d90485a0b8562d",
+      "version-semver": "0.36.5",
+      "port-version": 2
+    },
     {
       "git-tree": "7a9e99fe4b4dca20d2e2a7c3bc9d575e5f1700ba",
       "version-semver": "0.36.5",