From c719fdcee603a5a706a45d10cb598762d56a727d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Sep 2021 20:21:45 +0100 Subject: gentoo resync : 25.09.2021 --- dev-cpp/doctest/Manifest | 3 ++- dev-cpp/doctest/doctest-2.4.6.ebuild | 2 ++ .../files/doctest-2.4.6-remove-unused-bla2.patch | 23 ++++++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 dev-cpp/doctest/files/doctest-2.4.6-remove-unused-bla2.patch (limited to 'dev-cpp/doctest') diff --git a/dev-cpp/doctest/Manifest b/dev-cpp/doctest/Manifest index 499dc8742b56..a6c215d25c8b 100644 --- a/dev-cpp/doctest/Manifest +++ b/dev-cpp/doctest/Manifest @@ -1,3 +1,4 @@ +AUX doctest-2.4.6-remove-unused-bla2.patch 665 BLAKE2B 2c91d9905421944f5c2d1fd5ee557203d0ffa949e60ef0899257899b378d50b69b51c368bdd16a6b9db1de588b1c4ee056c738d6085f698b01777301219ec8f3 SHA512 7bd083866864afe4c6afd647489978b973015a38917d368cf26c76e5ecebc038b7cc819b7ed28b5aaaf6a4673b5f53dd60696a14cb850e0ea6184ecc8fd47dfe DIST doctest-2.4.6.tar.gz 2277281 BLAKE2B e6835ad33522273a3151ccfa1e760a150e2f0ccc15fb739cb518d8c9b4258f4b1529537bb6f41b285660aa00f1791b30a7db14155d9f23ea54dd11bfdeb81ec3 SHA512 a5cccf085af946003140af688f071a6407d42fc685324a537e3b704ef9de0f2228bd06eabfd1df8da70dec001420dd0b2813e5e4320b5c1da450cb0aadd63788 -EBUILD doctest-2.4.6.ebuild 522 BLAKE2B 0b1eb2ef144527a0d7bec5e1b5f1ef57c739deb1bb8aca480ec954662cc8b935be7ca18f6fbba21e79c31631ffd76ce7b8ee37132562afee9efdaaccc276807c SHA512 38d7873cc2a222bedf3c505940adb48fd8c95b1a167937b8f841b32668b70aa61c4fc9af18ddd3d6b1b46fd9cfd3173f242abf6c3c31c22a9cacfc95ad69606b +EBUILD doctest-2.4.6.ebuild 579 BLAKE2B 722a3ae87ef4ae92d69be89a39ef1551fd2c772c96f5e6de249bfe54e30ec58941477531a92fecd1f96b779d3f33011719c60a20cbb1ac65f964686b96b78446 SHA512 5c9779ecb94c53c20c21204a8b4faa694a2fc271ff4f637c703bb5a1ff635d5de7f3788a373cbcb45dd7e09e7ce797d21b76c1f7d6dfe97c939ca60ffda56af1 MISC metadata.xml 470 BLAKE2B 015ed231346c9084f15d2fc64775368a20a4a5aeee80f93f36e8c4ec49c2eeee42ad3b3fa05b9602509f1578b5cb939882dd034bba31b74d12491004cb842b27 SHA512 6f57a45c551d475e818b5417897adda318be669e750715cd4dabbd905d6c8df4847ab060498d3a41b50f20cfd66e8f8486d3a9c38f07346ed45b13eee4e15126 diff --git a/dev-cpp/doctest/doctest-2.4.6.ebuild b/dev-cpp/doctest/doctest-2.4.6.ebuild index 09d25151de7d..19efed964dd5 100644 --- a/dev-cpp/doctest/doctest-2.4.6.ebuild +++ b/dev-cpp/doctest/doctest-2.4.6.ebuild @@ -15,6 +15,8 @@ KEYWORDS="~amd64 ~x86" IUSE="test" RESTRICT="!test? ( test )" +PATCHES=( "${FILESDIR}/${P}-remove-unused-bla2.patch" ) + src_configure() { local mycmakeargs=( -DDOCTEST_WITH_TESTS=$(usex test) diff --git a/dev-cpp/doctest/files/doctest-2.4.6-remove-unused-bla2.patch b/dev-cpp/doctest/files/doctest-2.4.6-remove-unused-bla2.patch new file mode 100644 index 000000000000..69efd40e6a42 --- /dev/null +++ b/dev-cpp/doctest/files/doctest-2.4.6-remove-unused-bla2.patch @@ -0,0 +1,23 @@ +This patch follows proposed fixes to upstream. + +PR-1: https://github.com/onqtam/doctest/pull/505 +PR-2: https://github.com/onqtam/doctest/pull/520 + + +diff --git a/examples/all_features/stringification.cpp b/examples/all_features/stringification.cpp +index a8b5d5b..492e1ec 100644 +--- a/examples/all_features/stringification.cpp ++++ b/examples/all_features/stringification.cpp +@@ -103,9 +103,6 @@ TEST_CASE("all asserts should fail and show how the objects get stringified") { + MyTypeInherited bla1; + bla1.one = 5; + bla1.two = 4u; +- MyTypeInherited bla2; +- bla2.one = 5; +- bla2.two = 6u; + + Bar::Foo f1; + Bar::Foo f2; +-- +2.32.0 + -- cgit v1.2.3