diff options
| author | An Tao <antao2002@gmail.com> | 2021-06-02 12:38:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-01 21:38:48 -0700 |
| commit | 4ce98d3f936574754d3ea42a4a0703b832f71c14 (patch) | |
| tree | 1bd3c54796cec1af859bc4de103d18d8ef16bcfb | |
| parent | 3394bed96e37913585e46529541b1019eee25be0 (diff) | |
| download | vcpkg-4ce98d3f936574754d3ea42a4a0703b832f71c14.tar.gz vcpkg-4ce98d3f936574754d3ea42a4a0703b832f71c14.zip | |
[drogon] Update to 1.6.0 (#17986)
| -rw-r--r-- | ports/drogon/CONTROL | 2 | ||||
| -rw-r--r-- | ports/drogon/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/drogon/ssize_t.patch | 13 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/d-/drogon.json | 5 |
5 files changed, 23 insertions, 4 deletions
diff --git a/ports/drogon/CONTROL b/ports/drogon/CONTROL index 38bb31360..e4da939a3 100644 --- a/ports/drogon/CONTROL +++ b/ports/drogon/CONTROL @@ -1,5 +1,5 @@ Source: drogon
-Version: 1.5.1
+Version: 1.6.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/portfile.cmake b/ports/drogon/portfile.cmake index f1978da98..69ea0cf55 100644 --- a/ports/drogon/portfile.cmake +++ b/ports/drogon/portfile.cmake @@ -1,13 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/drogon - REF v1.5.1 - SHA512 fe9c6b11c176ee5ae76ab96f1f2fcfef1b1868f23eac2bd17d39e11293cbf990e50c88d9da9412b85ca780226906ba5ced0032f0a354291c6f056a49d41f6f8a + REF v1.6.0 + SHA512 3e3012bbee0a12cfabf79581bc0f57592065bc9618ed18c17ef77afee55750c8a8b8626053863208928b173cd0629f271a14a07e602f8ea93976c43b3ba5c9db HEAD_REF master PATCHES vcpkg.patch resolv.patch drogon_config.patch + ssize_t.patch ) vcpkg_check_features( diff --git a/ports/drogon/ssize_t.patch b/ports/drogon/ssize_t.patch new file mode 100644 index 000000000..aae977522 --- /dev/null +++ b/ports/drogon/ssize_t.patch @@ -0,0 +1,13 @@ +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 diff --git a/versions/baseline.json b/versions/baseline.json index ccd80a017..72ddfde87 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1737,7 +1737,7 @@ "port-version": 0 }, "drogon": { - "baseline": "1.5.1", + "baseline": "1.6.0", "port-version": 0 }, "dtl": { diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json index 6eb2932e3..fad0fff2c 100644 --- a/versions/d-/drogon.json +++ b/versions/d-/drogon.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "29f71d851bbd006bfed9aaad62b34158b3f7cc0a", + "version-string": "1.6.0", + "port-version": 0 + }, + { "git-tree": "b4640b2eac30f14ae5d41ddada94ca779aa1b597", "version-string": "1.5.1", "port-version": 0 |