[drogon] Update to 1.1.0 (#14319)

4 files changed, 22 insertions, 28 deletions

diff --git a/ports/drogon/CONTROL b/ports/drogon/CONTROL
index f82a9f6ef..bed3e64d4 100644
--- a/ports/drogon/CONTROL
+++ b/ports/drogon/CONTROL
@@ -1,6 +1,5 @@
 Source: drogon

-Version: 1.0.0

-Port-Version: 1

+Version: 1.1.0

 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)

diff --git a/ports/drogon/pg.patch b/ports/drogon/pg.patch
deleted file mode 100644
index 34870064f..000000000
--- a/ports/drogon/pg.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cf3c30d..4931b93 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -161,11 +161,11 @@ endif(NOT WIN32)
- 
- if(BUILD_ORM)
-   # find postgres
--  find_package(pg)
--  if(pg_FOUND)
--    message(STATUS "libpq inc path:" ${PG_INCLUDE_DIRS})
--    message(STATUS "libpq lib:" ${PG_LIBRARIES})
--    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(DROGON_SOURCES ${DROGON_SOURCES}
-                        orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc)
-     if(LIBPQ_BATCH_MODE)
diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake
index 813ba216f..6dfdc942c 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
-    SHA512 3ea447bee4be1956018af597d5c97d54ff04a6403cc3a0bda36ed905d459c15db8a5134cad0b68d5f628725c5488f8cb6aabbcd281faf5d62775d739b02d4c45
+    REF v1.1.0
+    SHA512 00d7d64fc666b0b2c02afab899f622123883b62b274d33f3504da6250a6458fc56ab12b131c24f9a7e20284bc5c3604a4f2dd796f56ad00d454d9f8504d8f96e
     HEAD_REF master
     PATCHES
         vcpkg.patch
-        pg.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/drogon/vcpkg.patch b/ports/drogon/vcpkg.patch
index 92b9aea86..30a39ace0 100644
--- a/ports/drogon/vcpkg.patch
+++ b/ports/drogon/vcpkg.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index aab915d..4daeb87 100755
+index 96d6c6a..9d3dd24 100755
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -64,9 +64,9 @@ if(WIN32)
+@@ -72,9 +72,9 @@ if(WIN32)
      PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/third_party/mman-win32>)
  endif(WIN32)
  
@@ -14,3 +14,20 @@ index aab915d..4daeb87 100755
  
  if(NOT WIN32)
    target_link_libraries(${PROJECT_NAME} PRIVATE dl)
+@@ -169,11 +169,11 @@ endif(NOT WIN32)
+ 
+ if(BUILD_ORM)
+   # find postgres
+-  find_package(pg)
+-  if(pg_FOUND)
+-    message(STATUS "libpq inc path:" ${PG_INCLUDE_DIRS})
+-    message(STATUS "libpq lib:" ${PG_LIBRARIES})
+-    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(DROGON_SOURCES ${DROGON_SOURCES}
+                        orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc)
+     if(LIBPQ_BATCH_MODE)