diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2022-06-12 12:41:51 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2022-06-12 12:41:51 +0000 |
| commit | b65c4f939c87aafbee615d1f368a61b30ecfaefd (patch) | |
| tree | fa5dc896d8a8505d9282c87c5e1559a47be46c74 /dev-cpp | |
| parent | 785b36533f358bb9bb10e2520caffa60edc399e4 (diff) | |
| download | baldeagleos-repo-b65c4f939c87aafbee615d1f368a61b30ecfaefd.tar.gz baldeagleos-repo-b65c4f939c87aafbee615d1f368a61b30ecfaefd.tar.xz baldeagleos-repo-b65c4f939c87aafbee615d1f368a61b30ecfaefd.zip | |
Adding metadata
Diffstat (limited to 'dev-cpp')
| -rw-r--r-- | dev-cpp/doctest/Manifest | 1 | ||||
| -rw-r--r-- | dev-cpp/doctest/doctest-2.4.7.ebuild | 23 | ||||
| -rw-r--r-- | dev-cpp/doctest/doctest-2.4.8-r1.ebuild (renamed from dev-cpp/doctest/doctest-2.4.8.ebuild) | 4 | ||||
| -rw-r--r-- | dev-cpp/doctest/files/doctest-2.4.8-move-only-types-fix.patch | 56 |
4 files changed, 60 insertions, 24 deletions
diff --git a/dev-cpp/doctest/Manifest b/dev-cpp/doctest/Manifest index ce394009932b..0e9fdc36fd6b 100644 --- a/dev-cpp/doctest/Manifest +++ b/dev-cpp/doctest/Manifest @@ -1,3 +1,2 @@ DIST doctest-2.4.6.tar.gz 2277281 BLAKE2B e6835ad33522273a3151ccfa1e760a150e2f0ccc15fb739cb518d8c9b4258f4b1529537bb6f41b285660aa00f1791b30a7db14155d9f23ea54dd11bfdeb81ec3 SHA512 a5cccf085af946003140af688f071a6407d42fc685324a537e3b704ef9de0f2228bd06eabfd1df8da70dec001420dd0b2813e5e4320b5c1da450cb0aadd63788 -DIST doctest-2.4.7.tar.gz 2281756 BLAKE2B 9e10a30ca20ab08c4b5e7bc65e6d89e7fde45da7e6ff8ecbf9e848c7c61a7864bc4fbb49b0b1d2d6eeab16da2b4a2d935d06a593dab9be1fdb400e8ab641af7e SHA512 bb2d410397700aa7be1161fcf26949524d4f7c333bb9ffe7d223dfd14e770d6eeff75336f27fe0c8051dcb6c403c6b3af506872f6ba207d2d86cc9e9d1d2bfbf DIST doctest-2.4.8.tar.gz 2275833 BLAKE2B 334ed6fda624788adf07fb92a773f3fa69addfbff389e3669e58f66271536d42ff8d20e73e20a4f1d3eee59233d476e527680bb19dcae1d9a6d062e6feedfde5 SHA512 f9b40abfd756331f9b667f3c1e7dcf2652effacac70523834dd3946522f01459c095bdbad04651ad2ad155977e1395025f868ed4dcf5d5712aae9807afb5699c diff --git a/dev-cpp/doctest/doctest-2.4.7.ebuild b/dev-cpp/doctest/doctest-2.4.7.ebuild deleted file mode 100644 index ef28c59976ca..000000000000 --- a/dev-cpp/doctest/doctest-2.4.7.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="The fastest feature-rich C++11/14/17/20 single-header testing framework" -HOMEPAGE="https://github.com/doctest/doctest" -SRC_URI="https://github.com/doctest/doctest/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -src_configure() { - local mycmakeargs=( - -DDOCTEST_WITH_TESTS=$(usex test) - ) - cmake_src_configure -} diff --git a/dev-cpp/doctest/doctest-2.4.8.ebuild b/dev-cpp/doctest/doctest-2.4.8-r1.ebuild index fa60bdec8854..e611f524f5fa 100644 --- a/dev-cpp/doctest/doctest-2.4.8.ebuild +++ b/dev-cpp/doctest/doctest-2.4.8-r1.ebuild @@ -15,6 +15,10 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="test" RESTRICT="!test? ( test )" +PATCHES=( + "${FILESDIR}/${P}-move-only-types-fix.patch" # bug 830624 +) + src_configure() { local mycmakeargs=( -DDOCTEST_WITH_TESTS=$(usex test) diff --git a/dev-cpp/doctest/files/doctest-2.4.8-move-only-types-fix.patch b/dev-cpp/doctest/files/doctest-2.4.8-move-only-types-fix.patch new file mode 100644 index 000000000000..1a0343282685 --- /dev/null +++ b/dev-cpp/doctest/files/doctest-2.4.8-move-only-types-fix.patch @@ -0,0 +1,56 @@ +This patch is derived from upstream commit ce13bc44b99c ("Fix move-only +types failing to decompose correctly (#634)"). + +Upstream-PR: https://github.com/doctest/doctest/pull/634 + +diff --git a/doctest/doctest.h b/doctest/doctest.h +index d25f526..31096ff 100644 +--- a/doctest/doctest.h ++++ b/doctest/doctest.h +@@ -1320,7 +1320,7 @@ DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wunused-comparison") + assertType::Enum m_at; + + explicit Expression_lhs(L&& in, assertType::Enum at) +- : lhs(doctest::detail::forward<L>(in)) ++ : lhs(static_cast<L&&>(in)) + , m_at(at) {} + + DOCTEST_NOINLINE operator Result() { +@@ -1394,8 +1394,8 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP + // https://github.com/catchorg/Catch2/issues/870 + // https://github.com/catchorg/Catch2/issues/565 + template <typename L> +- Expression_lhs<const L> operator<<(const L &&operand) { +- return Expression_lhs<const L>(doctest::detail::forward<const L>(operand), m_at); ++ Expression_lhs<L> operator<<(L&& operand) { ++ return Expression_lhs<L>(static_cast<L&&>(operand), m_at); + } + + template <typename L,typename enable_if<!doctest::detail::is_rvalue_reference<L>::value,void >::type* = nullptr> +diff --git a/doctest/parts/doctest_fwd.h b/doctest/parts/doctest_fwd.h +index b0d786f..ff9fed0 100644 +--- a/doctest/parts/doctest_fwd.h ++++ b/doctest/parts/doctest_fwd.h +@@ -1317,7 +1317,7 @@ DOCTEST_CLANG_SUPPRESS_WARNING_WITH_PUSH("-Wunused-comparison") + assertType::Enum m_at; + + explicit Expression_lhs(L&& in, assertType::Enum at) +- : lhs(doctest::detail::forward<L>(in)) ++ : lhs(static_cast<L&&>(in)) + , m_at(at) {} + + DOCTEST_NOINLINE operator Result() { +@@ -1391,8 +1391,8 @@ DOCTEST_CLANG_SUPPRESS_WARNING_POP + // https://github.com/catchorg/Catch2/issues/870 + // https://github.com/catchorg/Catch2/issues/565 + template <typename L> +- Expression_lhs<const L> operator<<(const L &&operand) { +- return Expression_lhs<const L>(doctest::detail::forward<const L>(operand), m_at); ++ Expression_lhs<L> operator<<(L&& operand) { ++ return Expression_lhs<L>(static_cast<L&&>(operand), m_at); + } + + template <typename L,typename enable_if<!doctest::detail::is_rvalue_reference<L>::value,void >::type* = nullptr> +-- +2.35.1 + |