From 7b285940a8279eae24a9a1f847b3c61bfcbe0494 Mon Sep 17 00:00:00 2001
From: An Tao <antao2002@gmail.com>
Date: Sat, 22 Aug 2020 00:31:22 +0800
Subject: [drogon] Fix building errors on Windows and Linux (#13007)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
---
 ports/drogon/CONTROL                  |  4 ++--
 ports/drogon/drogon_ctl_install.patch | 20 --------------------
 ports/drogon/portfile.cmake           | 12 ++++++------
 3 files changed, 8 insertions(+), 28 deletions(-)
 delete mode 100644 ports/drogon/drogon_ctl_install.patch

diff --git a/ports/drogon/CONTROL b/ports/drogon/CONTROL
index 437298f0b..d9577bb30 100644
--- a/ports/drogon/CONTROL
+++ b/ports/drogon/CONTROL
@@ -1,5 +1,5 @@
 Source: drogon
-Version: v1.0.0-beta20
+Version: v1.0.0-beta21
 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, libpq, sqlite3, brotli
\ No newline at end of file
+Build-Depends: trantor, zlib, jsoncpp, libmariadb, libpq, sqlite3, brotli, libuuid (!windows)
diff --git a/ports/drogon/drogon_ctl_install.patch b/ports/drogon/drogon_ctl_install.patch
deleted file mode 100644
index 71643248e..000000000
--- a/ports/drogon/drogon_ctl_install.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/drogon_ctl/CMakeLists.txt b/drogon_ctl/CMakeLists.txt
-index bbc01fe..99500f0 100755
---- a/drogon_ctl/CMakeLists.txt
-+++ b/drogon_ctl/CMakeLists.txt
-@@ -40,13 +40,13 @@ if(WIN32)
-   target_link_libraries(drogon_ctl PRIVATE ws2_32 Rpcrt4)
- endif(WIN32)
- message(STATUS "bin:" ${INSTALL_BIN_DIR})
--install(TARGETS drogon_ctl RUNTIME DESTINATION ${INSTALL_BIN_DIR})
-+install(TARGETS drogon_ctl RUNTIME DESTINATION tools/drogon)
- if(WIN32)
-   set(CTL_FILE $<TARGET_FILE:drogon_ctl>)
-   add_custom_command(TARGET drogon_ctl POST_BUILD
-                      COMMAND ${CMAKE_COMMAND}
-                              -DCTL_FILE=${CTL_FILE}
--                             -DINSTALL_BIN_DIR=${INSTALL_BIN_DIR}
-+                             -DINSTALL_BIN_DIR=tools/drogon
-                              -P
-                              ${CMAKE_CURRENT_SOURCE_DIR}/CopyDlls.cmake)
- else(WIN32)
diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake
index 1fe178fc2..d66100591 100644
--- a/ports/drogon/portfile.cmake
+++ b/ports/drogon/portfile.cmake
@@ -1,12 +1,11 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO an-tao/drogon
-    REF v1.0.0-beta20
-    SHA512 10da2765df24848964358ea3f6a8843664d142bfd1d276649438c5d79ad88f98467ac742d3ff23e9fda93b89ab9568b2ecea8c3ee4d527d0b6b4a5892025e24e
+    REF v1.0.0-beta21
+    SHA512 bacd3c0d20c9d5eb22e6c872c8bea6865a6beb93d83165e117b11a30b7fffd65de48838b599cda81043e7ae1394a9d13390910baa4b84d8cfad3050f152a4c36
     HEAD_REF master
     PATCHES
         vcpkg.patch
-        drogon_ctl_install.patch
         pg.patch
 )
 
@@ -20,8 +19,10 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 
 # Fix CMake files
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
-
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Drogon)
+# Copy drogon_ctl
+vcpkg_copy_tools(TOOL_NAMES drogon_ctl
+                 AUTO_CLEAN)
 # # Remove includes in debug
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
@@ -34,4 +35,3 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${
 # Copy pdb files
 vcpkg_copy_pdbs()
 
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/drogon)
-- 
cgit v1.2.3