diff options
| author | An Tao <antao2002@gmail.com> | 2021-07-01 22:36:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-01 07:36:43 -0700 |
| commit | b8f610edb85a88bc7002fe27c9f6cbe14e0cee06 (patch) | |
| tree | 2c545b8d1c3304132cc0dbe4c487482a0a48d90b | |
| parent | 2d44beed8551a8af50d2c7db689b5de21e7ae614 (diff) | |
| download | vcpkg-b8f610edb85a88bc7002fe27c9f6cbe14e0cee06.tar.gz vcpkg-b8f610edb85a88bc7002fe27c9f6cbe14e0cee06.zip | |
[drogon] Update to 1.7.1 (#18643)
| -rw-r--r-- | ports/drogon/CONTROL | 2 | ||||
| -rw-r--r-- | ports/drogon/portfile.cmake | 8 | ||||
| -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, 12 insertions, 18 deletions
diff --git a/ports/drogon/CONTROL b/ports/drogon/CONTROL index e4da939a3..fc00ee3ad 100644 --- a/ports/drogon/CONTROL +++ b/ports/drogon/CONTROL @@ -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)
diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake index 69ea0cf55..0171af1d5 100644 --- a/ports/drogon/portfile.cmake +++ b/ports/drogon/portfile.cmake @@ -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") diff --git a/ports/drogon/ssize_t.patch b/ports/drogon/ssize_t.patch deleted file mode 100644 index aae977522..000000000 --- a/ports/drogon/ssize_t.patch +++ /dev/null @@ -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 diff --git a/versions/baseline.json b/versions/baseline.json index ea507f9c4..2c0b3964c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1749,7 +1749,7 @@ "port-version": 0 }, "drogon": { - "baseline": "1.6.0", + "baseline": "1.7.1", "port-version": 0 }, "dtl": { diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json index fad0fff2c..309d7689d 100644 --- a/versions/d-/drogon.json +++ b/versions/d-/drogon.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "a325c34025250341e3f721353d5d3dfa66017e2b", + "version-string": "1.7.1", + "port-version": 0 + }, + { "git-tree": "29f71d851bbd006bfed9aaad62b34158b3f7cc0a", "version-string": "1.6.0", "port-version": 0 |