diff options
Diffstat (limited to 'dev-cpp')
| -rw-r--r-- | dev-cpp/cpprestsdk/cpprestsdk-2.10.19-r4.ebuild | 38 | ||||
| -rw-r--r-- | dev-cpp/cpprestsdk/files/cpprestsdk-2.10.19-boost-1.87-compat.patch | 359 | ||||
| -rw-r--r-- | dev-cpp/reflection-cpp/Manifest | 1 | ||||
| -rw-r--r-- | dev-cpp/reflection-cpp/reflection-cpp-0.4.0.ebuild | 32 | ||||
| -rw-r--r-- | dev-cpp/taskflow/Manifest | 3 | ||||
| -rw-r--r-- | dev-cpp/taskflow/files/taskflow-3.3.0-fix_doctest.patch | 377 | ||||
| -rw-r--r-- | dev-cpp/taskflow/files/taskflow-3.4.0-fix_doctest.patch | 401 | ||||
| -rw-r--r-- | dev-cpp/taskflow/taskflow-3.10.0.ebuild (renamed from dev-cpp/taskflow/taskflow-3.3.0.ebuild) | 13 | ||||
| -rw-r--r-- | dev-cpp/taskflow/taskflow-3.4.0.ebuild | 47 | ||||
| -rw-r--r-- | dev-cpp/taskflow/taskflow-9999.ebuild | 13 | ||||
| -rw-r--r-- | dev-cpp/units/Manifest | 1 | ||||
| -rw-r--r-- | dev-cpp/units/units-2.3.4.ebuild | 28 |
12 files changed, 464 insertions, 849 deletions
diff --git a/dev-cpp/cpprestsdk/cpprestsdk-2.10.19-r4.ebuild b/dev-cpp/cpprestsdk/cpprestsdk-2.10.19-r4.ebuild new file mode 100644 index 000000000000..3b30f8534084 --- /dev/null +++ b/dev-cpp/cpprestsdk/cpprestsdk-2.10.19-r4.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="A Microsoft project for cloud-based client-server communication." +HOMEPAGE="https://github.com/microsoft/cpprestsdk" +SRC_URI="https://github.com/microsoft/cpprestsdk/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=">=dev-libs/openssl-1.1.1q + >=dev-libs/boost-1.80.0-r1 + >=sys-libs/zlib-1.2.13-r1" + +DEPEND="${RDEPEND}" + +BDEPEND=" + app-alternatives/ninja + >=sys-devel/gcc-11.3.0 + >=virtual/pkgconfig-2-r1 + >=dev-cpp/websocketpp-0.8.2 +" + +PATCHES=( + "${FILESDIR}"/cpprestsdk-${PV}-warnings.patch + "${FILESDIR}"/cpprestsdk-${PV}-disabl-int-tests.patch + "${FILESDIR}"/cpprestsdk-${PV}-disable-werror-default.patch + "${FILESDIR}"/cpprestsdk-${PV}-boost-1.87-compat.patch +) + +src_configure() { + local mycmakeargs=( -DCMAKE_BUILD_TYPE=Release ) + cmake_src_configure +} diff --git a/dev-cpp/cpprestsdk/files/cpprestsdk-2.10.19-boost-1.87-compat.patch b/dev-cpp/cpprestsdk/files/cpprestsdk-2.10.19-boost-1.87-compat.patch new file mode 100644 index 000000000000..e0e8a75d77af --- /dev/null +++ b/dev-cpp/cpprestsdk/files/cpprestsdk-2.10.19-boost-1.87-compat.patch @@ -0,0 +1,359 @@ +--- a/Release/src/http/listener/http_server_asio.cpp ++++ b/Release/src/http/listener/http_server_asio.cpp +@@ -520,17 +520,14 @@ + auto& service = crossplat::threadpool::shared_instance().service(); + tcp::resolver resolver(service); + // #446: boost resolver does not recognize "+" as a host wildchar +- tcp::resolver::query query = +- ("+" == m_host) ? tcp::resolver::query(m_port, boost::asio::ip::resolver_query_base::flags()) +- : tcp::resolver::query(m_host, m_port, boost::asio::ip::resolver_query_base::flags()); + +- tcp::endpoint endpoint = *resolver.resolve(query); ++ tcp::endpoint endpoint = (("+" == m_host) ? *(resolver.resolve("", m_port).begin()) : *(resolver.resolve(m_host, m_port).begin())); + + m_acceptor.reset(new tcp::acceptor(service)); + m_acceptor->open(endpoint.protocol()); + m_acceptor->set_option(socket_base::reuse_address(true)); + m_acceptor->bind(endpoint); +- m_acceptor->listen(0 != m_backlog ? m_backlog : socket_base::max_connections); ++ m_acceptor->listen(0 != m_backlog ? m_backlog : socket_base::max_listen_connections); + + auto socket = new ip::tcp::socket(service); + std::unique_ptr<ip::tcp::socket> usocket(socket); +@@ -881,7 +878,7 @@ + else + { + auto writebuf = requestImpl->outstream().streambuf(); +- writebuf.putn_nocopy(buffer_cast<const uint8_t*>(m_request_buf.data()), toWrite) ++ writebuf.putn_nocopy(static_cast<const uint8_t*>(m_request_buf.data().data()), toWrite) + .then([=](pplx::task<size_t> writeChunkTask) -> will_deref_t { + try + { +@@ -913,7 +910,7 @@ + { + auto writebuf = requestImpl->outstream().streambuf(); + writebuf +- .putn_nocopy(boost::asio::buffer_cast<const uint8_t*>(m_request_buf.data()), ++ .putn_nocopy(static_cast<const uint8_t*>(m_request_buf.data().data()), + (std::min)(m_request_buf.size(), m_read_size - m_read)) + .then([this](pplx::task<size_t> writtenSizeTask) -> will_deref_t { + size_t writtenSize = 0; +@@ -1134,7 +1131,7 @@ + } + auto membuf = m_response_buf.prepare(ChunkSize + chunked_encoding::additional_encoding_space); + +- readbuf.getn(buffer_cast<uint8_t*>(membuf) + chunked_encoding::data_offset, ChunkSize) ++ readbuf.getn(static_cast<uint8_t*>(membuf.data()) + chunked_encoding::data_offset, ChunkSize) + .then([=](pplx::task<size_t> actualSizeTask) -> will_deref_and_erase_t { + size_t actualSize = 0; + try +@@ -1146,7 +1143,7 @@ + return cancel_sending_response_with_error(response, std::current_exception()); + } + size_t offset = chunked_encoding::add_chunked_delimiters( +- buffer_cast<uint8_t*>(membuf), ChunkSize + chunked_encoding::additional_encoding_space, actualSize); ++ static_cast<uint8_t*>(membuf.data()), ChunkSize + chunked_encoding::additional_encoding_space, actualSize); + m_response_buf.commit(actualSize + chunked_encoding::additional_encoding_space); + m_response_buf.consume(offset); + if (actualSize == 0) +@@ -1167,7 +1164,7 @@ + return cancel_sending_response_with_error( + response, std::make_exception_ptr(http_exception("Response stream close early!"))); + size_t readBytes = (std::min)(ChunkSize, m_write_size - m_write); +- readbuf.getn(buffer_cast<uint8_t*>(m_response_buf.prepare(readBytes)), readBytes) ++ readbuf.getn(static_cast<uint8_t*>(m_response_buf.prepare(readBytes).data()), readBytes) + .then([=](pplx::task<size_t> actualSizeTask) -> will_deref_and_erase_t { + size_t actualSize = 0; + try +--- a/Release/src/http/client/http_client_asio.cpp ++++ b/Release/src/http/client/http_client_asio.cpp +@@ -146,7 +146,7 @@ + friend class asio_client; + + public: +- asio_connection(boost::asio::io_service& io_service) ++ asio_connection(boost::asio::io_context& io_service) + : m_socket_lock() + , m_socket(io_service) + , m_ssl_stream() +@@ -581,10 +581,8 @@ + + m_context->m_timer.start(); + +- tcp::resolver::query query(utility::conversions::to_utf8string(proxy_host), to_string(proxy_port)); +- + auto client = std::static_pointer_cast<asio_client>(m_context->m_http_client); +- m_context->m_resolver.async_resolve(query, ++ m_context->m_resolver.async_resolve(utility::conversions::to_utf8string(proxy_host), to_string(proxy_port), + boost::bind(&ssl_proxy_tunnel::handle_resolve, + shared_from_this(), + boost::asio::placeholders::error, +@@ -592,8 +590,9 @@ + } + + private: +- void handle_resolve(const boost::system::error_code& ec, tcp::resolver::iterator endpoints) ++ void handle_resolve(const boost::system::error_code& ec, tcp::resolver::results_type results) + { ++ auto iterator = results.begin(); + if (ec) + { + m_context->report_error("Error resolving proxy address", ec, httpclient_errorcode_context::connect); +@@ -601,16 +600,16 @@ + else + { + m_context->m_timer.reset(); +- auto endpoint = *endpoints; ++ auto endpoint = *iterator; + m_context->m_connection->async_connect(endpoint, + boost::bind(&ssl_proxy_tunnel::handle_tcp_connect, + shared_from_this(), + boost::asio::placeholders::error, +- ++endpoints)); ++ ++iterator, results.end())); + } + } + +- void handle_tcp_connect(const boost::system::error_code& ec, tcp::resolver::iterator endpoints) ++ void handle_tcp_connect(const boost::system::error_code& ec, tcp::resolver::results_type::iterator endpoints, tcp::resolver::results_type::iterator endpoints_end) + { + if (!ec) + { +@@ -621,7 +620,7 @@ + shared_from_this(), + boost::asio::placeholders::error)); + } +- else if (endpoints == tcp::resolver::iterator()) ++ else if (endpoints == endpoints_end) + { + m_context->report_error( + "Failed to connect to any resolved proxy endpoint", ec, httpclient_errorcode_context::connect); +@@ -646,7 +645,7 @@ + boost::bind(&ssl_proxy_tunnel::handle_tcp_connect, + shared_from_this(), + boost::asio::placeholders::error, +- ++endpoints)); ++ ++endpoints, endpoints_end)); + } + } + +@@ -885,8 +884,7 @@ + auto tcp_host = proxy_type == http_proxy_type::http ? proxy_host : host; + auto tcp_port = proxy_type == http_proxy_type::http ? proxy_port : port; + +- tcp::resolver::query query(tcp_host, to_string(tcp_port)); +- ctx->m_resolver.async_resolve(query, ++ ctx->m_resolver.async_resolve(tcp_host, to_string(tcp_port), + boost::bind(&asio_context::handle_resolve, + ctx, + boost::asio::placeholders::error, +@@ -1006,7 +1004,7 @@ + request_context::report_error(errorcodeValue, message); + } + +- void handle_connect(const boost::system::error_code& ec, tcp::resolver::iterator endpoints) ++ void handle_connect(const boost::system::error_code& ec, tcp::resolver::results_type::iterator endpoints, tcp::resolver::results_type::iterator endpoints_end) + { + m_timer.reset(); + if (!ec) +@@ -1019,7 +1017,7 @@ + { + report_error("Request canceled by user.", ec, httpclient_errorcode_context::connect); + } +- else if (endpoints == tcp::resolver::iterator()) ++ else if (endpoints == endpoints_end) + { + report_error("Failed to connect to any resolved endpoint", ec, httpclient_errorcode_context::connect); + } +@@ -1041,28 +1039,29 @@ + m_connection->async_connect( + endpoint, + boost::bind( +- &asio_context::handle_connect, shared_from_this(), boost::asio::placeholders::error, ++endpoints)); ++ &asio_context::handle_connect, shared_from_this(), boost::asio::placeholders::error, ++endpoints, endpoints_end)); + } + } + +- void handle_resolve(const boost::system::error_code& ec, tcp::resolver::iterator endpoints) ++ void handle_resolve(const boost::system::error_code& ec, tcp::resolver::results_type results) + { + if (ec) + { + report_error("Error resolving address", ec, httpclient_errorcode_context::connect); + } +- else if (endpoints == tcp::resolver::iterator()) ++ else if (results.empty()) + { + report_error("Failed to resolve address", ec, httpclient_errorcode_context::connect); + } + else + { + m_timer.reset(); +- auto endpoint = *endpoints; ++ auto iterator = results.begin(); ++ auto endpoint = *iterator; + m_connection->async_connect( + endpoint, + boost::bind( +- &asio_context::handle_connect, shared_from_this(), boost::asio::placeholders::error, ++endpoints)); ++ &asio_context::handle_connect, shared_from_this(), boost::asio::placeholders::error, ++iterator, results.end())); + } + } + +@@ -1134,7 +1133,7 @@ + } + #endif // CPPREST_PLATFORM_ASIO_CERT_VERIFICATION_AVAILABLE + +- boost::asio::ssl::rfc2818_verification rfc2818(m_connection->cn_hostname()); ++ boost::asio::ssl::host_name_verification rfc2818(m_connection->cn_hostname()); + return rfc2818(preverified, verifyCtx); + } + +@@ -1182,8 +1181,8 @@ + + const auto& chunkSize = m_http_client->client_config().chunksize(); + auto readbuf = _get_readbuffer(); +- uint8_t* buf = boost::asio::buffer_cast<uint8_t*>( +- m_body_buf.prepare(chunkSize + http::details::chunked_encoding::additional_encoding_space)); ++ auto bodyBuf = m_body_buf.prepare(chunkSize + http::details::chunked_encoding::additional_encoding_space); ++ uint8_t* buf = static_cast<uint8_t *>(bodyBuf.data()); + const auto this_request = shared_from_this(); + readbuf.getn(buf + http::details::chunked_encoding::data_offset, chunkSize) + .then([this_request, buf, chunkSize AND_CAPTURE_MEMBER_FUNCTION_POINTERS](pplx::task<size_t> op) { +@@ -1247,7 +1246,7 @@ + const auto readSize = static_cast<size_t>((std::min)( + static_cast<uint64_t>(m_http_client->client_config().chunksize()), m_content_length - m_uploaded)); + auto readbuf = _get_readbuffer(); +- readbuf.getn(boost::asio::buffer_cast<uint8_t*>(m_body_buf.prepare(readSize)), readSize) ++ readbuf.getn(static_cast<uint8_t*>(m_body_buf.prepare(readSize).data()), readSize) + .then([this_request AND_CAPTURE_MEMBER_FUNCTION_POINTERS](pplx::task<size_t> op) { + try + { +@@ -1639,7 +1638,7 @@ + std::vector<uint8_t> decompressed; + + bool boo = +- decompress(boost::asio::buffer_cast<const uint8_t*>(m_body_buf.data()), to_read, decompressed); ++ decompress(static_cast<const uint8_t*>(m_body_buf.data().data()), to_read, decompressed); + if (!boo) + { + report_exception(std::runtime_error("Failed to decompress the response body")); +@@ -1687,7 +1686,7 @@ + } + else + { +- writeBuffer.putn_nocopy(boost::asio::buffer_cast<const uint8_t*>(m_body_buf.data()), to_read) ++ writeBuffer.putn_nocopy(static_cast<const uint8_t*>(m_body_buf.data().data()), to_read) + .then([this_request, to_read AND_CAPTURE_MEMBER_FUNCTION_POINTERS](pplx::task<size_t> op) { + try + { +@@ -1759,7 +1758,7 @@ + std::vector<uint8_t> decompressed; + + bool boo = +- decompress(boost::asio::buffer_cast<const uint8_t*>(m_body_buf.data()), read_size, decompressed); ++ decompress(static_cast<const uint8_t*>(m_body_buf.data().data()), read_size, decompressed); + if (!boo) + { + this_request->report_exception(std::runtime_error("Failed to decompress the response body")); +@@ -1821,7 +1820,7 @@ + } + else + { +- writeBuffer.putn_nocopy(boost::asio::buffer_cast<const uint8_t*>(m_body_buf.data()), read_size) ++ writeBuffer.putn_nocopy(static_cast<const uint8_t*>(m_body_buf.data().data()), read_size) + .then([this_request AND_CAPTURE_MEMBER_FUNCTION_POINTERS](pplx::task<size_t> op) { + size_t writtenSize = 0; + try +@@ -1870,7 +1869,7 @@ + assert(!m_ctx.expired()); + m_state = started; + +- m_timer.expires_from_now(m_duration); ++ m_timer.expires_after(m_duration); + auto ctx = m_ctx; + m_timer.async_wait([ctx AND_CAPTURE_MEMBER_FUNCTION_POINTERS](const boost::system::error_code& ec) { + handle_timeout(ec, ctx); +@@ -1881,7 +1880,7 @@ + { + assert(m_state == started || m_state == timedout); + assert(!m_ctx.expired()); +- if (m_timer.expires_from_now(m_duration) > 0) ++ if (m_timer.expires_after(m_duration) > 0) + { + // The existing handler was canceled so schedule a new one. + assert(m_state == started); +--- a/Release/src/pplx/threadpool.cpp ++++ b/Release/src/pplx/threadpool.cpp +@@ -37,7 +37,7 @@ + + struct threadpool_impl final : crossplat::threadpool + { +- threadpool_impl(size_t n) : crossplat::threadpool(n), m_work(m_service) ++ threadpool_impl(size_t n) : crossplat::threadpool(n), m_work(boost::asio::make_work_guard(m_service)) + { + for (size_t i = 0; i < n; i++) + add_thread(); +@@ -84,7 +84,7 @@ + } + + std::vector<std::unique_ptr<boost::asio::detail::thread>> m_threads; +- boost::asio::io_service::work m_work; ++ boost::asio::executor_work_guard<boost::asio::io_context::executor_type > m_work; + }; + + #if defined(_WIN32) +--- a/Release/src/websockets/client/ws_client_wspp.cpp ++++ b/Release/src/websockets/client/ws_client_wspp.cpp +@@ -225,7 +225,7 @@ + verifyCtx, utility::conversions::to_utf8string(m_uri.host())); + } + #endif +- boost::asio::ssl::rfc2818_verification rfc2818(utility::conversions::to_utf8string(m_uri.host())); ++ boost::asio::ssl::host_name_verification rfc2818(utility::conversions::to_utf8string(m_uri.host())); + return rfc2818(preverified, verifyCtx); + }); + +--- a/Release/src/pplx/pplxlinux.cpp ++++ b/Release/src/pplx/pplxlinux.cpp +@@ -35,7 +35,7 @@ + + _PPLXIMP void linux_scheduler::schedule(TaskProc_t proc, void* param) + { +- crossplat::threadpool::shared_instance().service().post(boost::bind(proc, param)); ++ boost::asio::post(crossplat::threadpool::shared_instance().service(), boost::bind(proc, param)); + } + + } // namespace details +--- a/Release/include/pplx/threadpool.h ++++ b/Release/include/pplx/threadpool.h +@@ -69,15 +69,15 @@ + CASABLANCA_DEPRECATED("Use `.service().post(task)` directly.") + void schedule(T task) + { +- service().post(task); ++ boost::asio::post(service(), task); + } + +- boost::asio::io_service& service() { return m_service; } ++ boost::asio::io_context& service() { return m_service; } + + protected: + threadpool(size_t num_threads) : m_service(static_cast<int>(num_threads)) {} + +- boost::asio::io_service m_service; ++ boost::asio::io_context m_service; + }; + + } // namespace crossplat +--- a/Release/tests/functional/pplx/pplx_test/pplx_op_test.cpp ++++ b/Release/tests/functional/pplx/pplx_test/pplx_op_test.cpp +@@ -57,7 +57,7 @@ + virtual void schedule(pplx::TaskProc_t proc, void* param) + { + pplx::details::atomic_increment(s_flag); +- m_pool->service().post([=]() -> void { proc(param); }); ++ boost::asio::post(m_pool->service(), [=]() -> void { proc(param); }); + } + + public: diff --git a/dev-cpp/reflection-cpp/Manifest b/dev-cpp/reflection-cpp/Manifest index 8449943f0039..6ca357da482c 100644 --- a/dev-cpp/reflection-cpp/Manifest +++ b/dev-cpp/reflection-cpp/Manifest @@ -1,2 +1,3 @@ DIST reflection-cpp-0.2.0.tar.gz 18412 BLAKE2B e14b5c14402077f8a894da0ad6645949a5983e43b7313c735ac19b95b190c861f530d2f31cd7c5ca405d434fc7c90071678b7e6129ab3a92ddd5f813495ef280 SHA512 67c560dc15d7f522350b1599b0255da12551429e52b28864fa9ad1aab2a45e7a2f806f2810dfb4a6e88fedfe6e9a9e8d124dd3bc0f37e96e9b56dbb3fee33191 DIST reflection-cpp-0.3.0.tar.gz 20479 BLAKE2B 5cdb51309b6a629ba3f231a76d571e0be2aeea49a6309ad4b68f0bb7b632b92e9e550b17a0816fadaace39c2d170eb9c26ef91c02a52e49fd06370c9c368a2ba SHA512 b4a05099249ee155131664f40cd09f2902e4aca7f70a234c9ad66592d31c6f9a49c3bb2dba6cb3ed3762e262216c354be2fe8851145fe43402e2b31c6aae36d7 +DIST reflection-cpp-0.4.0.tar.gz 20562 BLAKE2B 0273d442d3ba3f30d6f13a6c126178b901bbc8ba0506884b1e6970a5ab738da3d4f7e9eea7f04cf5f898508e851ce76ed95bf11b19b05c791bedb88969f17480 SHA512 07032449bf84d402184af0e99d44617dd63a054f08b96d4254a980eeeb3bfb29f9d2ceef54ad1ed4d273cd4ff99d4c3f4a31b1a2e43b47efe12f0e6085804316 diff --git a/dev-cpp/reflection-cpp/reflection-cpp-0.4.0.ebuild b/dev-cpp/reflection-cpp/reflection-cpp-0.4.0.ebuild new file mode 100644 index 000000000000..d75d58174a80 --- /dev/null +++ b/dev-cpp/reflection-cpp/reflection-cpp-0.4.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Boxing primitive types in C++" +HOMEPAGE="https://github.com/contour-terminal/reflection-cpp" +SRC_URI="https://github.com/contour-terminal/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND=" + test? ( + dev-cpp/catch:0 + ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DREFLECTION_TESTING=$(usex test) + ) + + cmake_src_configure +} diff --git a/dev-cpp/taskflow/Manifest b/dev-cpp/taskflow/Manifest index 05b23be00440..118275c3915a 100644 --- a/dev-cpp/taskflow/Manifest +++ b/dev-cpp/taskflow/Manifest @@ -1,4 +1,3 @@ -DIST taskflow-3.3.0.tar.gz 64446007 BLAKE2B 07878a03bd90af64914f1dc80850bcf5d4140f20ecfa998237039b6f37cc668e8c2b5dffafb75f4518209b3ac01f9935f5e30a020871334f131e6fe7654748bf SHA512 08ab20bf38927d49c8332fc103cb7b4b6358efa06466cb8471f2004eb27b79b9eadc9971ec4acd110c8f369686b6f99bf3e21192285c3f28b9cb855bfd9ab0b5 -DIST taskflow-3.4.0.tar.gz 64152239 BLAKE2B cec78155bc8db3ac7fb6e61ece8c1bb4697c6655122cdcd987405ce21b1f4f30570debda8a7cccf43d089bac791cb18654e829380e244addae2875ad4fdb47c5 SHA512 e0e3589feec65677c4de6583a70c14f90826f2177636010955c597a3232f7842431c697eae711318f4a64fae52ac3e33e2d0739ef36bb7c57698110b6fa4740d +DIST taskflow-3.10.0.tar.gz 55396434 BLAKE2B 8b2351de0ae898e4e42aec295723064ac2167d3afe01b2a47c88443b30220f258c8955d9ddf2727510ea35523c54dd88050a9e0654a03d6d74527a2d21d35654 SHA512 b7919d9ed47a27d706c552944a2f92ce9dcb012983622f4d62a2226389fd4628658a7e1090804a5dc860f16a10a4e1b31802a4019722283ff7912aa2a7334d0e DIST taskflow-3.6.0.tar.gz 66335249 BLAKE2B bcdc6d721e32b7c40f65ed5bd115d2c0083663e8b51c0e4460baa5f62e576382a45e8da735119b577d8a6ae7a64c72431654471a3b8335997fdf4f9191ad64af SHA512 1bf17b69cdb29b982fc74b9091f5b6c8fc4fd3004b26afe7e73e71569738e492cf8663b71d98cfbc4e240c08ceb8a99bf51cccce95254710722f89929a4bbea8 DIST taskflow-3.7.0.tar.gz 66383509 BLAKE2B 92a9d56f0101d507b7f924ce9038d6d43a5f39c9270582f910644ad281ea2cee3f8fa39f3ee4e748f90d013d57a3bc2f24842e328ab345bc580d1a9a5de4f308 SHA512 2faecc9eaf9e7f24253a5aedbb4ef6164ba8b5181b7f2c65d8646c21300f28278d7817e928eeab7e85ec2b9644508a8665bab1a7482ec85a7f6de18cecb32d6f diff --git a/dev-cpp/taskflow/files/taskflow-3.3.0-fix_doctest.patch b/dev-cpp/taskflow/files/taskflow-3.3.0-fix_doctest.patch deleted file mode 100644 index c5da4fd96eb6..000000000000 --- a/dev-cpp/taskflow/files/taskflow-3.3.0-fix_doctest.patch +++ /dev/null @@ -1,377 +0,0 @@ -diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt -index cf881d4..ff6618a 100644 ---- a/unittests/CMakeLists.txt -+++ b/unittests/CMakeLists.txt -@@ -1,6 +1,7 @@ - enable_testing() - --include(${TF_3RD_PARTY_DIR}/doctest/doctest.cmake) -+find_package(doctest REQUIRED) -+include(doctest) - - list(APPEND TF_UNITTESTS - utility -@@ -22,8 +23,7 @@ list(APPEND TF_UNITTESTS - - foreach(unittest IN LISTS TF_UNITTESTS) - add_executable(${unittest} ${unittest}.cpp) -- target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings) -- target_include_directories(${unittest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest) -+ target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings doctest::doctest) - doctest_discover_tests(${unittest}) - endforeach() - -diff --git a/unittests/algorithms.cpp b/unittests/algorithms.cpp -index 5ae7ac6..efffdd9 100644 ---- a/unittests/algorithms.cpp -+++ b/unittests/algorithms.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/algorithm/reduce.hpp> - #include <taskflow/algorithm/sort.hpp> -diff --git a/unittests/asyncs.cpp b/unittests/asyncs.cpp -index cd6985c..4e7b80f 100644 ---- a/unittests/asyncs.cpp -+++ b/unittests/asyncs.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - - // -------------------------------------------------------- -diff --git a/unittests/basics.cpp b/unittests/basics.cpp -index 2784fa4..ac1ab20 100644 ---- a/unittests/basics.cpp -+++ b/unittests/basics.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/algorithm/reduce.hpp> - -diff --git a/unittests/cancellation.cpp b/unittests/cancellation.cpp -index 3273af3..ff17ad4 100644 ---- a/unittests/cancellation.cpp -+++ b/unittests/cancellation.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - - // EmptyFuture -diff --git a/unittests/compositions.cpp b/unittests/compositions.cpp -index 0d330ae..e2784a5 100644 ---- a/unittests/compositions.cpp -+++ b/unittests/compositions.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - - // -------------------------------------------------------- -diff --git a/unittests/control_flow.cpp b/unittests/control_flow.cpp -index 086a8a9..f2da83e 100644 ---- a/unittests/control_flow.cpp -+++ b/unittests/control_flow.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - - // -------------------------------------------------------- -diff --git a/unittests/cuda/CMakeLists.txt b/unittests/cuda/CMakeLists.txt -index 7c76523..be2757c 100644 ---- a/unittests/cuda/CMakeLists.txt -+++ b/unittests/cuda/CMakeLists.txt -@@ -12,15 +12,14 @@ list(APPEND TF_CUDA_UNITTESTS - - foreach(cudatest IN LISTS TF_CUDA_UNITTESTS) - add_executable(${cudatest} ${cudatest}.cu) -- target_link_libraries(${cudatest} ${PROJECT_NAME} tf::default_settings) -- target_include_directories(${cudatest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest) -- -+ target_link_libraries(${cudatest} ${PROJECT_NAME} tf::default_settings doctest::doctest) -+ - # avoid cmake 3.18+ warning - # we let nvcc to decide the flag if the architecture is not given - if(NOT CUDA_ARCHITECTURES) - set_property(TARGET ${cudatest} PROPERTY CUDA_ARCHITECTURES OFF) - endif() -- -+ - doctest_discover_tests(${cudatest}) - endforeach() - -diff --git a/unittests/cuda/cuda_algorithms.cu b/unittests/cuda/cuda_algorithms.cu -index d97289e..5185cd9 100644 ---- a/unittests/cuda/cuda_algorithms.cu -+++ b/unittests/cuda/cuda_algorithms.cu -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/cuda/cudaflow.hpp> - #include <taskflow/cuda/algorithm/for_each.hpp> -diff --git a/unittests/cuda/cuda_basics.cu b/unittests/cuda/cuda_basics.cu -index 8e0fdff..f97c782 100644 ---- a/unittests/cuda/cuda_basics.cu -+++ b/unittests/cuda/cuda_basics.cu -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/cuda/cudaflow.hpp> - -diff --git a/unittests/cuda/cuda_capturer_optimizer.cu b/unittests/cuda/cuda_capturer_optimizer.cu -index 86fcfb7..7cbcf0a 100644 ---- a/unittests/cuda/cuda_capturer_optimizer.cu -+++ b/unittests/cuda/cuda_capturer_optimizer.cu -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/cuda/cudaflow.hpp> - #include <taskflow/cuda/algorithm/for_each.hpp> -diff --git a/unittests/cuda/cuda_device.cu b/unittests/cuda/cuda_device.cu -index b3d316d..241cc93 100644 ---- a/unittests/cuda/cuda_device.cu -+++ b/unittests/cuda/cuda_device.cu -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/cuda/cudaflow.hpp> - -diff --git a/unittests/cuda/cuda_kmeans.cu b/unittests/cuda/cuda_kmeans.cu -index 91495b5..c14d250 100644 ---- a/unittests/cuda/cuda_kmeans.cu -+++ b/unittests/cuda/cuda_kmeans.cu -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/cuda/cudaflow.hpp> - #include <taskflow/cuda/algorithm/for_each.hpp> -diff --git a/unittests/cuda/cuda_matrix.cu b/unittests/cuda/cuda_matrix.cu -index 8e9f242..ec5386f 100644 ---- a/unittests/cuda/cuda_matrix.cu -+++ b/unittests/cuda/cuda_matrix.cu -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/cuda/cudaflow.hpp> - -diff --git a/unittests/cuda/cuda_rebinds.cu b/unittests/cuda/cuda_rebinds.cu -index eb9218f..92798df 100644 ---- a/unittests/cuda/cuda_rebinds.cu -+++ b/unittests/cuda/cuda_rebinds.cu -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - - #include <taskflow/taskflow.hpp> - #include <taskflow/cuda/cudaflow.hpp> -diff --git a/unittests/cuda/cuda_updates.cu b/unittests/cuda/cuda_updates.cu -index bdda539..d8b52dc 100644 ---- a/unittests/cuda/cuda_updates.cu -+++ b/unittests/cuda/cuda_updates.cu -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - - #include <taskflow/taskflow.hpp> - #include <taskflow/cuda/cudaflow.hpp> -diff --git a/unittests/movable.cpp b/unittests/movable.cpp -index 58be4fc..c4b3f1a 100644 ---- a/unittests/movable.cpp -+++ b/unittests/movable.cpp -@@ -1,5 +1,5 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - - // increments a counter only on destruction -diff --git a/unittests/pipelines.cpp b/unittests/pipelines.cpp -index 6527b34..c925e67 100644 ---- a/unittests/pipelines.cpp -+++ b/unittests/pipelines.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - - #include <taskflow/taskflow.hpp> - #include <taskflow/algorithm/pipeline.hpp> -diff --git a/unittests/semaphores.cpp b/unittests/semaphores.cpp -index d4713f8..c537702 100644 ---- a/unittests/semaphores.cpp -+++ b/unittests/semaphores.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - - // -------------------------------------------------------- -diff --git a/unittests/serializer.cpp b/unittests/serializer.cpp -index 20edef3..5b9870f 100644 ---- a/unittests/serializer.cpp -+++ b/unittests/serializer.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/utility/serializer.hpp> - #include <random> - -diff --git a/unittests/sorting.cpp b/unittests/sorting.cpp -index 00a616c..005eaf2 100644 ---- a/unittests/sorting.cpp -+++ b/unittests/sorting.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/algorithm/sort.hpp> - -diff --git a/unittests/subflows.cpp b/unittests/subflows.cpp -index b1de5d1..11fd97a 100644 ---- a/unittests/subflows.cpp -+++ b/unittests/subflows.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/algorithm/reduce.hpp> - -diff --git a/unittests/sycl/CMakeLists.txt b/unittests/sycl/CMakeLists.txt -index 492c941..3ef1dd7 100644 ---- a/unittests/sycl/CMakeLists.txt -+++ b/unittests/sycl/CMakeLists.txt -@@ -1,4 +1,4 @@ --list(APPEND TF_SYCL_TESTS -+list(APPEND TF_SYCL_TESTS - sycl_basics - sycl_algorithms - sycl_rebinds -@@ -12,9 +12,8 @@ foreach(sycl_test IN LISTS TF_SYCL_TESTS) - target_compile_options(${sycl_test} PRIVATE ${TF_SYCL_OPTIONS}) - target_link_options(${sycl_test} PRIVATE ${TF_SYCL_OPTIONS}) - target_link_libraries(${sycl_test} -- ${PROJECT_NAME} Threads::Threads tf::default_settings -+ ${PROJECT_NAME} Threads::Threads tf::default_settings doctest::doctest - ) -- target_include_directories(${sycl_test} PRIVATE ${TF_3RD_PARTY_DIR}/doctest) -- -+ - doctest_discover_tests(${sycl_test}) - endforeach() -diff --git a/unittests/sycl/sycl_algorithms.cpp b/unittests/sycl/sycl_algorithms.cpp -index cde9666..93973dc 100644 ---- a/unittests/sycl/sycl_algorithms.cpp -+++ b/unittests/sycl/sycl_algorithms.cpp -@@ -1,5 +1,5 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/syclflow.hpp> - - constexpr float eps = 0.0001f; -diff --git a/unittests/sycl/sycl_basics.cpp b/unittests/sycl/sycl_basics.cpp -index 7ed5e16..274b9ce 100644 ---- a/unittests/sycl/sycl_basics.cpp -+++ b/unittests/sycl/sycl_basics.cpp -@@ -1,5 +1,5 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/syclflow.hpp> - - // task creation -diff --git a/unittests/sycl/sycl_rebinds.cpp b/unittests/sycl/sycl_rebinds.cpp -index 5a00bf8..8854ef9 100644 ---- a/unittests/sycl/sycl_rebinds.cpp -+++ b/unittests/sycl/sycl_rebinds.cpp -@@ -1,5 +1,5 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/syclflow.hpp> - - // ---------------------------------------------------------------------------- -diff --git a/unittests/traversals.cpp b/unittests/traversals.cpp -index b7cac8a..474df49 100644 ---- a/unittests/traversals.cpp -+++ b/unittests/traversals.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - - #include <taskflow/taskflow.hpp> - -diff --git a/unittests/tsq.cpp b/unittests/tsq.cpp -index 097f96d..d3c5f99 100644 ---- a/unittests/tsq.cpp -+++ b/unittests/tsq.cpp -@@ -49,7 +49,7 @@ - - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - - // ============================================================================ -diff --git a/unittests/utility.cpp b/unittests/utility.cpp -index 9822cfe..95a253d 100644 ---- a/unittests/utility.cpp -+++ b/unittests/utility.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - - #include <taskflow/utility/traits.hpp> - #include <taskflow/utility/object_pool.hpp> diff --git a/dev-cpp/taskflow/files/taskflow-3.4.0-fix_doctest.patch b/dev-cpp/taskflow/files/taskflow-3.4.0-fix_doctest.patch deleted file mode 100644 index a63e84673f70..000000000000 --- a/dev-cpp/taskflow/files/taskflow-3.4.0-fix_doctest.patch +++ /dev/null @@ -1,401 +0,0 @@ -diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt -index 86a00bcc..5f5c36fb 100644 ---- a/unittests/CMakeLists.txt -+++ b/unittests/CMakeLists.txt -@@ -1,6 +1,7 @@ - enable_testing() - --include(${TF_3RD_PARTY_DIR}/doctest/doctest.cmake) -+find_package(doctest REQUIRED) -+include(doctest) - - list(APPEND TF_UNITTESTS - utility -@@ -24,8 +25,7 @@ list(APPEND TF_UNITTESTS - - foreach(unittest IN LISTS TF_UNITTESTS) - add_executable(${unittest} ${unittest}.cpp) -- target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings) -- target_include_directories(${unittest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest) -+ target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings doctest::doctest) - doctest_discover_tests(${unittest}) - endforeach() - -diff --git a/unittests/algorithms.cpp b/unittests/algorithms.cpp -index a250713a..09ae9ba5 100644 ---- a/unittests/algorithms.cpp -+++ b/unittests/algorithms.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/algorithm/reduce.hpp> - #include <taskflow/algorithm/sort.hpp> -diff --git a/unittests/asyncs.cpp b/unittests/asyncs.cpp -index 28eeaa8c..466687a2 100644 ---- a/unittests/asyncs.cpp -+++ b/unittests/asyncs.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - - // -------------------------------------------------------- -diff --git a/unittests/basics.cpp b/unittests/basics.cpp -index 290abccf..44301011 100644 ---- a/unittests/basics.cpp -+++ b/unittests/basics.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/algorithm/reduce.hpp> - -diff --git a/unittests/cancellation.cpp b/unittests/cancellation.cpp -index 3ce1cb8c..6543ee52 100644 ---- a/unittests/cancellation.cpp -+++ b/unittests/cancellation.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - - // EmptyFuture -diff --git a/unittests/compositions.cpp b/unittests/compositions.cpp -index 4fd621b5..e3c91e4c 100644 ---- a/unittests/compositions.cpp -+++ b/unittests/compositions.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - - // -------------------------------------------------------- -diff --git a/unittests/control_flow.cpp b/unittests/control_flow.cpp -index 024ace84..11206384 100644 ---- a/unittests/control_flow.cpp -+++ b/unittests/control_flow.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - - // -------------------------------------------------------- -diff --git a/unittests/cuda/CMakeLists.txt b/unittests/cuda/CMakeLists.txt -index d0ccc8e9..ccb46721 100644 ---- a/unittests/cuda/CMakeLists.txt -+++ b/unittests/cuda/CMakeLists.txt -@@ -13,15 +13,14 @@ list(APPEND TF_CUDA_UNITTESTS - - foreach(cudatest IN LISTS TF_CUDA_UNITTESTS) - add_executable(${cudatest} ${cudatest}.cu) -- target_link_libraries(${cudatest} ${PROJECT_NAME} tf::default_settings) -- target_include_directories(${cudatest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest) -- -+ target_link_libraries(${cudatest} ${PROJECT_NAME} tf::default_settings doctest::doctest) -+ - # avoid cmake 3.18+ warning - # we let nvcc to decide the flag if the architecture is not given - if(NOT CUDA_ARCHITECTURES) - set_property(TARGET ${cudatest} PROPERTY CUDA_ARCHITECTURES OFF) - endif() -- -+ - doctest_discover_tests(${cudatest}) - endforeach() - -diff --git a/unittests/cuda/cuda_algorithms.cu b/unittests/cuda/cuda_algorithms.cu -index cccc04b4..47645273 100644 ---- a/unittests/cuda/cuda_algorithms.cu -+++ b/unittests/cuda/cuda_algorithms.cu -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/cuda/cudaflow.hpp> - #include <taskflow/cuda/algorithm/for_each.hpp> -diff --git a/unittests/cuda/cuda_basics.cu b/unittests/cuda/cuda_basics.cu -index 8e0fdffd..f97c7822 100644 ---- a/unittests/cuda/cuda_basics.cu -+++ b/unittests/cuda/cuda_basics.cu -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/cuda/cudaflow.hpp> - -diff --git a/unittests/cuda/cuda_capturer_optimizer.cu b/unittests/cuda/cuda_capturer_optimizer.cu -index 86fcfb72..7cbcf0a5 100644 ---- a/unittests/cuda/cuda_capturer_optimizer.cu -+++ b/unittests/cuda/cuda_capturer_optimizer.cu -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/cuda/cudaflow.hpp> - #include <taskflow/cuda/algorithm/for_each.hpp> -diff --git a/unittests/cuda/cuda_device.cu b/unittests/cuda/cuda_device.cu -index 49df36aa..fb68b29a 100644 ---- a/unittests/cuda/cuda_device.cu -+++ b/unittests/cuda/cuda_device.cu -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/cuda/cudaflow.hpp> - -diff --git a/unittests/cuda/cuda_kmeans.cu b/unittests/cuda/cuda_kmeans.cu -index 91495b59..c14d250f 100644 ---- a/unittests/cuda/cuda_kmeans.cu -+++ b/unittests/cuda/cuda_kmeans.cu -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/cuda/cudaflow.hpp> - #include <taskflow/cuda/algorithm/for_each.hpp> -diff --git a/unittests/cuda/cuda_matrix.cu b/unittests/cuda/cuda_matrix.cu -index 8e9f2421..ec5386f4 100644 ---- a/unittests/cuda/cuda_matrix.cu -+++ b/unittests/cuda/cuda_matrix.cu -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/cuda/cudaflow.hpp> - -diff --git a/unittests/cuda/cuda_rebinds.cu b/unittests/cuda/cuda_rebinds.cu -index eb9218fa..92798dfd 100644 ---- a/unittests/cuda/cuda_rebinds.cu -+++ b/unittests/cuda/cuda_rebinds.cu -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - - #include <taskflow/taskflow.hpp> - #include <taskflow/cuda/cudaflow.hpp> -diff --git a/unittests/cuda/cuda_updates.cu b/unittests/cuda/cuda_updates.cu -index bdda539a..d8b52dcf 100644 ---- a/unittests/cuda/cuda_updates.cu -+++ b/unittests/cuda/cuda_updates.cu -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - - #include <taskflow/taskflow.hpp> - #include <taskflow/cuda/cudaflow.hpp> -diff --git a/unittests/movable.cpp b/unittests/movable.cpp -index 96ce9da3..d5e64b47 100644 ---- a/unittests/movable.cpp -+++ b/unittests/movable.cpp -@@ -1,5 +1,5 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - - // increments a counter only on destruction -diff --git a/unittests/pipelines.cpp b/unittests/pipelines.cpp -index 94d8f394..701365c0 100644 ---- a/unittests/pipelines.cpp -+++ b/unittests/pipelines.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - - #include <taskflow/taskflow.hpp> - #include <taskflow/algorithm/pipeline.hpp> -diff --git a/unittests/runtimes.cpp b/unittests/runtimes.cpp -index 5a6155b5..4f7e5b74 100644 ---- a/unittests/runtimes.cpp -+++ b/unittests/runtimes.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/algorithm/pipeline.hpp> - -diff --git a/unittests/scalable_pipelines.cpp b/unittests/scalable_pipelines.cpp -index 2534878b..e2073563 100644 ---- a/unittests/scalable_pipelines.cpp -+++ b/unittests/scalable_pipelines.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - - #include <taskflow/taskflow.hpp> - #include <taskflow/algorithm/pipeline.hpp> -diff --git a/unittests/semaphores.cpp b/unittests/semaphores.cpp -index 616191b5..64b8a587 100644 ---- a/unittests/semaphores.cpp -+++ b/unittests/semaphores.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - - // -------------------------------------------------------- -diff --git a/unittests/serializer.cpp b/unittests/serializer.cpp -index 92c3ec70..c6a715e6 100644 ---- a/unittests/serializer.cpp -+++ b/unittests/serializer.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/utility/serializer.hpp> - #include <random> - -diff --git a/unittests/sorting.cpp b/unittests/sorting.cpp -index 8146324a..ff732fb0 100644 ---- a/unittests/sorting.cpp -+++ b/unittests/sorting.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/algorithm/sort.hpp> - -diff --git a/unittests/subflows.cpp b/unittests/subflows.cpp -index 9db430de..e669a2c8 100644 ---- a/unittests/subflows.cpp -+++ b/unittests/subflows.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - #include <taskflow/algorithm/reduce.hpp> - -diff --git a/unittests/sycl/CMakeLists.txt b/unittests/sycl/CMakeLists.txt -index c6481996..3b014d0e 100644 ---- a/unittests/sycl/CMakeLists.txt -+++ b/unittests/sycl/CMakeLists.txt -@@ -1,4 +1,4 @@ --list(APPEND TF_SYCL_TESTS -+list(APPEND TF_SYCL_TESTS - sycl_basics - #sycl_algorithms - #sycl_rebinds -@@ -12,9 +12,8 @@ foreach(sycl_test IN LISTS TF_SYCL_TESTS) - target_compile_options(${sycl_test} PRIVATE ${TF_SYCL_OPTIONS}) - target_link_options(${sycl_test} PRIVATE ${TF_SYCL_OPTIONS}) - target_link_libraries(${sycl_test} -- ${PROJECT_NAME} Threads::Threads tf::default_settings -+ ${PROJECT_NAME} Threads::Threads tf::default_settings doctest::doctest - ) -- target_include_directories(${sycl_test} PRIVATE ${TF_3RD_PARTY_DIR}/doctest) -- -+ - doctest_discover_tests(${sycl_test}) - endforeach() -diff --git a/unittests/sycl/sycl_algorithms.cpp b/unittests/sycl/sycl_algorithms.cpp -index e029b2ef..7b44ca78 100644 ---- a/unittests/sycl/sycl_algorithms.cpp -+++ b/unittests/sycl/sycl_algorithms.cpp -@@ -1,5 +1,5 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/syclflow.hpp> - - constexpr float eps = 0.0001f; -diff --git a/unittests/sycl/sycl_basics.cpp b/unittests/sycl/sycl_basics.cpp -index 0ff76969..eac52906 100644 ---- a/unittests/sycl/sycl_basics.cpp -+++ b/unittests/sycl/sycl_basics.cpp -@@ -1,5 +1,5 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/sycl/syclflow.hpp> - - // task creation -diff --git a/unittests/sycl/sycl_rebinds.cpp b/unittests/sycl/sycl_rebinds.cpp -index 71b2f9de..1b5949fd 100644 ---- a/unittests/sycl/sycl_rebinds.cpp -+++ b/unittests/sycl/sycl_rebinds.cpp -@@ -1,5 +1,5 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/syclflow.hpp> - - // ---------------------------------------------------------------------------- -diff --git a/unittests/traversals.cpp b/unittests/traversals.cpp -index 71aef04b..683915b4 100644 ---- a/unittests/traversals.cpp -+++ b/unittests/traversals.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - - #include <taskflow/taskflow.hpp> - -diff --git a/unittests/tsq.cpp b/unittests/tsq.cpp -index 51a137a7..8e9cac56 100644 ---- a/unittests/tsq.cpp -+++ b/unittests/tsq.cpp -@@ -49,7 +49,7 @@ - - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - #include <taskflow/taskflow.hpp> - - // ============================================================================ -diff --git a/unittests/utility.cpp b/unittests/utility.cpp -index 63c49708..01ee81a3 100644 ---- a/unittests/utility.cpp -+++ b/unittests/utility.cpp -@@ -1,6 +1,6 @@ - #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN - --#include <doctest.h> -+#include <doctest/doctest.h> - - #include <taskflow/utility/traits.hpp> - #include <taskflow/utility/object_pool.hpp> diff --git a/dev-cpp/taskflow/taskflow-3.3.0.ebuild b/dev-cpp/taskflow/taskflow-3.10.0.ebuild index 7b2991224da5..2ac4c7bae5e9 100644 --- a/dev-cpp/taskflow/taskflow-3.3.0.ebuild +++ b/dev-cpp/taskflow/taskflow-3.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then S="${WORKDIR}/taskflow-${PV}" else SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" S="${WORKDIR}/taskflow-${PV}" fi @@ -26,15 +26,6 @@ DEPEND="test? ( dev-cpp/doctest )" HTML_DOCS=( docs/. ) -PATCHES=( - "${FILESDIR}"/taskflow-3.3.0-fix_doctest.patch -) - -src_prepare() { - rm -r "${S}/3rd-party" || die "rm failed" - cmake_src_prepare -} - src_configure() { # TODO: enable CUDA via USE flag local mycmakeargs=( diff --git a/dev-cpp/taskflow/taskflow-3.4.0.ebuild b/dev-cpp/taskflow/taskflow-3.4.0.ebuild deleted file mode 100644 index 1430fd5016e7..000000000000 --- a/dev-cpp/taskflow/taskflow-3.4.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Modern C++ Parallel Task Programming" -HOMEPAGE="https://taskflow.github.io" -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/taskflow/${PN}.git" - inherit git-r3 - S="${WORKDIR}/taskflow-${PV}" -else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86" - S="${WORKDIR}/taskflow-${PV}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="examples test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( dev-cpp/doctest )" - -HTML_DOCS=( docs/. ) - -PATCHES=( - "${FILESDIR}"/taskflow-3.4.0-fix_doctest.patch -) - -src_prepare() { - rm -r "${S}/3rd-party" || die "rm failed" - cmake_src_prepare -} - -src_configure() { - # TODO: enable CUDA via USE flag - local mycmakeargs=( - -DTF_BUILD_CUDA=OFF - -DTF_BUILD_EXAMPLES=$(usex examples) - -DTF_BUILD_TESTS=$(usex test) - ) - - cmake_src_configure -} diff --git a/dev-cpp/taskflow/taskflow-9999.ebuild b/dev-cpp/taskflow/taskflow-9999.ebuild index d718a2e18db8..2ac4c7bae5e9 100644 --- a/dev-cpp/taskflow/taskflow-9999.ebuild +++ b/dev-cpp/taskflow/taskflow-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then S="${WORKDIR}/taskflow-${PV}" else SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" S="${WORKDIR}/taskflow-${PV}" fi @@ -26,15 +26,6 @@ DEPEND="test? ( dev-cpp/doctest )" HTML_DOCS=( docs/. ) -PATCHES=( - "${FILESDIR}"/taskflow-9999-fix_doctest.patch -) - -src_prepare() { - rm -r "${S}/3rd-party" || die "rm failed" - cmake_src_prepare -} - src_configure() { # TODO: enable CUDA via USE flag local mycmakeargs=( diff --git a/dev-cpp/units/Manifest b/dev-cpp/units/Manifest index 10258e3638a8..36503ed8a415 100644 --- a/dev-cpp/units/Manifest +++ b/dev-cpp/units/Manifest @@ -1 +1,2 @@ DIST units-2.3.3.tar.gz 1612045 BLAKE2B f81461e28d2cfe331ada2a0d1c0276d6a6c52825f2ec28caf2160e80aaa343ccc947892fe6be6133c5a80f277ac1767df49b66a10ad3ed573b57e6af16acd385 SHA512 40d803e6bb17f4bb46a0136c7753ae25a0d3ce352dbff3843b0c231e94eb8bade1de65d5b988589607fb12b11e4bfa762708a68839f2d7dccb45440672d09031 +DIST units-2.3.4.tar.gz 1125818 BLAKE2B dd84266bdfba116d7f675600a6dbf3925fd071892ffdfec11392b70b74026dab96628c606d48a5284a8c1661a390245543083eebd9691896008154a8c3fca037 SHA512 2280782fe020fb60fe16f304105de73b30fa51c36e075bfa9b4d0c9d585936084802dd8cca6b1967ad10c7ad949afce27937050184151c2a67f2113f14c38c1b diff --git a/dev-cpp/units/units-2.3.4.ebuild b/dev-cpp/units/units-2.3.4.ebuild new file mode 100644 index 000000000000..8964bf8a55a6 --- /dev/null +++ b/dev-cpp/units/units-2.3.4.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="A compile-time, header-only, dimensional analysis and unit conversion library" +HOMEPAGE="https://github.com/nholthaus/units" +SRC_URI="https://github.com/nholthaus/units/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="test" +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}/${PN}-2.3.3-disable-failing-tests.patch" +) + +src_configure() { + local mycmakeargs+=( + -DBUILD_TESTS="$(usex test ON OFF)" + ) + cmake_src_configure +} |
