[drogon] Update to 1.7.1 (#18643)

This commit is contained in:
An Tao 2021-07-01 22:36:43 +08:00 committed by GitHub
parent 2d44beed85
commit b8f610edb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 18 deletions

View File

@ -1,5 +1,5 @@
Source: drogon
Version: 1.6.0
Version: 1.7.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)

View File

@ -1,14 +1,13 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO an-tao/drogon
REF v1.6.0
SHA512 3e3012bbee0a12cfabf79581bc0f57592065bc9618ed18c17ef77afee55750c8a8b8626053863208928b173cd0629f271a14a07e602f8ea93976c43b3ba5c9db
REF v1.7.1
SHA512 8a7cb8aa87cc48b130a5b47558b3c9e2a0af13cd8b76681e42d14a366dac75c88e389f2e2fe03b4f0f1e0e31971a47eee2bf5df8fcb4b79f8ed00d2a592315b6
HEAD_REF master
PATCHES
vcpkg.patch
resolv.patch
drogon_config.patch
ssize_t.patch
)
vcpkg_check_features(
@ -30,6 +29,9 @@ vcpkg_install_cmake()
# Fix CMake files
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Drogon)
vcpkg_fixup_pkgconfig()
# Copy drogon_ctl
if("ctl" IN_LIST FEATURES)
message("copying tools")

View File

@ -1,13 +0,0 @@
diff --git a/orm_lib/inc/drogon/orm/Mapper.h b/orm_lib/inc/drogon/orm/Mapper.h
index d248625..8911f7f 100644
--- a/orm_lib/inc/drogon/orm/Mapper.h
+++ b/orm_lib/inc/drogon/orm/Mapper.h
@@ -21,7 +21,7 @@
#include <vector>
#ifdef _WIN32
-using ssize_t = std::intptr_t;
+using ssize_t = long long;
#endif
namespace drogon

View File

@ -1749,7 +1749,7 @@
"port-version": 0
},
"drogon": {
"baseline": "1.6.0",
"baseline": "1.7.1",
"port-version": 0
},
"dtl": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a325c34025250341e3f721353d5d3dfa66017e2b",
"version-string": "1.7.1",
"port-version": 0
},
{
"git-tree": "29f71d851bbd006bfed9aaad62b34158b3f7cc0a",
"version-string": "1.6.0",