diff options
| author | autoantwort <41973254+autoantwort@users.noreply.github.com> | 2021-05-18 09:41:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-18 00:41:30 -0700 |
| commit | fe6e4b711f71159e2c358d0206edb5980842cda5 (patch) | |
| tree | 9ee6e9b96fe724c2058bb06dd76762237f11a3a9 /ports/oatpp | |
| parent | 32565de58115a09f20e8a04230ca6b5ec2827674 (diff) | |
| download | vcpkg-fe6e4b711f71159e2c358d0206edb5980842cda5.tar.gz vcpkg-fe6e4b711f71159e2c358d0206edb5980842cda5.zip | |
[oatpp] update to 1.2.5 (#17601)
* [oatpp] update to 1.2.5
* add version files
* update oatcpp libs to 1.2.5
* add version files
* use version instead of version string
* add version files
* update hashes
* add version files
* fix windows build
* add version files
* fix windows build
* add version files
Diffstat (limited to 'ports/oatpp')
| -rw-r--r-- | ports/oatpp/fix-windows-build.patch | 21 | ||||
| -rw-r--r-- | ports/oatpp/portfile.cmake | 8 | ||||
| -rw-r--r-- | ports/oatpp/vcpkg.json | 3 |
3 files changed, 27 insertions, 5 deletions
diff --git a/ports/oatpp/fix-windows-build.patch b/ports/oatpp/fix-windows-build.patch new file mode 100644 index 000000000..d017f7480 --- /dev/null +++ b/ports/oatpp/fix-windows-build.patch @@ -0,0 +1,21 @@ +diff --git a/src/oatpp/core/base/Environment.cpp b/src/oatpp/core/base/Environment.cpp +index b870835..ae36970 100644 +--- a/src/oatpp/core/base/Environment.cpp ++++ b/src/oatpp/core/base/Environment.cpp +@@ -36,14 +36,9 @@ + #include <WinSock2.h> + #endif + +-#if (defined(WIN32) || defined(_WIN32)) && defined(_WIN64) +-struct tm* localtime_r(time_t *_clock, struct tm *_result) { +- _localtime64_s(_result, _clock); +- return _result; +-} +-#elif (defined(WIN32) || defined(_WIN32)) && not defined(_WIN64) ++#if defined(WIN32) || defined(_WIN32) + struct tm* localtime_r(time_t *_clock, struct tm *_result) { +- _localtime32_s(_result, _clock); ++ localtime_s(_result, _clock); + return _result; + } + #endif diff --git a/ports/oatpp/portfile.cmake b/ports/oatpp/portfile.cmake index ed21d2b79..233bc2f22 100644 --- a/ports/oatpp/portfile.cmake +++ b/ports/oatpp/portfile.cmake @@ -1,13 +1,15 @@ -set(OATPP_VERSION "1.2.0") +set(OATPP_VERSION "1.2.5") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oatpp/oatpp - REF 8f1c11ae534e1f03646de8efcc9b2505fb1881cc # 1.2.0 - SHA512 4661aefe89be8153b08be0eb95ce688d5af3abd80e8f92fe3b2f1ac9dc76228383b05f7b33314de5f25d433013d6d287650ed156b69244b0d9ba8b604df8aaa3 + REF ${OATPP_VERSION} + SHA512 8c7c939860c02ade86234e46f907051b088c07d6975cf90190c9263bb7fd8081a7aaccd3e08bfe8a962c07ae39ff771cf17099a48812ecc69df20272a856d0ed HEAD_REF master + PATCHES + fix-windows-build.patch # see https://github.com/oatpp/oatpp/pull/428 ) vcpkg_configure_cmake( diff --git a/ports/oatpp/vcpkg.json b/ports/oatpp/vcpkg.json index bd5ab4dde..594939dcf 100644 --- a/ports/oatpp/vcpkg.json +++ b/ports/oatpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "oatpp", - "version-string": "1.2.0", - "port-version": 1, + "version": "1.2.5", "description": "Modern web framework.", "homepage": "https://github.com/oatpp/oatpp" } |