[drogon, trantor] Bump drogon to 1.9.11 and trantor to 1.5.24 (#46134)

This commit is contained in:
An Tao
2025-07-14 15:13:22 +08:00
committed by GitHub
parent 7bdd20bfa3
commit 249512572b
8 changed files with 30 additions and 9 deletions

View File

@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbe2288..d7218a6 100755
index 9cbc6d73..30a88c1a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -367,11 +367,10 @@ endif (NOT WIN32)
@@ -361,11 +361,10 @@ endif()
if (BUILD_POSTGRESQL)
# find postgres
@@ -18,7 +18,7 @@ index fbe2288..d7218a6 100755
set(DROGON_SOURCES
${DROGON_SOURCES}
orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc
@@ -401,7 +400,7 @@ if (BUILD_POSTGRESQL)
@@ -395,7 +394,7 @@ if (BUILD_POSTGRESQL)
${private_headers}
orm_lib/src/postgresql_impl/PgConnection.h)
endif (libpq_supports_batch)
@@ -27,3 +27,14 @@ index fbe2288..d7218a6 100755
endif (BUILD_POSTGRESQL)
if (BUILD_MYSQL)
@@ -420,7 +419,9 @@ if (BUILD_MYSQL)
message(STATUS "Mariadb support mysql_optionsv")
add_definitions(-DHAS_MYSQL_OPTIONSV)
endif(HAS_MYSQL_OPTIONSV)
-
+ if (NOT BUILD_SHARED_LIBS AND WIN32)
+ target_link_libraries(${PROJECT_NAME} PUBLIC bcrypt)
+ endif()
set(DROGON_SOURCES
${DROGON_SOURCES}
orm_lib/src/mysql_impl/MysqlConnection.cc

View File

@@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO an-tao/drogon
REF "v${VERSION}"
SHA512 8e050a2545067492ab037acda6cbc628806617ef2494397d6940241556afaa2555b5cb5e2baa6790c5a20172bd5d61e0454f2a52f85b3d875b23774aac8bb36a
SHA512 ce61c65281bde0246e96c3558cf635241adbcab514d6a71e8267201340f577af26b1cbc69fa48652d655971122a66c70db75d1a4c034384ba0716fccf7ad9584
HEAD_REF master
PATCHES
0001-vcpkg.patch

View File

@@ -1,6 +1,6 @@
{
"name": "drogon",
"version-semver": "1.9.10",
"version-semver": "1.9.11",
"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/",

View File

@@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO an-tao/trantor
REF "v${VERSION}"
SHA512 25a979082246b634dcee18427a84eb9bc0f4d3c195a0fd22aac0ceafba194179e34ae230ddb22e103616f4668610419ae489ff48a5a1d459a20c27f75cd9a6f3
SHA512 a875e5bf8c8d871d1a3ddeeb79891773eed4f13772aa8c09ce6bdd60fa7af621eed6986935c0b70b58e790618934ca82a7ebd4ba5faf2b534b8ecb6f74d6bad1
HEAD_REF master
PATCHES
000-fix-deps.patch

View File

@@ -1,6 +1,6 @@
{
"name": "trantor",
"version-semver": "1.5.23",
"version-semver": "1.5.24",
"description": "A non-blocking I/O cross-platform TCP network library, using C++14",
"homepage": "https://github.com/an-tao/trantor",
"license": "BSD-2-Clause",

View File

@@ -2497,7 +2497,7 @@
"port-version": 0
},
"drogon": {
"baseline": "1.9.10",
"baseline": "1.9.11",
"port-version": 0
},
"dstorage": {
@@ -9629,7 +9629,7 @@
"port-version": 0
},
"trantor": {
"baseline": "1.5.23",
"baseline": "1.5.24",
"port-version": 0
},
"tre": {

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5cabd4bbc4cebe3718ded84b1db6ffb0f9aa02ba",
"version-semver": "1.9.11",
"port-version": 0
},
{
"git-tree": "51b49c1237db808cd360cd44a0213029f7ef05ef",
"version-semver": "1.9.10",

View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e45f9f108809b8325d96eb0ea3cc8d123c76d0f4",
"version-semver": "1.5.24",
"port-version": 0
},
{
"git-tree": "bba23ca39aca1b346d0f5c0f46d3e0a95be34e30",
"version-semver": "1.5.23",