From 46700e2a0c6a4e7d93d40da00965d01925b48ef5 Mon Sep 17 00:00:00 2001 From: Niall Douglas Date: Mon, 27 Sep 2021 20:42:44 +0100 Subject: [ned14-internal-quickcpplib/llfio/outcome] Update to latest release (#20171) * Update ned14-internal-quickcpplib and LLFIO to latest matching Outcome v2.2.1 (bugfixed) release. * Implement suggested changes during review. Update Outcome and LLFIO to latest. * Re x-add-version. * Fix version database. Co-authored-by: Billy Robert O'Neal III --- ports/ned14-internal-quickcpplib/portfile.cmake | 6 +++--- ports/ned14-internal-quickcpplib/quicklib-depheaders.patch | 6 +++--- ports/ned14-internal-quickcpplib/sha_manifest.cmake | 4 ++-- ports/ned14-internal-quickcpplib/vcpkg.json | 3 +-- 4 files changed, 9 insertions(+), 10 deletions(-) (limited to 'ports/ned14-internal-quickcpplib') diff --git a/ports/ned14-internal-quickcpplib/portfile.cmake b/ports/ned14-internal-quickcpplib/portfile.cmake index 57cb70c7f..124fa3157 100644 --- a/ports/ned14-internal-quickcpplib/portfile.cmake +++ b/ports/ned14-internal-quickcpplib/portfile.cmake @@ -11,10 +11,10 @@ include(${CURRENT_PORT_DIR}/sha_manifest.cmake) message(WARNING [=[ -QuickCppLib and its downstream dependencies Outcome and LLFIO were tested against gsl-lite version 0.37.0 and byte-lite version 0.2.0. They are not guaranteed to work with newer versions, with failures experienced in the past up-to-and-including runtime crashes. You can pin the versions as verified to work in QuickCppLib's CI in your manifest file by adding: +QuickCppLib and its downstream dependencies Outcome and LLFIO were tested against gsl-lite version 0.38.1 and byte-lite version 0.3.0. They are not guaranteed to work with newer versions, with failures experienced in the past up-to-and-including runtime crashes. You can pin the versions as verified to work in QuickCppLib's CI in your manifest file by adding: "overrides": [ - { "name": "gsl-lite", "version": "0.37.0" }, - { "name": "byte-lite", "version": "0.2.0" } + { "name": "gsl-lite", "version": "0.38.1" }, + { "name": "byte-lite", "version": "0.3.0" } ] Do not report issues to upstream without first pinning these previous versions. ]=]) diff --git a/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch b/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch index 6e7ea0a5d..7ad3c3b9a 100644 --- a/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch +++ b/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch @@ -2,16 +2,16 @@ diff --git a/cmake/headers.cmake b/cmake/headers.cmake index 1aad359..e5053ed 100644 --- a/cmake/headers.cmake +++ b/cmake/headers.cmake -@@ -13,8 +13,6 @@ set(quickcpplib_HEADERS +@@ -15,8 +15,6 @@ set(quickcpplib_HEADERS "include/quickcpplib/boost/test/unit_test.hpp" "include/quickcpplib/byte.hpp" "include/quickcpplib/byte/include/nonstd/byte.hpp" - "include/quickcpplib/byte/test/byte-main.t.hpp" -- "include/quickcpplib/byte/test/lest_cpp03.hpp" +- "include/quickcpplib/byte/test/lest/lest_cpp03.hpp" "include/quickcpplib/config.hpp" "include/quickcpplib/console_colours.hpp" "include/quickcpplib/cpp_feature.h" -@@ -25,15 +23,8 @@ set(quickcpplib_HEADERS +@@ -27,15 +25,8 @@ set(quickcpplib_HEADERS "include/quickcpplib/erasure_cast.hpp" "include/quickcpplib/execinfo_win64.h" "include/quickcpplib/function_ptr.hpp" diff --git a/ports/ned14-internal-quickcpplib/sha_manifest.cmake b/ports/ned14-internal-quickcpplib/sha_manifest.cmake index 383b8b853..78b7c36ee 100644 --- a/ports/ned14-internal-quickcpplib/sha_manifest.cmake +++ b/ports/ned14-internal-quickcpplib/sha_manifest.cmake @@ -1,5 +1,5 @@ -set(QUICKCPPLIB_REF 7cb75d4e190fec886a655fd50d3fe80d933e0efb) -set(QUICKCPPLIB_SHA512 891b1620485119545f28528d3407d5d896e0da7530224a684cd7201581ea45871761bef8b9e3914fd2a104ecac3d35c50a049893ef32b1ef95d871e63371d6f3) +set(QUICKCPPLIB_REF e691a6dc0358c1091d59022af06a97d68fcc074d) +set(QUICKCPPLIB_SHA512 8e3213a4d730a3db842fcb61da970badf82a42bd169c8d65f64f1edc1098d1103513f901081ee004395437ae90cb8536040ccb8e44dea764646cb27274caaa6a) set(OPTIONAL_REF 2b43315458a99fc5de1da6e7bc0ddd364b26d643) set(OPTIONAL_SHA512 1952386cd3c7b963861f9634055e1baa4181d398d6f1b068a8a3f411368432bdcd42e47aadfa856584ed9a7c724a1c83369243ccb653e650af5c9155b42a84f4) diff --git a/ports/ned14-internal-quickcpplib/vcpkg.json b/ports/ned14-internal-quickcpplib/vcpkg.json index b201b5fdc..a0e89d594 100644 --- a/ports/ned14-internal-quickcpplib/vcpkg.json +++ b/ports/ned14-internal-quickcpplib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ned14-internal-quickcpplib", - "version-string": "0.0.0-7cb75d4e", - "port-version": 1, + "version-string": "0.0.0-e691a6dc", "description": "NOT FOR EXTERNAL CONSUMPTION, a set of internal scripts used by ned14's libraries.", "homepage": "https://github.com/ned14/quickcpplib", "dependencies": [ -- cgit v1.2.3