mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-04 03:19:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[drogon, trantor] Bump drogon to 1.9.7 and trantor to 1.5.21 (#40899)

Browse Source
This commit is contained in:
An Tao 2024-09-11 04:44:52 +08:00 committed by GitHub
parent b4624c3a70
commit 645f9f3fd8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ports/drogon/0005-drogon-cross-compile.patch
View File

@ -1,17 +1,17 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88026025..d6f180fb 100644
index c36d29a2..437e5d73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,6 +13,7 @@ option(BUILD_DOC "Build Doxygen documentation" OFF)
option(BUILD_BROTLI "Build Brotli" ON)
@@ -14,6 +14,7 @@ option(BUILD_BROTLI "Build Brotli" ON)
option(BUILD_YAML_CONFIG "Build yaml config" ON)
option(USE_SUBMODULE "Use trantor as a submodule" ON)
option(USE_STATIC_LIBS_ONLY "Use only static libraries as dependencies" OFF)
+set(DROGON_CTL_TOOL "" CACHE STRING "drogon_ctl tool executable when doing cross builds")
include(CMakeDependentOption)
CMAKE_DEPENDENT_OPTION(BUILD_POSTGRESQL "Build with postgresql support" ON "BUILD_ORM" OFF)
diff --git a/drogon_ctl/CMakeLists.txt b/drogon_ctl/CMakeLists.txt
index 249c453d..16b346ea 100755
index 04b790d3..854f7139 100755
--- a/drogon_ctl/CMakeLists.txt
+++ b/drogon_ctl/CMakeLists.txt
@@ -43,7 +43,7 @@ foreach(cspFile ${SCP_LIST})

13
ports/drogon/0006-log.patch
View File

@ -1,13 +0,0 @@
diff --git a/lib/src/HttpServer.cc b/lib/src/HttpServer.cc
index dbd99a90..3d8ca852 100644
--- a/lib/src/HttpServer.cc
+++ b/lib/src/HttpServer.cc
@@ -508,7 +508,7 @@ void HttpServer::requestPostRouting(const HttpRequestImplPtr &req, Pack &&pack)
else
{
req->quitStreamMode();
- LOG_DEBUG << "Stop processing request due to stream error";
+ LOG_ERROR << "Stop processing request due to stream error";
pack.callback(
app().getCustomErrorHandler()(k400BadRequest, req));
}

3
ports/drogon/portfile.cmake
View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO an-tao/drogon
REF "v${VERSION}"
SHA512 e0a1b4a0f3b9d2804169d050e2038418baf4107f94299e2b969a185f5624f9d4101d1ef24795789c48c8b2ed8dfd5c748d6162eb5ce789cad3b253c7e8692fa9
SHA512 6970705a4b875361e79001ab02789a2c02ef301fcb04b1149e59eb8060a4eeff0ea12f7909819ac7c0e02568fb4989792017e820593c3e5eb53a30ab9fac4b0c
HEAD_REF master
PATCHES
0001-vcpkg.patch
@ -10,7 +10,6 @@ vcpkg_from_github(
0003-deps-redis.patch
0004-drogon-ctl.patch
0005-drogon-cross-compile.patch
0006-log.patch
)
set(DROGON_CTL_TOOL "")

2
ports/drogon/vcpkg.json
View File

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

2
ports/trantor/portfile.cmake
View File

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

2
ports/trantor/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "trantor",
"version-semver": "1.5.20",
"version-semver": "1.5.21",
"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",

4
versions/baseline.json
View File

@ -2385,7 +2385,7 @@
"port-version": 0
},
"drogon": {
"baseline": "1.9.6",
"baseline": "1.9.7",
"port-version": 0
},
"dstorage": {
@ -9005,7 +9005,7 @@
"port-version": 0
},
"trantor": {
"baseline": "1.5.20",
"baseline": "1.5.21",
"port-version": 0
},
"tre": {

5
versions/d-/drogon.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2e3d5294ff97e6915a9ac0ada868c260728fe781",
"version-semver": "1.9.7",
"port-version": 0
},
{
"git-tree": "ca6574efb8d720eb429eb5d3829936ec2a2342ee",
"version-semver": "1.9.6",

6
versions/t-/trantor.json
View File

@ -1,5 +1,11 @@
{
"versions": [
{
"git-tree": "3468a2a6cbe9d3d132cb5240edca85b2947d2396",
"version-semver": "1.5.21",
"port-version": 0
},
{
"git-tree": "c918dd94f5061cf75dad87946390914bb8d55d5c",
"version-semver": "1.5.20",