diff --git a/ports/cpptrace/conversion.patch b/ports/cpptrace/conversion.patch deleted file mode 100644 index d5aa8d702b..0000000000 --- a/ports/cpptrace/conversion.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 851c1e9..23bd55f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -288,6 +288,8 @@ target_compile_features( - PRIVATE cxx_std_11 - ) - -+target_compile_definitions(${target_name} PRIVATE NOMINMAX) -+ - if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") - SET(CMAKE_C_ARCHIVE_FINISH " -no_warning_for_no_symbols -c ") - SET(CMAKE_CXX_ARCHIVE_FINISH " -no_warning_for_no_symbols -c ") -diff --git a/src/snippets/snippet.cpp b/src/snippets/snippet.cpp -index d9ec4dc..660d375 100644 ---- a/src/snippets/snippet.cpp -+++ b/src/snippets/snippet.cpp -@@ -9,6 +9,7 @@ - #include - - #include "../utils/common.hpp" -+#include "../utils/utils.hpp" - - namespace cpptrace { - namespace detail { -@@ -36,7 +37,7 @@ namespace detail { - } - // else load file - file.seekg(0, std::ios::beg); -- contents.resize(size); -+ contents.resize(to(size)); - if(!file.read(&contents[0], size)) { - // error ... - } diff --git a/ports/cpptrace/portfile.cmake b/ports/cpptrace/portfile.cmake index fa0092396b..cccc7c0d54 100644 --- a/ports/cpptrace/portfile.cmake +++ b/ports/cpptrace/portfile.cmake @@ -2,10 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jeremy-rifkin/cpptrace REF "v${VERSION}" - SHA512 61d041c550ea5e5f887d181ac89b9c2aaa6b9165529d4815caf54dcfea3e00548bbae104d64a7298a075d6337f0aca3d3325f6b20e6004353a75e7f3e3a0443a + SHA512 ae2f9a317d70ce798c1a85d6898d073e65e21febc17c6c0127467ecb9d639f4df102cba37f2199a941a46201933fb75ae1b37cc3042d31f4c94e0279969e642a HEAD_REF main - PATCHES - conversion.patch ) vcpkg_cmake_configure( diff --git a/ports/cpptrace/vcpkg.json b/ports/cpptrace/vcpkg.json index eda6e5566d..42a8bf7297 100644 --- a/ports/cpptrace/vcpkg.json +++ b/ports/cpptrace/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpptrace", - "version": "0.5.0", + "version": "0.5.1", "description": "Simple, portable, and self-contained stacktrace library for C++11 and newer", "homepage": "https://github.com/jeremy-rifkin/cpptrace", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 4192a674be..01dacbf6cc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1929,7 +1929,7 @@ "port-version": 4 }, "cpptrace": { - "baseline": "0.5.0", + "baseline": "0.5.1", "port-version": 0 }, "cppunit": { diff --git a/versions/c-/cpptrace.json b/versions/c-/cpptrace.json index 4eabbe4c16..5737291019 100644 --- a/versions/c-/cpptrace.json +++ b/versions/c-/cpptrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f262cd71efd35dba535e0c2e3a447760f06f5593", + "version": "0.5.1", + "port-version": 0 + }, { "git-tree": "e9f72095acc3125b572269e30506eaf670cfd089", "version": "0.5.0",