CVS commit: pkgsrc/devel/catch2

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Sep 14 10:14:44 UTC 2025

Modified Files:
        pkgsrc/devel/catch2: Makefile PLIST distinfo
Added Files:
        pkgsrc/devel/catch2/patches: patch-CMakeLists.txt
Removed Files:
        pkgsrc/devel/catch2/patches: patch-src_catch2_catch__tostring.cpp

Log Message:
catch2: updated to 3.10.0

3.10.0

Fixes

pkg-config files will take DESTDIR env var into account when selecting install destination
Changed filter to store the provided predicate by value
This is done to avoid dangling-by-default behaviour when filter is used inside GENERATE_COPY/GENERATE_REF.

Improvements

Escaping XML and JSON output is faster when the strings do not need escaping.
The improvement starts at about 3x throughput, up to 10x for long strings.
Message macros (INFO, CAPTURE, WARN, SUCCEED, etc) are now thread safe.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/catch2/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/catch2/PLIST
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/catch2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/catch2/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/catch2/patches/patch-src_catch2_catch__tostring.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/Makefile
diff -u pkgsrc/devel/catch2/Makefile:1.22 pkgsrc/devel/catch2/Makefile:1.23
--- pkgsrc/devel/catch2/Makefile:1.22   Thu Apr 10 09:51:03 2025
+++ pkgsrc/devel/catch2/Makefile        Sun Sep 14 10:14:43 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2025/04/10 09:51:03 adam Exp $
+# $NetBSD: Makefile,v 1.23 2025/09/14 10:14:43 adam Exp $
 
-DISTNAME=      Catch2-3.8.1
+DISTNAME=      Catch2-3.10.0
 PKGNAME=       ${DISTNAME:tl}
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=catchorg/}

Index: pkgsrc/devel/catch2/PLIST
diff -u pkgsrc/devel/catch2/PLIST:1.3 pkgsrc/devel/catch2/PLIST:1.4
--- pkgsrc/devel/catch2/PLIST:1.3       Tue Aug 20 09:29:46 2024
+++ pkgsrc/devel/catch2/PLIST   Sun Sep 14 10:14:43 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2024/08/20 09:29:46 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2025/09/14 10:14:43 adam Exp $
 include/catch2/benchmark/catch_benchmark.hpp
 include/catch2/benchmark/catch_benchmark_all.hpp
 include/catch2/benchmark/catch_chronometer.hpp
@@ -36,6 +36,7 @@ include/catch2/catch_tag_alias_autoregis
 include/catch2/catch_template_test_macros.hpp
 include/catch2/catch_test_case_info.hpp
 include/catch2/catch_test_macros.hpp
+include/catch2/catch_test_run_info.hpp
 include/catch2/catch_test_spec.hpp
 include/catch2/catch_timer.hpp
 include/catch2/catch_tostring.hpp
@@ -81,6 +82,7 @@ include/catch2/internal/catch_context.hp
 include/catch2/internal/catch_debug_console.hpp
 include/catch2/internal/catch_debugger.hpp
 include/catch2/internal/catch_decomposer.hpp
+include/catch2/internal/catch_deprecation_macro.hpp
 include/catch2/internal/catch_enforce.hpp
 include/catch2/internal/catch_enum_values_registry.hpp
 include/catch2/internal/catch_errno_guard.hpp
@@ -133,15 +135,16 @@ include/catch2/internal/catch_test_case_
 include/catch2/internal/catch_test_failure_exception.hpp
 include/catch2/internal/catch_test_macro_impl.hpp
 include/catch2/internal/catch_test_registry.hpp
-include/catch2/internal/catch_test_run_info.hpp
 include/catch2/internal/catch_test_spec_parser.hpp
 include/catch2/internal/catch_textflow.hpp
+include/catch2/internal/catch_thread_support.hpp
 include/catch2/internal/catch_to_string.hpp
 include/catch2/internal/catch_uncaught_exceptions.hpp
 include/catch2/internal/catch_uniform_floating_point_distribution.hpp
 include/catch2/internal/catch_uniform_integer_distribution.hpp
 include/catch2/internal/catch_unique_name.hpp
 include/catch2/internal/catch_unique_ptr.hpp
