[drogon] Update to 1.4.1 (#16651)

* [drogon] Update to 1.4.1

* Update patch

* Format

* update version

* Revert the ctl feature

* update version

* [libpq] Fix static linkage

* [drogon] Revert direct postgresql library linkage

Co-authored-by: Jonliu1993 <13720414433@163.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

3 files changed, 15 insertions, 29 deletions

diff --git a/ports/drogon/CONTROL b/ports/drogon/CONTROL
index 63c9527aa..3e59eddd2 100644
--- a/ports/drogon/CONTROL
+++ b/ports/drogon/CONTROL
@@ -1,8 +1,9 @@
 Source: drogon

-Version: 1.3.0

+Version: 1.4.1

 Homepage: https://github.com/an-tao/drogon

 Description:Drogon: A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows

 Build-Depends: trantor, zlib, jsoncpp, libmariadb (!osx), libmariadb[iconv] (osx), libpq, sqlite3, brotli, libuuid (!windows)

+Default-Features: ctl

 

 Feature: ctl

 Description: Build drogon_ctl tool. 
\ No newline at end of file
diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake
index ae53109f9..e23ef9bcc 100644
--- a/ports/drogon/portfile.cmake
+++ b/ports/drogon/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO an-tao/drogon
-    REF v1.3.0
-    SHA512 cddda4b90d28c15319b9cd1dea561c429b804508fc40678b9906fb70153cb36d7a4fc1c13fee01ec1f49d747a722856ceee364aba4118d922afabc3629ba2115
+    REF v1.4.1
+    SHA512 8611c18e65229095f5443f10c87e91593d619bc3a2d47da6d19d501a64be1aba12a813e44ccfc1c10179e5b0fa10121e8806955c0091258992501b88fa50d939
     HEAD_REF master
     PATCHES
         vcpkg.patch
@@ -11,6 +11,7 @@ vcpkg_from_github(
 
 vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
     ctl BUILD_CTL
 )
 
@@ -19,6 +20,7 @@ vcpkg_configure_cmake(
     PREFER_NINJA
     OPTIONS
         -DBUILD_EXAMPLES=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON
         ${FEATURE_OPTIONS}
 )
 
@@ -32,6 +34,7 @@ if("ctl" IN_LIST FEATURES)
     vcpkg_copy_tools(TOOL_NAMES drogon_ctl
                      AUTO_CLEAN)
 endif()
+
 # # Remove includes in debug
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
@@ -43,4 +46,3 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${
 
 # Copy pdb files
 vcpkg_copy_pdbs()
-
diff --git a/ports/drogon/vcpkg.patch b/ports/drogon/vcpkg.patch
index a4128264f..4eaa56607 100644
--- a/ports/drogon/vcpkg.patch
+++ b/ports/drogon/vcpkg.patch
@@ -1,25 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6df5dac..b79036d 100755
+index 1efecf8..198f429 100755
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -5,13 +5,11 @@ project(drogon)
- message(STATUS "compiler: " ${CMAKE_CXX_COMPILER_ID})
- include(CheckCXXSourceRuns)
- check_cxx_source_runs(
--        ${PROJECT_SOURCE_DIR}/cmake/tests/binary_compatibility_test.cc
--        cross_compiling)
-+        "int main(){return 0;}"
-+        not_cross_compiling)
- 
--if(cross_compiling)
-+if(!not_cross_compiling)
-   set(BUILD_PROGRAMS OFF)
--else(cross_compiling)
--  set(BUILD_PROGRAMS ON)
- endif()
- 
- option(BUILD_CTL "Build drogon_ctl" ${BUILD_PROGRAMS})
-@@ -84,9 +82,9 @@ if(WIN32)
+@@ -87,9 +85,9 @@ if(WIN32)
      PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/third_party/mman-win32>)
  endif(WIN32)
  
@@ -31,7 +14,7 @@ index 6df5dac..b79036d 100755
  
  if(NOT WIN32)
    if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
-@@ -183,11 +181,11 @@ endif(NOT WIN32)
+@@ -188,11 +196,10 @@ endif(NOT WIN32)
  
  if(BUILD_ORM)
    # find postgres
@@ -42,18 +25,18 @@ index 6df5dac..b79036d 100755
 -    target_link_libraries(${PROJECT_NAME} PRIVATE pg_lib)
 +  find_package(PostgreSQL REQUIRED)
 +  if(PostgreSQL_FOUND)
-+    message(STATUS "libpq inc path:" ${PostgreSQL_INCLUDE_DIRS})
-+    message(STATUS "libpq lib:" ${PostgreSQL_LIBRARIES})
-+    target_link_libraries(${PROJECT_NAME} PRIVATE ${PostgreSQL_LIBRARIES})
++    set(pg_FOUND true)
++    target_link_libraries(${PROJECT_NAME} PRIVATE PostgreSQL::PostgreSQL)
      set(DROGON_SOURCES ${DROGON_SOURCES}
                         orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc)
      if(LIBPQ_BATCH_MODE)
-@@ -206,7 +204,7 @@ if(BUILD_ORM)
+@@ -211,8 +224,7 @@ if(BUILD_ORM)
        set(DROGON_SOURCES ${DROGON_SOURCES}
                           orm_lib/src/postgresql_impl/PgConnection.cc)
      endif(libpq_supports_batch)
 -  endif(pg_FOUND)
+-
 +  endif(PostgreSQL_FOUND)
- 
    # Find mysql, only mariadb client liberary is supported
    find_package(MySQL)
+   if(MySQL_FOUND)