CVS commit: pkgsrc/devel/catch2

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Thu Jan 18 09:52:28 UTC 2024

Modified Files:
        pkgsrc/devel/catch2: distinfo
Added Files:
        pkgsrc/devel/catch2/patches: patch-src_catch2_catch__tostring.cpp
            patch-src_catch2_internal_catch__floating__point__helpers.hpp
            patch-src_catch2_matchers_catch__matchers__floating__point.cpp

Log Message:
catch2: make sure catch::isnan() is seen on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/catch2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/catch2/patches/patch-src_catch2_catch__tostring.cpp \
    pkgsrc/devel/catch2/patches/patch-src_catch2_internal_catch__floating__point__helpers.hpp \
    pkgsrc/devel/catch2/patches/patch-src_catch2_matchers_catch__matchers__floating__point.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/catch2/distinfo
diff -u pkgsrc/devel/catch2/distinfo:1.15 pkgsrc/devel/catch2/distinfo:1.16
--- pkgsrc/devel/catch2/distinfo:1.15   Tue Jan 16 06:23:57 2024
+++ pkgsrc/devel/catch2/distinfo        Thu Jan 18 09:52:27 2024
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.15 2024/01/16 06:23:57 adam Exp $
+$NetBSD: distinfo,v 1.16 2024/01/18 09:52:27 nros Exp $
 
 BLAKE2s (Catch2-3.5.2.tar.gz) = 6b022b459338b86f3ea6f8c9a415d81e730ac545aac68832238c6b6a28fc664d
 SHA512 (Catch2-3.5.2.tar.gz) = 1b9d5f35144f6c7acef0e76558a4adf3ff41c2c2292fbdcb3e2c2917fa2deb7fba593738105dd3c111f02ee8aca64010cf68f69bb8fb1815dbf771b509ab0576
 Size (Catch2-3.5.2.tar.gz) = 1159985 bytes
+SHA1 (patch-src_catch2_catch__tostring.cpp) = d18154d9b987d48ef90947d02f6ae92e2569b8c7
+SHA1 (patch-src_catch2_internal_catch__floating__point__helpers.hpp) = 32d9a0146f8a04cd203876e695c9a105b53a198f
+SHA1 (patch-src_catch2_matchers_catch__matchers__floating__point.cpp) = 855c7edee42b5befa4c4d70f3186809d5e0f3652

Added files:

Index: pkgsrc/devel/catch2/patches/patch-src_catch2_catch__tostring.cpp
diff -u /dev/null pkgsrc/devel/catch2/patches/patch-src_catch2_catch__tostring.cpp:1.1
--- /dev/null   Thu Jan 18 09:52:28 2024
+++ pkgsrc/devel/catch2/patches/patch-src_catch2_catch__tostring.cpp    Thu Jan 18 09:52:27 2024
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_catch2_catch__tostring.cpp,v 1.1 2024/01/18 09:52:27 nros Exp $
+
+Make sure Catch::isnan() is seen on SunOS
+
+--- src/catch2/catch_tostring.cpp.orig 2024-01-15 13:13:53.000000000 +0000
++++ src/catch2/catch_tostring.cpp
+@@ -9,11 +9,12 @@
+ #include <catch2/catch_tostring.hpp>
+ #include <catch2/interfaces/catch_interfaces_config.hpp>
+ #include <catch2/internal/catch_context.hpp>
+-#include <catch2/internal/catch_polyfills.hpp>
+ 
+ #include <cmath>
+ #include <iomanip>
+ 
++#include <catch2/internal/catch_polyfills.hpp>
++
+ namespace Catch {
+ 
+ namespace Detail {
Index: pkgsrc/devel/catch2/patches/patch-src_catch2_internal_catch__floating__point__helpers.hpp
diff -u /dev/null pkgsrc/devel/catch2/patches/patch-src_catch2_internal_catch__floating__point__helpers.hpp:1.1
--- /dev/null   Thu Jan 18 09:52:28 2024
+++ pkgsrc/devel/catch2/patches/patch-src_catch2_internal_catch__floating__point__helpers.hpp   Thu Jan 18 09:52:28 2024
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_catch2_internal_catch__floating__point__helpers.hpp,v 1.1 2024/01/18 09:52:28 nros Exp $
+
+Make sure Catch::isnan() is seen on SunOS
+
+--- src/catch2/internal/catch_floating_point_helpers.hpp.orig  2024-01-15 13:13:53.000000000 +0000
++++ src/catch2/internal/catch_floating_point_helpers.hpp
+@@ -8,14 +8,14 @@
+ #ifndef CATCH_FLOATING_POINT_HELPERS_HPP_INCLUDED
+ #define CATCH_FLOATING_POINT_HELPERS_HPP_INCLUDED
+ 
+-#include <catch2/internal/catch_polyfills.hpp>
+-
+ #include <cassert>
+ #include <cmath>
+ #include <cstdint>
+ #include <utility>
+ #include <limits>
+ 
++#include <catch2/internal/catch_polyfills.hpp>
++
+ namespace Catch {
+     namespace Detail {
+ 
Index: pkgsrc/devel/catch2/patches/patch-src_catch2_matchers_catch__matchers__floating__point.cpp
diff -u /dev/null pkgsrc/devel/catch2/patches/patch-src_catch2_matchers_catch__matchers__floating__point.cpp:1.1
--- /dev/null   Thu Jan 18 09:52:28 2024
+++ pkgsrc/devel/catch2/patches/patch-src_catch2_matchers_catch__matchers__floating__point.cpp  Thu Jan 18 09:52:28 2024
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_catch2_matchers_catch__matchers__floating__point.cpp,v 1.1 2024/01/18 09:52:28 nros Exp $
+
+Make sure Catch::isnan() is seen on SunOS
+
+--- src/catch2/matchers/catch_matchers_floating_point.cpp.orig 2024-01-18 10:39:21.370763696 +0000
++++ src/catch2/matchers/catch_matchers_floating_point.cpp
+@@ -7,7 +7,6 @@
+ // SPDX-License-Identifier: BSL-1.0
+ #include <catch2/matchers/catch_matchers_floating_point.hpp>
+ #include <catch2/internal/catch_enforce.hpp>
+-#include <catch2/internal/catch_polyfills.hpp>
+ #include <catch2/internal/catch_to_string.hpp>
+ #include <catch2/catch_tostring.hpp>
+ #include <catch2/internal/catch_floating_point_helpers.hpp>
+@@ -20,6 +19,7 @@
+ #include <iomanip>
+ #include <limits>
+ 
++#include <catch2/internal/catch_polyfills.hpp>
+ 
+ namespace Catch {
+ namespace {