From b250fe8002c831af41044099bfe311e53ea20166 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Fri, 10 May 2019 14:55:15 +0300 Subject: catch2: Upgrade 2.6.1 -> 2.7.2 Remove patch applied upstream. Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj --- meta-oe/recipes-test/catch2/catch2_2.6.1.bb | 25 ---------------- meta-oe/recipes-test/catch2/catch2_2.7.2.bb | 24 +++++++++++++++ ...1-Fix-Wdefaulted-function-deleted-warning.patch | 35 ---------------------- 3 files changed, 24 insertions(+), 60 deletions(-) delete mode 100644 meta-oe/recipes-test/catch2/catch2_2.6.1.bb create mode 100644 meta-oe/recipes-test/catch2/catch2_2.7.2.bb delete mode 100644 meta-oe/recipes-test/catch2/files/0001-Fix-Wdefaulted-function-deleted-warning.patch diff --git a/meta-oe/recipes-test/catch2/catch2_2.6.1.bb b/meta-oe/recipes-test/catch2/catch2_2.6.1.bb deleted file mode 100644 index 08d6616401..0000000000 --- a/meta-oe/recipes-test/catch2/catch2_2.6.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "A modern, C++-native, header-only, test framework for unit-tests, \ -TDD and BDD - using C++11, C++14, C++17 and later." -AUTHOR = "Phil Nash, Martin Horenovsky and others" -HOMEPAGE = "https://github.com/catchorg/Catch2" -LICENSE = "BSL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" - -SRC_URI = "git://github.com/catchorg/Catch2.git \ - file://0001-Fix-Wdefaulted-function-deleted-warning.patch \ - " -# v2.6.1 -SRCREV = "dbbab8727c342733f75045483048cdcb52421e32" - -S = "${WORKDIR}/git" - -inherit cmake python3native - -do_install_append() { - rm ${D}${datadir}/Catch2/lldbinit - rm ${D}${datadir}/Catch2/gdbinit - rmdir ${D}${datadir}/Catch2/ -} -# Header-only library -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-oe/recipes-test/catch2/catch2_2.7.2.bb b/meta-oe/recipes-test/catch2/catch2_2.7.2.bb new file mode 100644 index 0000000000..b5c8573296 --- /dev/null +++ b/meta-oe/recipes-test/catch2/catch2_2.7.2.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "A modern, C++-native, header-only, test framework for unit-tests, \ +TDD and BDD - using C++11, C++14, C++17 and later." +AUTHOR = "Phil Nash, Martin Horenovsky and others" +HOMEPAGE = "https://github.com/catchorg/Catch2" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" + +SRC_URI = "git://github.com/catchorg/Catch2.git \ + " +# v2.7.2 +SRCREV = "7c37501b070c0e9ea9cdedbeac2059f0a6b0a8ab" + +S = "${WORKDIR}/git" + +inherit cmake python3native + +do_install_append() { + rm ${D}${datadir}/Catch2/lldbinit + rm ${D}${datadir}/Catch2/gdbinit + rmdir ${D}${datadir}/Catch2/ +} +# Header-only library +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-oe/recipes-test/catch2/files/0001-Fix-Wdefaulted-function-deleted-warning.patch b/meta-oe/recipes-test/catch2/files/0001-Fix-Wdefaulted-function-deleted-warning.patch deleted file mode 100644 index 555c71ad22..0000000000 --- a/meta-oe/recipes-test/catch2/files/0001-Fix-Wdefaulted-function-deleted-warning.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a39e0eaa8318335260967ffd1d16388eb5a1d6d8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 12 Feb 2019 12:57:00 -0800 -Subject: [PATCH] Fix -Wdefaulted-function-deleted warning - -Clang8 warns - -catch_interfaces_reporter.h:84:25: error: explicitly defaulted move assignment operator is implicitly deleted [-Werror,-Wdefaulted-function-deleted] -| AssertionStats& operator = ( AssertionStats && ) = default; -| ^ - -Upstream-Status: Submitted [https://github.com/catchorg/Catch2/pull/1537] -Signed-off-by: Khem Raj ---- - include/internal/catch_interfaces_reporter.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/internal/catch_interfaces_reporter.h b/include/internal/catch_interfaces_reporter.h -index 9d99c981..e5fbf8bb 100644 ---- a/include/internal/catch_interfaces_reporter.h -+++ b/include/internal/catch_interfaces_reporter.h -@@ -80,8 +80,8 @@ namespace Catch { - - AssertionStats( AssertionStats const& ) = default; - AssertionStats( AssertionStats && ) = default; -- AssertionStats& operator = ( AssertionStats const& ) = default; -- AssertionStats& operator = ( AssertionStats && ) = default; -+ AssertionStats& operator = ( AssertionStats const& ) = delete; -+ AssertionStats& operator = ( AssertionStats && ) = delete; - virtual ~AssertionStats(); - - AssertionResult assertionResult; --- -2.20.1 - -- cgit v1.2.3-54-g00ecf