diff options
| author | An Tao <antao2002@gmail.com> | 2021-06-25 04:13:33 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-24 13:13:33 -0700 |
| commit | 80f5457d07ef2efcd62f0ac96026b3ba27de7f31 (patch) | |
| tree | 4088e60f42fdd25766713d714d7d617df6cc605f | |
| parent | 1d4f578353ef9348d2a20893d026bbb9e0e278fa (diff) | |
| download | vcpkg-80f5457d07ef2efcd62f0ac96026b3ba27de7f31.tar.gz vcpkg-80f5457d07ef2efcd62f0ac96026b3ba27de7f31.zip | |
[trantor] Update to 1.5.0 (#18534)
* [trantor] Update to 1.5.0
* Add vcpkg_fixup_pkgconfig()
| -rw-r--r-- | ports/trantor/CONTROL | 2 | ||||
| -rw-r--r-- | ports/trantor/portfile.cmake | 7 | ||||
| -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, 11 insertions, 31 deletions
diff --git a/ports/trantor/CONTROL b/ports/trantor/CONTROL index f6fa547af..447e609fc 100644 --- a/ports/trantor/CONTROL +++ b/ports/trantor/CONTROL @@ -1,5 +1,5 @@ Source: trantor -Version: 1.4.1 +Version: 1.5.0 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 8a85c262d..0017cb46a 100644 --- a/ports/trantor/portfile.cmake +++ b/ports/trantor/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/trantor - REF v1.4.1 - SHA512 a3d23ea2f9d97a9248d05ecdac5f10bc9b7fffaf9a225e8b1dbd14ace4f7acb33758cca3321774a52d21625a21cb98bb51672f018e8a458f9fff1fb194bec0e6 + REF v1.5.0 + SHA512 3e9e0f15aa7e039b70141b1ede16fcfe854af961cc787a0a51d4b020581e2b4ae1b51497e3ca31cfc4b5ed11dd9028a1438339cb726d83588f656c99d9938493 HEAD_REF master PATCHES vcpkg.patch - ssize_t.patch ) vcpkg_configure_cmake( @@ -19,6 +18,8 @@ vcpkg_install_cmake() # Fix CMake files vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Trantor) +vcpkg_fixup_pkgconfig() + # # Remove includes in debug file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/trantor/ssize_t.patch b/ports/trantor/ssize_t.patch deleted file mode 100644 index 23021aea8..000000000 --- a/ports/trantor/ssize_t.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 4c20954ec..611a09ea2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6309,7 +6309,7 @@ "port-version": 0 }, "trantor": { - "baseline": "1.4.1", + "baseline": "1.5.0", "port-version": 0 }, "tre": { diff --git a/versions/t-/trantor.json b/versions/t-/trantor.json index e1baaffec..afcabcd9c 100644 --- a/versions/t-/trantor.json +++ b/versions/t-/trantor.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "82647f91d6290a85e1b03801e75e17698b3da691", + "version-string": "1.5.0", + "port-version": 0 + }, + { "git-tree": "f53004074d57fe4748b87a81dcc59f35a20715ce", "version-string": "1.4.1", "port-version": 0 |