diff --git a/ports/llfio/portfile.cmake b/ports/llfio/portfile.cmake index 03844f75e90..569af09f8d6 100644 --- a/ports/llfio/portfile.cmake +++ b/ports/llfio/portfile.cmake @@ -6,8 +6,8 @@ LLFIO depends on Outcome which depends on QuickCppLib which uses the vcpkg versi vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/llfio - REF 565f27555d13ce2a37346d838f32e03e1972aac1 - SHA512 386007d03c3923e79bb1b80b1b750ae738bbc22aa5124c606cc5e7818f57a4b819bb920257c9aca39765a4a8b93d2528b4a956c53b96bd8db3b8d4a54a851e41 + REF 721503d32fe35dbaa93bde0214ae8cd3799d14b8 + SHA512 b017a0fddcd3e53c22d9863454e7ad4ce364d9e4fa46cd909ceb395df57052b5d4334081a3405e1248452863c451c3174dc7eaab70907dc8d22f4db67930cbd5 HEAD_REF develop ) diff --git a/ports/llfio/vcpkg.json b/ports/llfio/vcpkg.json index 8f343387c5f..318b32816d5 100644 --- a/ports/llfio/vcpkg.json +++ b/ports/llfio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "llfio", - "version-string": "2.0", - "port-version": 20210421, + "version-string": "2.0-20210922", "description": "P1031 low level file i/o and filesystem library for the C++ standard", "homepage": "https://github.com/ned14/llfio", "supports": "!(uwp | static)", diff --git a/ports/ned14-internal-quickcpplib/portfile.cmake b/ports/ned14-internal-quickcpplib/portfile.cmake index 57cb70c7fb6..124fa315703 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 6e7ea0a5d54..7ad3c3b9a77 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 383b8b85334..78b7c36ee8c 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 b201b5fdcc6..a0e89d5941f 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": [ diff --git a/ports/outcome/portfile.cmake b/ports/outcome/portfile.cmake index 79dc21b8e66..38cf26bf10c 100644 --- a/ports/outcome/portfile.cmake +++ b/ports/outcome/portfile.cmake @@ -22,8 +22,8 @@ Outcome depends on QuickCppLib which uses the vcpkg versions of gsl-lite and byt vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/outcome - REF v2.2.0 - SHA512 2391667304c0160b7c753df157c948fa7d7f362c9f7f238fc53b0dcbdabe23f6d481909bb8e267c749af8c5c1a1c5083e91c12365fe1beb9bc70e6287f526879 + REF a86c6b053b86e4fc5d920907b0afb3234bec9336 + SHA512 c282afd7b335fef37ec4c2011bf591d3ffd56872515e8fcbd95714020ab99d141a87a064ecda44bf9308cb4bd1f39977b62303f2cc297918be2f257a36ff5832 HEAD_REF develop PATCHES outcome-prune-sources.patch diff --git a/ports/outcome/vcpkg.json b/ports/outcome/vcpkg.json index 6c0a4e93ad3..0735c5d090d 100644 --- a/ports/outcome/vcpkg.json +++ b/ports/outcome/vcpkg.json @@ -1,7 +1,6 @@ { "name": "outcome", - "version-string": "2.2.0-release", - "port-version": 1, + "version-string": "2.2.2-20210922", "description": "Provides very lightweight outcome and result (non-Boost edition)", "homepage": "https://github.com/ned14/outcome", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 1252bd05254..1c645daba51 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3977,8 +3977,8 @@ "port-version": 2 }, "llfio": { - "baseline": "2.0", - "port-version": 20210421 + "baseline": "2.0-20210922", + "port-version": 0 }, "llgl": { "baseline": "2019-08-15", @@ -4505,8 +4505,8 @@ "port-version": 1 }, "ned14-internal-quickcpplib": { - "baseline": "0.0.0-7cb75d4e", - "port-version": 1 + "baseline": "0.0.0-e691a6dc", + "port-version": 0 }, "neon2sse": { "baseline": "2021-09-16", @@ -4933,8 +4933,8 @@ "port-version": 0 }, "outcome": { - "baseline": "2.2.0-release", - "port-version": 1 + "baseline": "2.2.2-20210922", + "port-version": 0 }, "p-ranav-csv": { "baseline": "2019-07-11", diff --git a/versions/l-/llfio.json b/versions/l-/llfio.json index d60f6ba93bb..fa6953fb264 100644 --- a/versions/l-/llfio.json +++ b/versions/l-/llfio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "208ec7684366cb893eeeeb9f86b4b6c92fab7e28", + "version-string": "2.0-20210922", + "port-version": 0 + }, { "git-tree": "3ff2b8c721c107574a4a81aa219fe4c119eaa9e3", "version-string": "2.0", diff --git a/versions/n-/ned14-internal-quickcpplib.json b/versions/n-/ned14-internal-quickcpplib.json index b19151577b7..2c4ad5ca688 100644 --- a/versions/n-/ned14-internal-quickcpplib.json +++ b/versions/n-/ned14-internal-quickcpplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "801be68901e5e7e84e4069015346fc457e72953c", + "version-string": "0.0.0-e691a6dc", + "port-version": 0 + }, { "git-tree": "3cd8528057f78bdbc43616bbe7349acd5cc41c77", "version-string": "0.0.0-7cb75d4e", diff --git a/versions/o-/outcome.json b/versions/o-/outcome.json index e6e8e276659..6c50899e89d 100644 --- a/versions/o-/outcome.json +++ b/versions/o-/outcome.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31aada521fafc8169a891338a3af04fa4f658327", + "version-string": "2.2.2-20210922", + "port-version": 0 + }, { "git-tree": "275bb74716bbeb4b09b1e97c442e0e085490c646", "version-string": "2.2.0-release",