diff options
| author | An Tao <antao2002@gmail.com> | 2021-05-18 15:48:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-18 00:48:21 -0700 |
| commit | af8c5621013e06bcce3f439c14242f6deaf85622 (patch) | |
| tree | cc421483a41a4a6fc2a3a03e329cf6ff9dcacbdc | |
| parent | b8d922991f04efb41ded1b578308a48cdec90ff2 (diff) | |
| download | vcpkg-af8c5621013e06bcce3f439c14242f6deaf85622.tar.gz vcpkg-af8c5621013e06bcce3f439c14242f6deaf85622.zip | |
[trantor] Update to 1.4.1 (#17952)
| -rw-r--r-- | ports/trantor/CONTROL | 2 | ||||
| -rw-r--r-- | ports/trantor/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/trantor/ssize_t.patch | 26 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/t-/trantor.json | 5 |
5 files changed, 36 insertions, 4 deletions
diff --git a/ports/trantor/CONTROL b/ports/trantor/CONTROL index d607f5d22..f6fa547af 100644 --- a/ports/trantor/CONTROL +++ b/ports/trantor/CONTROL @@ -1,5 +1,5 @@ Source: trantor -Version: 1.4.0 +Version: 1.4.1 Homepage: https://github.com/an-tao/trantor Description: A non-blocking I/O cross-platform TCP network library, using C++14. Build-Depends: openssl, c-ares diff --git a/ports/trantor/portfile.cmake b/ports/trantor/portfile.cmake index 93574af56..8a85c262d 100644 --- a/ports/trantor/portfile.cmake +++ b/ports/trantor/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/trantor - REF v1.4.0 - SHA512 0ec455ef55c3907bef8337b1c14e39af13c65d28c3eac731d3c203ba4e0e67fb87907e3320a54e6ea80a465b1941d39d3cc014dd9fe5443804fe4d1bac3350c2 + REF v1.4.1 + SHA512 a3d23ea2f9d97a9248d05ecdac5f10bc9b7fffaf9a225e8b1dbd14ace4f7acb33758cca3321774a52d21625a21cb98bb51672f018e8a458f9fff1fb194bec0e6 HEAD_REF master PATCHES vcpkg.patch + ssize_t.patch ) vcpkg_configure_cmake( diff --git a/ports/trantor/ssize_t.patch b/ports/trantor/ssize_t.patch new file mode 100644 index 000000000..23021aea8 --- /dev/null +++ b/ports/trantor/ssize_t.patch @@ -0,0 +1,26 @@ +diff --git a/trantor/net/EventLoop.cc b/trantor/net/EventLoop.cc +index b4523ad..8009db4 100644 +--- a/trantor/net/EventLoop.cc ++++ b/trantor/net/EventLoop.cc +@@ -26,7 +26,7 @@ + #include <assert.h> + #ifdef _WIN32 + #include <io.h> +-using ssize_t = std::intptr_t; ++using ssize_t = long long; + #else + #include <poll.h> + #endif +diff --git a/trantor/utils/MsgBuffer.h b/trantor/utils/MsgBuffer.h +index bdd5c23..33c8633 100644 +--- a/trantor/utils/MsgBuffer.h ++++ b/trantor/utils/MsgBuffer.h +@@ -22,7 +22,7 @@ + #include <assert.h> + #include <string.h> + #ifdef _WIN32 +-using ssize_t = std::intptr_t; ++using ssize_t = long long; + #endif + + namespace trantor diff --git a/versions/baseline.json b/versions/baseline.json index f1aec8482..c20e4897d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6153,7 +6153,7 @@ "port-version": 0 }, "trantor": { - "baseline": "1.4.0", + "baseline": "1.4.1", "port-version": 0 }, "tre": { diff --git a/versions/t-/trantor.json b/versions/t-/trantor.json index 6f0996f24..e1baaffec 100644 --- a/versions/t-/trantor.json +++ b/versions/t-/trantor.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "f53004074d57fe4748b87a81dcc59f35a20715ce", + "version-string": "1.4.1", + "port-version": 0 + }, + { "git-tree": "2c0b4590aa43f963fea34277e0aa981c8326652d", "version-string": "1.4.0", "port-version": 0 |