aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-02-04 21:22:40 -0800
committerKhem Raj <raj.khem@gmail.com>2019-02-05 16:43:12 -0800
commit8f6995ddc639a46d825aa0fc294ef589547ca6d3 (patch)
tree44c112ad7cf2d3a0fddd7b8f37ddf79cb2431204
parent3a0a0024bf0bcc1ddc6f5a67a0f646258108e6eb (diff)
downloadmeta-openembedded-contrib-8f6995ddc639a46d825aa0fc294ef589547ca6d3.tar.gz
meta-openembedded-contrib-8f6995ddc639a46d825aa0fc294ef589547ca6d3.tar.bz2
meta-openembedded-contrib-8f6995ddc639a46d825aa0fc294ef589547ca6d3.zip
catch2: Upgrade to 2.6.0
Drop backported patch Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-test/catch2/catch2/0001-Remove-redundant-move.patch37
-rw-r--r--meta-oe/recipes-test/catch2/catch2_2.6.0.bb (renamed from meta-oe/recipes-test/catch2/catch2_2.5.0.bb)6
2 files changed, 2 insertions, 41 deletions
diff --git a/meta-oe/recipes-test/catch2/catch2/0001-Remove-redundant-move.patch b/meta-oe/recipes-test/catch2/catch2/0001-Remove-redundant-move.patch
deleted file mode 100644
index dc8a8915eb..0000000000
--- a/meta-oe/recipes-test/catch2/catch2/0001-Remove-redundant-move.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7d7428fd09d1bcee281f7b678df8fb71e9365b17 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?=
- <martin.horenovsky@gmail.com>
-Date: Thu, 27 Dec 2018 16:08:04 +0100
-Subject: [PATCH] A different approach
-
----
- include/internal/catch_session.cpp | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
---- a/include/internal/catch_session.cpp
-+++ b/include/internal/catch_session.cpp
-@@ -42,14 +42,20 @@ namespace Catch {
- return createReporter(config->getReporterName(), config);
- }
-
-- auto multi = std::unique_ptr<ListeningReporter>(new ListeningReporter);
-+ // On older platforms, returning std::unique_ptr<ListeningReporter>
-+ // when the return type is std::unique_ptr<IStreamingReporter>
-+ // doesn't compile without a std::move call. However, this causes
-+ // a warning on newer platforms. Thus, we have to work around
-+ // it a bit and downcast the pointer manually.
-+ auto ret = std::unique_ptr<IStreamingReporter>(new ListeningReporter);
-+ auto& multi = static_cast<ListeningReporter&>(*ret);
-
- auto const& listeners = Catch::getRegistryHub().getReporterRegistry().getListeners();
- for (auto const& listener : listeners) {
-- multi->addListener(listener->create(Catch::ReporterConfig(config)));
-+ multi.addListener(listener->create(Catch::ReporterConfig(config)));
- }
-- multi->addReporter(createReporter(config->getReporterName(), config));
-- return std::move(multi);
-+ multi.addReporter(createReporter(config->getReporterName(), config));
-+ return ret;
- }
-
-
diff --git a/meta-oe/recipes-test/catch2/catch2_2.5.0.bb b/meta-oe/recipes-test/catch2/catch2_2.6.0.bb
index 26149b31e4..13beb9e8b5 100644
--- a/meta-oe/recipes-test/catch2/catch2_2.5.0.bb
+++ b/meta-oe/recipes-test/catch2/catch2_2.6.0.bb
@@ -6,11 +6,9 @@ LICENSE = "BSL-1.0"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
SRC_URI = "git://github.com/catchorg/Catch2.git \
- file://0001-Remove-redundant-move.patch \
"
-# v2.5.0
-#SRCREV = "6ccd467094973824d89efb16cbc553e279f79823"
-SRCREV = "461843b1f02a4bf5c59db88ff201d2c56fabf3a4"
+# v2.6.0
+SRCREV = "d75e9b3c0f24fe42553131873459611ed155e297"
S = "${WORKDIR}/git"