diff --git a/devel/outcome/Makefile b/devel/outcome/Makefile index eeba9d0be634..935d5f09bb05 100644 --- a/devel/outcome/Makefile +++ b/devel/outcome/Makefile @@ -1,41 +1,42 @@ PORTNAME= outcome DISTVERSIONPREFIX= v -DISTVERSION= 2.2.12 +DISTVERSION= 2.2.15 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org COMMENT= C++14 library for reporting and handling function failures WWW= https://ned14.github.io/outcome/ \ https://github.com/ned14/outcome LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/Licence.txt BUILD_DEPENDS= ${LOCALBASE}/include/quickcpplib/config.hpp:devel/quickcpplib RUN_DEPENDS= ${LOCALBASE}/include/quickcpplib/config.hpp:devel/quickcpplib USES= cmake:testing compiler:c++14-lang USE_GITHUB= yes GH_ACCOUNT= ned14 -GH_TUPLE= ned14:status-code:85a75b7:status_code/include/outcome/experimental/status-code +GH_TUPLE= ned14:status-code:937b0fc:status_code/include/outcome/experimental/status-code \ + ned14:wg14_result:f34e89b:wg14_result/include/outcome/experimental/wg14_result CMAKE_OFF= BUILD_TESTING CMAKE_TESTING_ON= BUILD_TESTING OUTCOME_ENABLE_DEPENDENCY_SMOKE_TEST CMAKE_ARGS= -Dquickcpplib_DIR=${LOCALBASE}/lib/cmake/quickcpplib NO_BUILD= yes NO_ARCH= yes PORTSCOUT= limit:^.*[0-9]\.[0-9].* .include .if ${ARCH:Marmv?} pre-configure: ${FIND} ${WRKDIR} \( -name \*.hpp -o -name \*.h \) -exec ${REINPLACE_CMD} -e 's,@progbits,%progbits,' {} + .endif -# tests as of 2.2.12: 100% tests passed, 0 tests failed out of 4 +# tests as of 2.2.15: 100% tests passed, 0 tests failed out of 4 .include diff --git a/devel/outcome/distinfo b/devel/outcome/distinfo index 4e59c3bf0c93..920781704f7b 100644 --- a/devel/outcome/distinfo +++ b/devel/outcome/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1744522919 -SHA256 (ned14-outcome-v2.2.12_GH0.tar.gz) = 14e15bda4e7c26ee42b0329d7ff746235f67bda084305c9d61297e9a521deb18 -SIZE (ned14-outcome-v2.2.12_GH0.tar.gz) = 2485312 -SHA256 (ned14-status-code-85a75b7_GH0.tar.gz) = 0e5332b80e2faba66479264b06453ccb5b4525a755c2d681d57cfe56949d20ba -SIZE (ned14-status-code-85a75b7_GH0.tar.gz) = 172485 +TIMESTAMP = 1777393335 +SHA256 (ned14-outcome-v2.2.15_GH0.tar.gz) = 7da2314c3f3ee6fac2e2b3229c46cc4b5d3c86fa2f7d561e7dab72e4a93783fd +SIZE (ned14-outcome-v2.2.15_GH0.tar.gz) = 2461295 +SHA256 (ned14-status-code-937b0fc_GH0.tar.gz) = a18fb0910f0c8672ca88aae33fa4e3be558caf25f22e4d4d529b2d667be36879 +SIZE (ned14-status-code-937b0fc_GH0.tar.gz) = 177015 +SHA256 (ned14-wg14_result-f34e89b_GH0.tar.gz) = 6f31c1649ddbce3a7cefdb4aa0747bd5d2bfd653e5b6e54185466b1054d6d2a7 +SIZE (ned14-wg14_result-f34e89b_GH0.tar.gz) = 170150 diff --git a/devel/outcome/files/patch-CMakeLists.txt b/devel/outcome/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..0d98d8d3b10f --- /dev/null +++ b/devel/outcome/files/patch-CMakeLists.txt @@ -0,0 +1,17 @@ +-- Fix configure failure with CMake 3.27+ due to CMP0148 policy removing FindPythonInterp. +-- cmake_minimum_required(VERSION 3.10...4.0) enables CMP0148=NEW, which makes +-- include(FindPythonInterp) in QuickCppLibSetupProject.cmake fail with an error. +-- Set CMP0148=OLD before including QuickCppLibSetupProject to restore old behavior. +--- CMakeLists.txt.orig 2026-04-28 16:27:10 UTC ++++ CMakeLists.txt +@@ -48,6 +48,10 @@ set(PROJECT_NAMESPACE) + set(PROJECT_NAMESPACE) + + # Setup this cmake environment for this project ++# CMP0148: FindPythonInterp removed in CMake 3.27+, used by QuickCppLibSetupProject ++if(POLICY CMP0148) ++ cmake_policy(SET CMP0148 OLD) ++endif() + include(QuickCppLibSetupProject) + + option(OUTCOME_BUNDLE_EMBEDDED_QUICKCPPLIB "Whether to bundle an embedded copy of QuickCppLib with Outcome. Used by various package managers such as vcpkg." OFF) diff --git a/devel/outcome/pkg-plist b/devel/outcome/pkg-plist index ba474d83500e..e133ec6e6090 100644 --- a/devel/outcome/pkg-plist +++ b/devel/outcome/pkg-plist @@ -1,75 +1,89 @@ include/outcome.hpp include/outcome/bad_access.hpp include/outcome/basic_outcome.hpp include/outcome/basic_result.hpp include/outcome/boost_outcome.hpp include/outcome/boost_result.hpp include/outcome/config.hpp include/outcome/convert.hpp include/outcome/coroutine_support.hpp include/outcome/detail/basic_outcome_exception_observers.hpp include/outcome/detail/basic_outcome_exception_observers_impl.hpp include/outcome/detail/basic_outcome_failure_observers.hpp include/outcome/detail/basic_result_error_observers.hpp include/outcome/detail/basic_result_final.hpp include/outcome/detail/basic_result_storage.hpp include/outcome/detail/basic_result_value_observers.hpp include/outcome/detail/coroutine_support.ipp include/outcome/detail/revision.hpp include/outcome/detail/trait_std_error_code.hpp include/outcome/detail/trait_std_exception.hpp include/outcome/detail/try.h include/outcome/detail/value_storage.hpp include/outcome/detail/version.hpp include/outcome/experimental/coroutine_support.hpp include/outcome/experimental/result.h include/outcome/experimental/status-code/include/status-code/boost_error_code.hpp include/outcome/experimental/status-code/include/status-code/com_code.hpp include/outcome/experimental/status-code/include/status-code/config.hpp include/outcome/experimental/status-code/include/status-code/detail/nt_code_to_generic_code.ipp include/outcome/experimental/status-code/include/status-code/detail/nt_code_to_win32_code.ipp include/outcome/experimental/status-code/include/status-code/detail/win32_code_to_generic_code.ipp include/outcome/experimental/status-code/include/status-code/error.hpp include/outcome/experimental/status-code/include/status-code/errored_status_code.hpp include/outcome/experimental/status-code/include/status-code/generic_code.hpp include/outcome/experimental/status-code/include/status-code/getaddrinfo_code.hpp include/outcome/experimental/status-code/include/status-code/http_status_code.hpp include/outcome/experimental/status-code/include/status-code/iostream_support.hpp include/outcome/experimental/status-code/include/status-code/nested_status_code.hpp include/outcome/experimental/status-code/include/status-code/nt_code.hpp include/outcome/experimental/status-code/include/status-code/posix_code.hpp include/outcome/experimental/status-code/include/status-code/quick_status_code_from_enum.hpp include/outcome/experimental/status-code/include/status-code/result.hpp include/outcome/experimental/status-code/include/status-code/status_code.hpp include/outcome/experimental/status-code/include/status-code/status_code_domain.hpp include/outcome/experimental/status-code/include/status-code/status_error.hpp include/outcome/experimental/status-code/include/status-code/std_error_code.hpp include/outcome/experimental/status-code/include/status-code/system_code.hpp include/outcome/experimental/status-code/include/status-code/system_code_from_exception.hpp include/outcome/experimental/status-code/include/status-code/system_error2.hpp include/outcome/experimental/status-code/include/status-code/win32_code.hpp +include/outcome/experimental/status-code/single-header/system_error2-nowindows.hpp include/outcome/experimental/status-code/single-header/system_error2.hpp include/outcome/experimental/status_outcome.hpp include/outcome/experimental/status_result.hpp +include/outcome/experimental/wg14_result/include/wg14_result/all.h +include/outcome/experimental/wg14_result/include/wg14_result/all.hpp +include/outcome/experimental/wg14_result/include/wg14_result/config.h +include/outcome/experimental/wg14_result/include/wg14_result/result.h +include/outcome/experimental/wg14_result/include/wg14_result/status_code.h +include/outcome/experimental/wg14_result/include/wg14_result/status_code_domain.h +include/outcome/experimental/wg14_result/include/wg14_result/status_code_generic.h +include/outcome/experimental/wg14_result/include/wg14_result/status_code_posix.h +include/outcome/experimental/wg14_result/include/wg14_result/status_code_system.h +include/outcome/experimental/wg14_result/include/wg14_result/try.h +include/outcome/experimental/wg14_result/test/test_common.h +include/outcome/experimental/wg14_result/test/ticks_clock.h include/outcome/iostream_support.hpp +include/outcome/iostream_support_result.hpp include/outcome/outcome.hpp include/outcome/outcome.natvis include/outcome/outcome_gdb.h include/outcome/policy/all_narrow.hpp include/outcome/policy/base.hpp include/outcome/policy/fail_to_compile_observers.hpp include/outcome/policy/outcome_error_code_throw_as_system_error.hpp include/outcome/policy/outcome_exception_ptr_rethrow.hpp include/outcome/policy/result_error_code_throw_as_system_error.hpp include/outcome/policy/result_exception_ptr_rethrow.hpp include/outcome/policy/terminate.hpp include/outcome/policy/throw_bad_result_access.hpp include/outcome/result.hpp include/outcome/std_outcome.hpp include/outcome/std_result.hpp include/outcome/success_failure.hpp include/outcome/trait.hpp include/outcome/try.hpp include/outcome/utils.hpp lib/cmake/outcome/outcomeConfig.cmake lib/cmake/outcome/outcomeExports.cmake