From: ndowens <ndowens@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] catch2: update to 2.13.3.
Date: Thu, 31 Dec 2020 22:18:04 +0100 [thread overview]
Message-ID: <20201231211804.VbfhZakYhkDtQXjAKJsQfT3mPCCjdVBB1V96RWSjBFc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27364@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 314 bytes --]
There is an updated pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages catch2
https://github.com/void-linux/void-packages/pull/27364
catch2: update to 2.13.3.
A patch file from https://github.com/void-linux/void-packages/pull/27364.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-catch2-27364.patch --]
[-- Type: text/x-diff, Size: 1978 bytes --]
From 977df43ff248cad4a00aafd4f86d8dc1c1ccf526 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
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 <contact@louisdb.xyz>"
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
-}
next prev parent reply other threads:[~2020-12-31 21:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-22 22:55 [PR PATCH] " ndowens
2020-12-23 0:29 ` [PR PATCH] [Updated] " ndowens
2020-12-23 0:55 ` ndowens
2020-12-31 1:19 ` [PR PATCH] [Updated] " ndowens
2020-12-31 15:21 ` Johnnynator
2020-12-31 15:29 ` Johnnynator
2020-12-31 21:18 ` ndowens [this message]
2020-12-31 21:18 ` ndowens
2020-12-31 21:30 ` [PR PATCH] [Merged]: " ericonr
2020-12-31 22:58 ` ericonr
2021-01-01 1:04 ` ndowens
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201231211804.VbfhZakYhkDtQXjAKJsQfT3mPCCjdVBB1V96RWSjBFc@z \
--to=ndowens@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).