From 565bcbca70dbe07f9c96aadaf7f2d10aea8ca96b Mon Sep 17 00:00:00 2001 From: Liu Zixian Date: Sat, 26 Nov 2022 10:45:48 +0800 Subject: [PATCH] Backport outcome bugfix --- ...tests-complaining-about-no-test-tree.patch | 26 +++++++++++++++++++ boost.spec | 7 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 boost-1.80-outcome-Stop-Boost-regression-tests-complaining-about-no-test-tree.patch diff --git a/boost-1.80-outcome-Stop-Boost-regression-tests-complaining-about-no-test-tree.patch b/boost-1.80-outcome-Stop-Boost-regression-tests-complaining-about-no-test-tree.patch new file mode 100644 index 0000000..98a9edc --- /dev/null +++ b/boost-1.80-outcome-Stop-Boost-regression-tests-complaining-about-no-test-tree.patch @@ -0,0 +1,26 @@ +From 66ebdd4e86ab593c8723ee69f6654260de19775e Mon Sep 17 00:00:00 2001 +From: "Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)" + +Date: Fri, 18 Nov 2022 18:15:09 +0000 +Subject: [PATCH] Stop Boost regression tests complaining about no test tree. + +--- + libs/outcome/test/tests/issue0255.cpp | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/libs/outcome/test/tests/issue0255.cpp b/libs/outcome/test/tests/issue0255.cpp +index a8c962718f..bed5cceea5 100644 +--- a/libs/outcome/test/tests/issue0255.cpp ++++ b/libs/outcome/test/tests/issue0255.cpp +@@ -41,4 +41,11 @@ BOOST_OUTCOME_AUTO_TEST_CASE(issues / 0255 / test, "status_result not usabl + BOOST_CHECK(issues255::test().value() == 42); + } + ++#else ++ ++BOOST_OUTCOME_AUTO_TEST_CASE(issues_0255_test, "status_result not usable from constexpr in C++ 20") ++{ ++ BOOST_CHECK(true); ++} ++ + #endif diff --git a/boost.spec b/boost.spec index bf6fa02..f5679d3 100644 --- a/boost.spec +++ b/boost.spec @@ -2,7 +2,7 @@ Name: boost Version: 1.80.0 -Release: 1 +Release: 2 Summary: The free peer-reviewed portable C++ source libraries License: BSL-1.0 URL: http://www.boost.org @@ -12,6 +12,8 @@ Source0: https://boostorg.jfrog.io/ui/native/main/release/%{version}/sour # Remove them at the next release # https://github.com/boostorg/python/pull/373 Patch0: boost-1.78-python-Update-call_method-hpp.patch +# https://github.com/ned14/outcome/commit/66ebdd4e86ab593c8723ee69f6654260de19775e +Patch1: boost-1.80-outcome-Stop-Boost-regression-tests-complaining-about-no-test-tree.patch Requires: %{name}-atomic%{?_isa} = %{version}-%{release} Requires: %{name}-chrono%{?_isa} = %{version}-%{release} @@ -427,6 +429,9 @@ find libs -name example -exec cp {} boost-example --parents -r \; %{_libdir}/*.a %changelog +* Sat Nov 26 2022 Liu Zixian - 1.80.0-2 +- Backport outcome regression test bugfix + * Wed Aug 24 2022 Liu Zixian - 1.80.0-1 - update to 1.80.0 -- Gitee