From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 90153158092 for ; Sat, 18 Sep 2021 03:05:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7C9BE07FE; Sat, 18 Sep 2021 03:05:00 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B04F6E07FE for ; Sat, 18 Sep 2021 03:05:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D97A5342F2F for ; Sat, 18 Sep 2021 03:04:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 73A92D5 for ; Sat, 18 Sep 2021 03:04:58 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1631934287.c32b8a80a2f30e79dba6d53ec4da64285139a972.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/doctest/files/, dev-cpp/doctest/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/doctest/doctest-2.4.6.ebuild dev-cpp/doctest/files/doctest-2.4.6-remove-unused-bla2.patch X-VCS-Directories: dev-cpp/doctest/ dev-cpp/doctest/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c32b8a80a2f30e79dba6d53ec4da64285139a972 X-VCS-Branch: master Date: Sat, 18 Sep 2021 03:04:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0a7bffa3-a74f-4a32-8731-4106988819a1 X-Archives-Hash: 9b838edca1bcbaf595b3e6ced0cd7572 commit: c32b8a80a2f30e79dba6d53ec4da64285139a972 Author: Petr Vaněk atlas cz> AuthorDate: Mon Sep 13 07:17:51 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Sep 18 03:04:47 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c32b8a80 dev-cpp/doctest: fix gcc-11 related compilation error Apply patch in order to fix gcc-11 related compilation error. The patch follows proposed fixes to upstream [1,2]. [1] https://github.com/onqtam/doctest/pull/505 [2] https://github.com/onqtam/doctest/pull/520 Closes: https://bugs.gentoo.org/812077 Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/22280 Signed-off-by: Sam James gentoo.org> dev-cpp/doctest/doctest-2.4.6.ebuild | 2 ++ .../files/doctest-2.4.6-remove-unused-bla2.patch | 23 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/dev-cpp/doctest/doctest-2.4.6.ebuild b/dev-cpp/doctest/doctest-2.4.6.ebuild index 09d25151de7..19efed964dd 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 00000000000..69efd40e6a4 --- /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 +