diff options
| -rw-r--r-- | ports/drogon/CONTROL | 2 | ||||
| -rw-r--r-- | ports/drogon/drogon_config.patch | 13 | ||||
| -rw-r--r-- | ports/drogon/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/drogon/vcpkg.patch | 61 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/d-/drogon.json | 5 |
6 files changed, 53 insertions, 35 deletions
diff --git a/ports/drogon/CONTROL b/ports/drogon/CONTROL index 3e59eddd2..38bb31360 100644 --- a/ports/drogon/CONTROL +++ b/ports/drogon/CONTROL @@ -1,5 +1,5 @@ Source: drogon
-Version: 1.4.1
+Version: 1.5.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)
diff --git a/ports/drogon/drogon_config.patch b/ports/drogon/drogon_config.patch new file mode 100644 index 000000000..61b7c964a --- /dev/null +++ b/ports/drogon/drogon_config.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/templates/DrogonConfig.cmake.in b/cmake/templates/DrogonConfig.cmake.in +index a21122a..6367259 100644 +--- a/cmake/templates/DrogonConfig.cmake.in ++++ b/cmake/templates/DrogonConfig.cmake.in +@@ -19,7 +19,7 @@ find_dependency(UUID REQUIRED) + endif(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" AND NOT WIN32) + find_dependency(ZLIB REQUIRED) + if(@pg_FOUND@) +-find_dependency(pg) ++find_dependency(PostgreSQL) + endif() + if(@SQLite3_FOUND@) + find_dependency(SQLite3) diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake index e23ef9bcc..f1978da98 100644 --- a/ports/drogon/portfile.cmake +++ b/ports/drogon/portfile.cmake @@ -1,12 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/drogon - REF v1.4.1 - SHA512 8611c18e65229095f5443f10c87e91593d619bc3a2d47da6d19d501a64be1aba12a813e44ccfc1c10179e5b0fa10121e8806955c0091258992501b88fa50d939 + REF v1.5.1 + SHA512 fe9c6b11c176ee5ae76ab96f1f2fcfef1b1868f23eac2bd17d39e11293cbf990e50c88d9da9412b85ca780226906ba5ced0032f0a354291c6f056a49d41f6f8a HEAD_REF master PATCHES vcpkg.patch resolv.patch + drogon_config.patch ) vcpkg_check_features( diff --git a/ports/drogon/vcpkg.patch b/ports/drogon/vcpkg.patch index 4eaa56607..8aedabdec 100644 --- a/ports/drogon/vcpkg.patch +++ b/ports/drogon/vcpkg.patch @@ -1,10 +1,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1efecf8..198f429 100755 +index 7465e46..9650a59 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -87,9 +85,9 @@ if(WIN32) - PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/third_party/mman-win32>) - endif(WIN32) +@@ -99,9 +99,9 @@ if (WIN32) + PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/third_party/mman-win32>) + endif (WIN32) -add_subdirectory(trantor) +find_package(Trantor CONFIG REQUIRED) @@ -12,31 +12,30 @@ index 1efecf8..198f429 100755 -target_link_libraries(${PROJECT_NAME} PUBLIC trantor) +target_link_libraries(${PROJECT_NAME} PUBLIC Trantor::Trantor) - if(NOT WIN32) - if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") -@@ -188,11 +196,10 @@ endif(NOT WIN32) + if (NOT WIN32) + if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") +@@ -205,11 +205,10 @@ 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) -+ 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) -@@ -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) + if (BUILD_POSTGRESQL) + # 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) ++ 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) +@@ -228,7 +227,7 @@ if (BUILD_POSTGRESQL) + set(DROGON_SOURCES ${DROGON_SOURCES} + orm_lib/src/postgresql_impl/PgConnection.cc) + endif (libpq_supports_batch) +- endif (pg_FOUND) ++ endif (PostgreSQL_FOUND) + endif (BUILD_POSTGRESQL) + + if (BUILD_MYSQL) diff --git a/versions/baseline.json b/versions/baseline.json index d6282851c..80e8a53a6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1713,7 +1713,7 @@ "port-version": 0 }, "drogon": { - "baseline": "1.4.1", + "baseline": "1.5.1", "port-version": 0 }, "dtl": { diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json index 19c03f30a..6eb2932e3 100644 --- a/versions/d-/drogon.json +++ b/versions/d-/drogon.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "b4640b2eac30f14ae5d41ddada94ca779aa1b597", + "version-string": "1.5.1", + "port-version": 0 + }, + { "git-tree": "689f5dd439df7059e4bec7a5f7e7824070b0a9b8", "version-string": "1.4.1", "port-version": 0 |