+include/catch2/internal/catch_unreachable.hpp
 include/catch2/internal/catch_void_type.hpp
 include/catch2/internal/catch_wildcard_pattern.hpp
 include/catch2/internal/catch_windows_h_proxy.hpp
@@ -220,6 +223,7 @@ share/doc/Catch2/reporters.md
 share/doc/Catch2/skipping-passing-failing.md
 share/doc/Catch2/test-cases-and-sections.md
 share/doc/Catch2/test-fixtures.md
+share/doc/Catch2/thread-safety.md
 share/doc/Catch2/tostring.md
 share/doc/Catch2/tutorial.md
 share/doc/Catch2/usage-tips.md

Index: pkgsrc/devel/catch2/distinfo
diff -u pkgsrc/devel/catch2/distinfo:1.23 pkgsrc/devel/catch2/distinfo:1.24
--- pkgsrc/devel/catch2/distinfo:1.23   Thu Apr 10 09:51:03 2025
+++ pkgsrc/devel/catch2/distinfo        Sun Sep 14 10:14:43 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2025/04/10 09:51:03 adam Exp $
+$NetBSD: distinfo,v 1.24 2025/09/14 10:14:43 adam Exp $
 
-BLAKE2s (Catch2-3.8.1.tar.gz) = a96ee543f1141744c0c2055a44d9549eefaa39580ca45c352b57c553146a0ccb
-SHA512 (Catch2-3.8.1.tar.gz) = 071f407dfefa84c3f766e32de48525dcaa50f5c5b0a2e2e9e615fdfff8d36476c7a28c9c27f4030fcf2f5f612043124efe61582bc2c174ddb62b4f307f74ffc5
-Size (Catch2-3.8.1.tar.gz) = 1197623 bytes
-SHA1 (patch-src_catch2_catch__tostring.cpp) = d18154d9b987d48ef90947d02f6ae92e2569b8c7
+BLAKE2s (Catch2-3.10.0.tar.gz) = 5366889e1ea54a0197a7ad70f73f56af77e8903093ed581f11aec7897b3f14b9
+SHA512 (Catch2-3.10.0.tar.gz) = e36ad4eb68984d277bb8e4e609cdfb4305ef05a8896e17a646a1846cb848039314b98aca0034a1d6538b3cf8bb134736f0ddda12210d106de73b3ae828d36473
+Size (Catch2-3.10.0.tar.gz) = 1146734 bytes
+SHA1 (patch-CMakeLists.txt) = 6e0f364c5931a03b0b6d5a26654e92070073778a
 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-CMakeLists.txt
diff -u /dev/null pkgsrc/devel/catch2/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Sun Sep 14 10:14:44 2025
+++ pkgsrc/devel/catch2/patches/patch-CMakeLists.txt    Sun Sep 14 10:14:43 2025
@@ -0,0 +1,23 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2025/09/14 10:14:43 adam Exp $
+
+${install_pkgconfdir} should already contain ${CMAKE_INSTALL_PREFIX}.
+
+--- CMakeLists.txt.orig        2025-08-25 19:30:21.000000000 +0000
++++ CMakeLists.txt
+@@ -204,14 +204,14 @@ if(NOT_SUBPROJECT)
+          set(lib_name "$<TARGET_FILE_BASE_NAME:Catch2>")
+          configure_file(
+            "${impl_pc_file}"
+-           "${DESTDIR_PREFIX}${CMAKE_INSTALL_PREFIX}/${install_pkgconfdir}/catch2.pc"
++           "${DESTDIR_PREFIX}/${install_pkgconfdir}/catch2.pc"
+            @ONLY
+          )
+ 
+          set(lib_name "$<TARGET_FILE_BASE_NAME:Catch2WithMain>")
+          configure_file(
+            "${main_pc_file}"
+-           "${DESTDIR_PREFIX}${CMAKE_INSTALL_PREFIX}/${install_pkgconfdir}/catch2-with-main.pc"
++           "${DESTDIR_PREFIX}/${install_pkgconfdir}/catch2-with-main.pc"
+            @ONLY
+          )
+        ]]