From 29787a71b3276aee4e3766245531b21219f4eaff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Ga=C3=9Fmann?= Date: Fri, 9 Sep 2022 20:55:55 +0200 Subject: [PATCH] [status-code,outcome,llfio,ned14-internal-quickcpplib] Update to 2022-09-08 (#26724) * [quickcpplib] Update to 2022-09-08 * [status-code] Update to 2022-09-08 * [outcome] Update to version 2.2.4 * [llfio] Update to 2022-09-08 * [status-code,outcome,llfio] Update version database --- .../fix-vendored-status-code-include.patch | 16 --------- ports/llfio/issue-83-fix-backport.patch | 35 ------------------- ports/llfio/portfile.cmake | 10 ++---- ports/llfio/vcpkg.json | 7 ++-- .../ned14-internal-quickcpplib/portfile.cmake | 2 +- .../sha_manifest.cmake | 4 +-- ports/ned14-internal-quickcpplib/vcpkg.json | 6 +++- ports/outcome/portfile.cmake | 13 +++---- ports/outcome/vcpkg.json | 6 +++- ports/status-code/no-target-sources.patch | 12 ------- ports/status-code/portfile.cmake | 10 ++---- ports/status-code/vcpkg.json | 6 +++- versions/baseline.json | 10 +++--- versions/l-/llfio.json | 5 +++ versions/n-/ned14-internal-quickcpplib.json | 5 +++ versions/o-/outcome.json | 5 +++ versions/s-/status-code.json | 5 +++ 17 files changed, 59 insertions(+), 98 deletions(-) delete mode 100644 ports/llfio/fix-vendored-status-code-include.patch delete mode 100644 ports/llfio/issue-83-fix-backport.patch delete mode 100644 ports/status-code/no-target-sources.patch diff --git a/ports/llfio/fix-vendored-status-code-include.patch b/ports/llfio/fix-vendored-status-code-include.patch deleted file mode 100644 index 381b9143be..0000000000 --- a/ports/llfio/fix-vendored-status-code-include.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/include/llfio/v2.0/status_code.hpp b/include/llfio/v2.0/status_code.hpp -index 03eb0f67..0c3f5e41 100644 ---- a/include/llfio/v2.0/status_code.hpp -+++ b/include/llfio/v2.0/status_code.hpp -@@ -57,7 +57,11 @@ as that (a) enables safe header only LLFIO on Windows (b) produces better codege - #include "outcome/try.hpp" - // Bring in status code utility - #include "outcome/experimental/coroutine_support.hpp" -+#if 0 - #include "outcome/experimental/status-code/include/system_code_from_exception.hpp" -+#else -+#include -+#endif - #if !defined(LLFIO_ENABLE_COROUTINES) && defined(OUTCOME_FOUND_COROUTINE_HEADER) - #define LLFIO_ENABLE_COROUTINES 1 - #endif diff --git a/ports/llfio/issue-83-fix-backport.patch b/ports/llfio/issue-83-fix-backport.patch deleted file mode 100644 index dbf4c53a92..0000000000 --- a/ports/llfio/issue-83-fix-backport.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/include/llfio/v2.0/map_handle.hpp b/include/llfio/v2.0/map_handle.hpp -index 55cefa8f..3962be16 100644 ---- a/include/llfio/v2.0/map_handle.hpp -+++ b/include/llfio/v2.0/map_handle.hpp -@@ -294,8 +294,8 @@ support this operation). You may find the `is_nvram()` observer of particular us - */ - inline io_handle::const_buffer_type nvram_barrier(io_handle::const_buffer_type req, bool evict = false) noexcept - { -- auto *tp = (io_handle::const_buffer_type::pointer)(((uintptr_t) req.data()) & ~63); -- io_handle::const_buffer_type ret{tp, (size_t)(req.data() + 63 + req.size() - tp) & ~63}; -+ auto *tp = (io_handle::const_buffer_type::pointer) (((uintptr_t) req.data()) & ~63); -+ io_handle::const_buffer_type ret{tp, (size_t) (req.data() + 63 + req.size() - tp) & ~63}; - if(memory_flush_none == mem_flush_stores(ret.data(), ret.size(), evict ? memory_flush_evict : memory_flush_retain)) - { - ret = {tp, 0}; -@@ -954,7 +954,8 @@ namespace detail - { - try - { -- auto make_shared = [](map_handle h) { -+ auto make_shared = [](map_handle h) -> io_handle::registered_buffer_type -+ { - struct registered_buffer_type_indirect : io_multiplexer::_registered_buffer_type - { - map_handle h; -@@ -964,8 +965,7 @@ namespace detail - { - } - }; -- auto ptr = std::make_shared(std::move(h)); -- return ptr; -+ return io_handle::registered_buffer_type(std::make_shared(std::move(h))); - }; - const auto &page_sizes = utils::page_sizes(true); - size_t idx = 0; diff --git a/ports/llfio/portfile.cmake b/ports/llfio/portfile.cmake index 0f9674fb03..cf02917a7c 100644 --- a/ports/llfio/portfile.cmake +++ b/ports/llfio/portfile.cmake @@ -8,14 +8,10 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/llfio - REF 4a117d683b82a2e3e456c2ecc47a99c8406280fa - SHA512 7880356dbff10664a146a09558ba15f95cf6883ebe8e0af3d392fbd6f86f3455b9b5c8b6c5c1281c8fca93c358fcafd3468ab575eee0b483ec5b136ca59eef04 + REF ae7f9c5a92879285ad5100c89efc47ce1cb0031b + SHA512 aa8563e4e78e4355ae1041bd8d2984e33e8c8b7634a6eac029e4716dff564a9616ba1826504709f428f789103e8f4ab90447208e66583536ad692400e51eec60 HEAD_REF develop PATCHES - # https://github.com/ned14/llfio/issues/83 - # To be removed on next update - issue-83-fix-backport.patch - fix-vendored-status-code-include.patch ) vcpkg_from_github( @@ -88,4 +84,4 @@ if("status-code" IN_LIST FEATURES) else() file(INSTALL "${CURRENT_PORT_DIR}/usage-error-code-${VCPKG_LIBRARY_LINKAGE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") endif() -file(INSTALL "${SOURCE_PATH}/Licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Licence.txt") diff --git a/ports/llfio/vcpkg.json b/ports/llfio/vcpkg.json index 6856dc8148..6b8a3d03eb 100644 --- a/ports/llfio/vcpkg.json +++ b/ports/llfio/vcpkg.json @@ -1,7 +1,10 @@ { "name": "llfio", - "version": "2.0-20220112", - "port-version": 3, + "version-date": "2022-09-08", + "maintainers": [ + "Niall Douglas ", + "Henrik Gaßmann " + ], "description": "P1031 low level file i/o and filesystem library for the C++ standard", "homepage": "https://github.com/ned14/llfio", "license": "Apache-2.0 OR BSL-1.0", diff --git a/ports/ned14-internal-quickcpplib/portfile.cmake b/ports/ned14-internal-quickcpplib/portfile.cmake index d9878b6bf9..c002bd691e 100644 --- a/ports/ned14-internal-quickcpplib/portfile.cmake +++ b/ports/ned14-internal-quickcpplib/portfile.cmake @@ -99,4 +99,4 @@ vcpkg_cmake_config_fixup( file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/Licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Licence.txt") diff --git a/ports/ned14-internal-quickcpplib/sha_manifest.cmake b/ports/ned14-internal-quickcpplib/sha_manifest.cmake index 25aa1d36af..76d249460e 100644 --- a/ports/ned14-internal-quickcpplib/sha_manifest.cmake +++ b/ports/ned14-internal-quickcpplib/sha_manifest.cmake @@ -1,5 +1,5 @@ -set(QUICKCPPLIB_REF 9cdcd45d9036247dcade3d3ab1ff4adbe14b1927) -set(QUICKCPPLIB_SHA512 c23831c7a43b678bc33f11b3ccfc31ccb580f7225bfb7771010cdb5bc2d6a45a1d3c7b6b2dda7c5691fae817da3b303265156d434d7cb6efb9a86714b0095675) +set(QUICKCPPLIB_REF 1dac5b6bf79b5ec8eb3a75fa75844a30f88b8559) +set(QUICKCPPLIB_SHA512 c53f0a3d651db8be60a4a1308da1cc8458f3eb1fcb9296324bdce472c968a2ff4239a666e609755007f2397b146248a82aeab03824d7816eea9963339c989dca) 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 d3dbc28695..f59ccf0080 100644 --- a/ports/ned14-internal-quickcpplib/vcpkg.json +++ b/ports/ned14-internal-quickcpplib/vcpkg.json @@ -1,6 +1,10 @@ { "name": "ned14-internal-quickcpplib", - "version-date": "2022-07-04", + "version-date": "2022-09-08", + "maintainers": [ + "Niall Douglas ", + "Henrik Gaßmann " + ], "description": "NOT FOR EXTERNAL CONSUMPTION, a set of internal scripts used by ned14's libraries.", "homepage": "https://github.com/ned14/quickcpplib", "license": "Apache-2.0 OR BSL-1.0", diff --git a/ports/outcome/portfile.cmake b/ports/outcome/portfile.cmake index 573b028e0c..a33baaf523 100644 --- a/ports/outcome/portfile.cmake +++ b/ports/outcome/portfile.cmake @@ -24,16 +24,14 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/outcome - REF 147ec1e8673c34cb7cf431dfdbf211d8072d7656 - SHA512 139723be3618b9f3c26c7da6fa5682e6810fc93192bd8752fb7a39378fa1bee8c14b8077d30f71852995bc323dd7beb6676635991995577797b054913cb10231 + REF 90032f99503b4620f21d8160dc3af06fa343541f + SHA512 7eda0694098a118633c8ad0ef812f8b03db536548f51d1ca71ca98b9f9e445bcb24019cd4d1046da9215227ad85205c5b3631d0c66de6edc1fcc904b2d9e0e0f HEAD_REF develop PATCHES - fix-find-library.patch - fix-status-code-include.patch + fix-find-library.patch # incorporated into upstream after 2.2.4 + fix-status-code-include.patch # incorporated into upstream after 2.2.4 ) -set(extra_config) - # Because outcome's deployed files are header-only, the debug build is not necessary set(VCPKG_BUILD_TYPE release) @@ -47,7 +45,6 @@ vcpkg_cmake_configure( -Dstatus-code_DIR=${CURRENT_INSTALLED_DIR}/share/status-code -DOUTCOME_ENABLE_DEPENDENCY_SMOKE_TEST=ON # Leave this always on to test everything compiles -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON - ${extra_config} ) if("run-tests" IN_LIST FEATURES) @@ -61,4 +58,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/outcome) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/Licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Licence.txt") diff --git a/ports/outcome/vcpkg.json b/ports/outcome/vcpkg.json index 1f4f2fe98a..4c34cefe95 100644 --- a/ports/outcome/vcpkg.json +++ b/ports/outcome/vcpkg.json @@ -1,6 +1,10 @@ { "name": "outcome", - "version": "2.2.3", + "version": "2.2.4", + "maintainers": [ + "Niall Douglas ", + "Henrik Gaßmann " + ], "description": "Provides very lightweight outcome and result (non-Boost edition)", "homepage": "https://github.com/ned14/outcome", "license": "Apache-2.0 OR BSL-1.0", diff --git a/ports/status-code/no-target-sources.patch b/ports/status-code/no-target-sources.patch deleted file mode 100644 index 38527094f7..0000000000 --- a/ports/status-code/no-target-sources.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cf3e8c1..aa380ca 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -108,7 +108,6 @@ foreach(source - ) - target_sources(status-code INTERFACE - "$" -- "$" - ) - get_filename_component(dir ${source} DIRECTORY) - install(FILES "${source}" diff --git a/ports/status-code/portfile.cmake b/ports/status-code/portfile.cmake index 5530f0bfe4..2e754a3471 100644 --- a/ports/status-code/portfile.cmake +++ b/ports/status-code/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/status-code - REF 60ec9e46916e5170051293e7925729ba88951934 - SHA512 f7a9448419f8e9228cd29c3b2e9268712de985675acea3b51f742ce88e524e7f51ccea7e08c89bf4e6d38eb1131416af052192531c168eed1f45e7eeda20fed6 + REF 8d5e162c9b02169fc6c95a79c54d1213027187b7 + SHA512 0af5a93a5015e070c2db8689f9a560c4a739ea40df3d7fee79f461d0274d7e79d27732cd339cb36e3af969adee0215c827b1fe63c177e8d7853c3fbe237f839f HEAD_REF master PATCHES - no-target-sources.patch # see https://github.com/ned14/status-code/issues/43 ) # Because status-code's deployed files are header-only, the debug build is not necessary @@ -22,9 +21,6 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/status-code) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include2") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") -file(RENAME "${CURRENT_PACKAGES_DIR}/include2" "${CURRENT_PACKAGES_DIR}/include/status-code") file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/Licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Licence.txt") diff --git a/ports/status-code/vcpkg.json b/ports/status-code/vcpkg.json index d76b0280a1..209d93bd7a 100644 --- a/ports/status-code/vcpkg.json +++ b/ports/status-code/vcpkg.json @@ -1,6 +1,10 @@ { "name": "status-code", - "version-string": "1.0.0-20220104", + "version-date": "2022-09-08", + "maintainers": [ + "Niall Douglas ", + "Henrik Gaßmann " + ], "description": "Proposed SG14 status_code for the C++ standard (https://wg21.link/P1028).", "homepage": "https://github.com/ned14/status-code", "license": "Apache-2.0 OR BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 41d24eca42..0b513c15c9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4409,8 +4409,8 @@ "port-version": 0 }, "llfio": { - "baseline": "2.0-20220112", - "port-version": 3 + "baseline": "2022-09-08", + "port-version": 0 }, "llgl": { "baseline": "2019-08-15", @@ -4985,7 +4985,7 @@ "port-version": 0 }, "ned14-internal-quickcpplib": { - "baseline": "2022-07-04", + "baseline": "2022-09-08", "port-version": 0 }, "neon2sse": { @@ -5453,7 +5453,7 @@ "port-version": 1 }, "outcome": { - "baseline": "2.2.3", + "baseline": "2.2.4", "port-version": 0 }, "p-ranav-csv": { @@ -7001,7 +7001,7 @@ "port-version": 1 }, "status-code": { - "baseline": "1.0.0-20220104", + "baseline": "2022-09-08", "port-version": 0 }, "status-value-lite": { diff --git a/versions/l-/llfio.json b/versions/l-/llfio.json index e9831a037f..257225bdc1 100644 --- a/versions/l-/llfio.json +++ b/versions/l-/llfio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7974159a11b2a1a1f5aed7b6c500eae3fa54481f", + "version-date": "2022-09-08", + "port-version": 0 + }, { "git-tree": "b6959e579906ce5c4ea9aa59f467499dce49a3b6", "version": "2.0-20220112", diff --git a/versions/n-/ned14-internal-quickcpplib.json b/versions/n-/ned14-internal-quickcpplib.json index aea0033245..8bc26ec425 100644 --- a/versions/n-/ned14-internal-quickcpplib.json +++ b/versions/n-/ned14-internal-quickcpplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89d5a8630a97d2e3a7cae1a56253de75014a0738", + "version-date": "2022-09-08", + "port-version": 0 + }, { "git-tree": "081192c8586e086ef1fe8beb576255f86dc9458e", "version-date": "2022-07-04", diff --git a/versions/o-/outcome.json b/versions/o-/outcome.json index 55d1d3735d..1bc47fa4d3 100644 --- a/versions/o-/outcome.json +++ b/versions/o-/outcome.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e3ec2f8aff33b12210dc924ff285b3cf23abb2a", + "version": "2.2.4", + "port-version": 0 + }, { "git-tree": "527591e7e0e55bc20c74cdc5553c08635b350999", "version": "2.2.3", diff --git a/versions/s-/status-code.json b/versions/s-/status-code.json index 24f644bba7..dc729bc925 100644 --- a/versions/s-/status-code.json +++ b/versions/s-/status-code.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6862c7199dafad1c85c5fabb09a4842c3fa1fa3", + "version-date": "2022-09-08", + "port-version": 0 + }, { "git-tree": "acf45fde7be9ba87dd72d79d3d8f79bc639e8530", "version-string": "1.0.0-20220104",