[drogon] Update to 1.8.4 (#30311)

* [drogon] Update to 1.8.4

* Fix vcpkg.patch

* fix

---------

Co-authored-by: Monica <v-liumonica@microsoft.com>

ports/drogon/portfile.cmake

@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO an-tao/drogon
-    REF v1.8.2
-    SHA512 f50252a59951570c87cc1254b1954ef275ee7b2a5cac229aba98b49f34f9f73314d2db9df0abc92efdfeab565f6c1ee14080e049d370384e3398b8c27f5519b7
+    REF v1.8.4
+    SHA512 381b4b576d316e55690dc0531cfeaeee4c0e00ce540a502e1c1870eea9a463d00d7e4bc9a354c459e5fbc6da5f046757f07ff2077bb3a9603f97f448f2d17ea2
     HEAD_REF master
     PATCHES
         vcpkg.patch
@@ -30,6 +30,7 @@ vcpkg_cmake_configure(
         -DBUILD_SHARED_LIBS=${BUILD_DROGON_SHARED}
         -DBUILD_EXAMPLES=OFF
         -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON
+        -DUSE_SUBMODULE=OFF
         ${FEATURE_OPTIONS}
     MAYBE_UNUSED_VARIABLES
         CMAKE_DISABLE_FIND_PACKAGE_Boost

ports/drogon/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "drogon",
-  "version": "1.8.2",
-  "port-version": 1,
+  "version": "1.8.4",
   "description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows",
   "homepage": "https://github.com/an-tao/drogon",
   "documentation": "https://drogon.docsforge.com/master/overview/",

ports/drogon/vcpkg.patch

@@ -1,19 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4406362..0595ab8 100755
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -120,9 +120,9 @@ if (WIN32)
-         PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/third_party/mman-win32>)
- endif (WIN32)
- 
--add_subdirectory(trantor)
-+find_package(Trantor CONFIG REQUIRED)
- 
--target_link_libraries(${PROJECT_NAME} PUBLIC trantor)
-+target_link_libraries(${PROJECT_NAME} PUBLIC Trantor::Trantor)
- 
- if(${CMAKE_SYSTEM_NAME} STREQUAL "Haiku")
-     target_link_libraries(${PROJECT_NAME} PRIVATE network)
-@@ -316,11 +316,10 @@ endif (NOT WIN32)
+@@ -360,11 +360,10 @@ endif (NOT WIN32)
  
  if (BUILD_POSTGRESQL)
      # find postgres
@@ -24,12 +13,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 -        target_link_libraries(${PROJECT_NAME} PRIVATE pg_lib)
 +    find_package(PostgreSQL REQUIRED)
 +    if(PostgreSQL_FOUND)
-+      set(pg_FOUND true)
-+      target_link_libraries(${PROJECT_NAME} PRIVATE PostgreSQL::PostgreSQL)
++        set(pg_FOUND true)
++        target_link_libraries(${PROJECT_NAME} PRIVATE PostgreSQL::PostgreSQL)
          set(DROGON_SOURCES
              ${DROGON_SOURCES}
-             orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc)
-@@ -348,7 +348,7 @@ if (BUILD_POSTGRESQL)
+             orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc
+@@ -394,7 +393,7 @@ if (BUILD_POSTGRESQL)
                  ${private_headers}
                  orm_lib/src/postgresql_impl/PgConnection.h)
          endif (libpq_supports_batch)
@@ -38,16 +27,20 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
  endif (BUILD_POSTGRESQL)
  
  if (BUILD_MYSQL)
-diff --git a/drogon_ctl/CMakeLists.txt b/drogon_ctl/CMakeLists.txt
-index 9f2f1e7..09871f8 100755
+
+index 9f2f1e7..76bd2ec 100755
 --- a/drogon_ctl/CMakeLists.txt
 +++ b/drogon_ctl/CMakeLists.txt
-@@ -19,7 +19,7 @@ add_executable(_drogon_ctl
+@@ -19,7 +19,11 @@ add_executable(_drogon_ctl
  target_link_libraries(_drogon_ctl ${PROJECT_NAME})
  if (WIN32 AND BUILD_SHARED_LIBS)
    set(DROGON_FILE $<TARGET_FILE:drogon>)
 -  set(TRANTOR_FILE $<TARGET_FILE:trantor>)
-+  set(TRANTOR_FILE $<TARGET_FILE:Trantor::Trantor>)
++  if (USE_SUBMODULE)
++    set(TRANTOR_FILE $<TARGET_FILE:trantor>)
++  else()
++    set(TRANTOR_FILE $<TARGET_FILE:Trantor::Trantor>)
++  endif()
    add_custom_command(TARGET _drogon_ctl POST_BUILD
            COMMAND ${CMAKE_COMMAND}
            -DCTL_FILE=${DROGON_FILE}

versions/baseline.json

@@ -2133,8 +2133,8 @@
       "port-version": 0
     },
     "drogon": {
-      "baseline": "1.8.2",
-      "port-version": 1
+      "baseline": "1.8.4",
+      "port-version": 0 
     },
     "dstorage": {
       "baseline": "1.1.0",

versions/d-/drogon.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "92af14d325c1fce661625e6adef2cf633acb5a37",
+      "version": "1.8.4",
+      "port-version": 0 
+    },
     {
       "git-tree": "670f02828b60f7a11c6b7a7feff0396d6cec4483",
       "version": "1.8.2",