* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/doctest/files/, dev-cpp/doctest/
@ 2021-09-18 3:04 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-09-18 3:04 UTC (permalink / raw
To: gentoo-commits
commit: c32b8a80a2f30e79dba6d53ec4da64285139a972
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Mon Sep 13 07:17:51 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> 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 <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/22280
Signed-off-by: Sam James <sam <AT> 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<int> bla1;
+ bla1.one = 5;
+ bla1.two = 4u;
+- MyTypeInherited<int> bla2;
+- bla2.one = 5;
+- bla2.two = 6u;
+
+ Bar::Foo f1;
+ Bar::Foo f2;
+--
+2.32.0
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/doctest/files/, dev-cpp/doctest/
@ 2022-06-12 7:33 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2022-06-12 7:33 UTC (permalink / raw
To: gentoo-commits
commit: 70fc26d37bf73f9a8d1730c1637009b20efc13ad
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Wed May 25 15:39:58 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 07:18:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70fc26d3
dev-cpp/doctest: fix tests with move-only types
This is a fix of a bug which affects mail-filter/rspamd-3.{1,2}. The
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
Bug: https://bugs.gentoo.org/830624
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...octest-2.4.8.ebuild => doctest-2.4.8-r1.ebuild} | 4 ++
.../files/doctest-2.4.8-move-only-types-fix.patch | 56 ++++++++++++++++++++++
2 files changed, 60 insertions(+)
diff --git a/dev-cpp/doctest/doctest-2.4.8.ebuild b/dev-cpp/doctest/doctest-2.4.8-r1.ebuild
similarity index 88%
rename from dev-cpp/doctest/doctest-2.4.8.ebuild
rename to 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
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/doctest/files/, dev-cpp/doctest/
@ 2022-08-27 11:38 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-08-27 11:38 UTC (permalink / raw
To: gentoo-commits
commit: 2ad25f5aab3e13a207f6a242481da11ba9437471
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Wed Aug 17 10:08:52 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 11:38:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ad25f5a
dev-cpp/doctest: drop 2.4.6, 2.4.8-r1
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/26896
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-cpp/doctest/Manifest | 2 -
dev-cpp/doctest/doctest-2.4.6.ebuild | 25 ----------
dev-cpp/doctest/doctest-2.4.8-r1.ebuild | 27 -----------
.../files/doctest-2.4.6-remove-unused-bla2.patch | 23 ---------
.../files/doctest-2.4.8-move-only-types-fix.patch | 56 ----------------------
5 files changed, 133 deletions(-)
diff --git a/dev-cpp/doctest/Manifest b/dev-cpp/doctest/Manifest
index b71ab3292ace..cd05ef97c453 100644
--- a/dev-cpp/doctest/Manifest
+++ b/dev-cpp/doctest/Manifest
@@ -1,3 +1 @@
-DIST doctest-2.4.6.tar.gz 2277281 BLAKE2B e6835ad33522273a3151ccfa1e760a150e2f0ccc15fb739cb518d8c9b4258f4b1529537bb6f41b285660aa00f1791b30a7db14155d9f23ea54dd11bfdeb81ec3 SHA512 a5cccf085af946003140af688f071a6407d42fc685324a537e3b704ef9de0f2228bd06eabfd1df8da70dec001420dd0b2813e5e4320b5c1da450cb0aadd63788
-DIST doctest-2.4.8.tar.gz 2275833 BLAKE2B 334ed6fda624788adf07fb92a773f3fa69addfbff389e3669e58f66271536d42ff8d20e73e20a4f1d3eee59233d476e527680bb19dcae1d9a6d062e6feedfde5 SHA512 f9b40abfd756331f9b667f3c1e7dcf2652effacac70523834dd3946522f01459c095bdbad04651ad2ad155977e1395025f868ed4dcf5d5712aae9807afb5699c
DIST doctest-2.4.9.tar.gz 2292632 BLAKE2B 7d501eede5a2311117a04a11da5b518fcac4de53a73ba7b14f47395a759bc5d708438f25df61053a16a256ffcdfa37500a6892ef0890aa4df4d9f23533bfb18d SHA512 c7337e2de371c18973a0f4cb76458d6ae387e78874c9bc8aa367ffd2d592514b774e7c5ebf44f83b7046f6b33c6905fd079c36f4c33eadf52b3d651d978182cb
diff --git a/dev-cpp/doctest/doctest-2.4.6.ebuild b/dev-cpp/doctest/doctest-2.4.6.ebuild
deleted file mode 100644
index c8d01f2279f3..000000000000
--- a/dev-cpp/doctest/doctest-2.4.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 )"
-
-PATCHES=( "${FILESDIR}/${P}-remove-unused-bla2.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DDOCTEST_WITH_TESTS=$(usex test)
- )
- cmake_src_configure
-}
diff --git a/dev-cpp/doctest/doctest-2.4.8-r1.ebuild b/dev-cpp/doctest/doctest-2.4.8-r1.ebuild
deleted file mode 100644
index e611f524f5fa..000000000000
--- a/dev-cpp/doctest/doctest-2.4.8-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2022 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/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-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)
- )
- cmake_src_configure
-}
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
deleted file mode 100644
index 69efd40e6a42..000000000000
--- a/dev-cpp/doctest/files/doctest-2.4.6-remove-unused-bla2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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<int> bla1;
- bla1.one = 5;
- bla1.two = 4u;
-- MyTypeInherited<int> bla2;
-- bla2.one = 5;
-- bla2.two = 6u;
-
- Bar::Foo f1;
- Bar::Foo f2;
---
-2.32.0
-
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
deleted file mode 100644
index 1a0343282685..000000000000
--- a/dev-cpp/doctest/files/doctest-2.4.8-move-only-types-fix.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-08-27 23:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-18 3:04 [gentoo-commits] repo/gentoo:master commit in: dev-cpp/doctest/files/, dev-cpp/doctest/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-06-12 7:33 Joonas Niilola
2022-08-27 11:38 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox