From 977df43ff248cad4a00aafd4f86d8dc1c1ccf526 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Tue, 22 Dec 2020 16:56:58 -0600 Subject: [PATCH] catch2: update to 2.13.3. --- srcpkgs/catch2/patches/musl-test.patch | 15 +++++++++++++++ srcpkgs/catch2/template | 11 +++-------- 2 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/catch2/patches/musl-test.patch diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/musl-test.patch new file mode 100644 index 00000000000..f469dc45e02 --- /dev/null +++ b/srcpkgs/catch2/patches/musl-test.patch @@ -0,0 +1,15 @@ +From: Johnnynator + +errno on Musl and Glibc expand differently by one space +--- +--- scripts/approvalTests.py 2019-12-28 21:24:04.000000000 +0100 ++++ - 2020-12-31 16:19:56.118506507 +0100 +@@ -44,7 +44,7 @@ + + # errno macro expands into various names depending on platform, so we need to fix them up as well + errnoParser = re.compile(r''' +- \(\*__errno_location\ \(\)\) ++ \(\*__errno_location\s*\(\)\) + | + \(\*__error\(\)\) + | diff --git a/srcpkgs/catch2/template b/srcpkgs/catch2/template index ae4c9b2c38d..8a0b9f817de 100644 --- a/srcpkgs/catch2/template +++ b/srcpkgs/catch2/template @@ -1,7 +1,7 @@ # Template file for 'catch2' pkgname=catch2 -version=2.11.1 -revision=2 +version=2.13.3 +revision=1 wrksrc="Catch2-${version}" build_style=cmake configure_args="-DCATCH_USE_VALGRIND=OFF -DCATCH_BUILD_TESTING=ON @@ -14,13 +14,8 @@ maintainer="Louis Dupré Bertoni " license="BSL-1.0" homepage="https://github.com/catchorg/Catch2" distfiles="https://github.com/catchorg/Catch2/archive/v${version}/${pkgname}-v${version}.tar.gz" -checksum=9af06ca5b10362620c6c9c729821367e1aeb0f76adfc7bc3a468da83db3c50c6 +checksum=fedc5b008f7eb574f45098e7c7138211c543f0f8ad04792090e790511697a877 post_install() { vlicense LICENSE.txt } - -do_check() { - cd build - make test -}