libbgcode: Support Catch2 v3.

[Paul Ripke <stix%stix.id.au@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Sat Apr 6 18:53:22 2024 +1100
Changeset:	09b700a442146d0146f7f99da1b84cfdae27e886

Modified Files:
	libbgcode/Makefile
	libbgcode/distinfo
Added Files:
	libbgcode/patches/patch-tests_CMakeLists.txt
	libbgcode/patches/patch-tests_catch__main.hpp
	libbgcode/patches/patch-tests_convert_convert__tests.cpp
	libbgcode/patches/patch-tests_core_core__tests.cpp

Log Message:
libbgcode: Support Catch2 v3.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=09b700a442146d0146f7f99da1b84cfdae27e886

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

diffstat:
 libbgcode/Makefile                                 |  4 ++--
 libbgcode/distinfo                                 | 10 +++++---
 libbgcode/patches/patch-tests_CMakeLists.txt       | 28 ++++++++++++++++++++++
 libbgcode/patches/patch-tests_catch__main.hpp      | 14 +++++++++++
 .../patches/patch-tests_convert_convert__tests.cpp | 14 +++++++++++
 libbgcode/patches/patch-tests_core_core__tests.cpp | 15 ++++++++++++
 6 files changed, 80 insertions(+), 5 deletions(-)

diffs:
diff --git a/libbgcode/Makefile b/libbgcode/Makefile
index 9d91ec2c20..34752cf8be 100644
--- a/libbgcode/Makefile
+++ b/libbgcode/Makefile
@@ -4,7 +4,7 @@ DISTNAME=	libbgcode-20231123
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_GITHUB:=prusa3d/}
 GITHUB_PROJECT=	libbgcode
-GITHUB_TAG=	bc390aab4427589a6402b4c7f65cf4d0a8f987ec
+GITHUB_TAG=	8ae75bd0eea622f0e34cae311b3bd065b55eae9b
 
 MAINTAINER=	stix%stix.id.au@localhost
 HOMEPAGE=	https://www.github.com/prusa3d/libbgcode
@@ -18,7 +18,7 @@ USE_CMAKE=	yes
 
 # CMake goes looking for this binary. Make it happy.
 pre-configure:
-	${LN} -s ${PREFIX}/bin/heatshrink ${BUILDLINK_DIR}/bin/
+	${LN} -sf ${PREFIX}/bin/heatshrink ${BUILDLINK_DIR}/bin/
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/libbgcode/distinfo b/libbgcode/distinfo
index e715da18c2..7104246448 100644
--- a/libbgcode/distinfo
+++ b/libbgcode/distinfo
@@ -1,5 +1,9 @@
 $NetBSD$
 
-BLAKE2s (libbgcode-20231123-bc390aab4427589a6402b4c7f65cf4d0a8f987ec.tar.gz) = 3b03a613a8e66787ef0f64a3bf5345a263ed0620de39f58a750d45525710af55
-SHA512 (libbgcode-20231123-bc390aab4427589a6402b4c7f65cf4d0a8f987ec.tar.gz) = 605110a0e4ca16fd497dbe8b15f9794a75c19d5d5367320ddacaa621eb1a4370fcc5b8a799440d8b449774595c5bcbcd2d96fcb574707da475ef85764f9760d3
-Size (libbgcode-20231123-bc390aab4427589a6402b4c7f65cf4d0a8f987ec.tar.gz) = 455134 bytes
+BLAKE2s (libbgcode-20231123-8ae75bd0eea622f0e34cae311b3bd065b55eae9b.tar.gz) = 98372297b33b6b225b92a9f4747b63d1e0d32b7c91dc24c67d14357a84546f3e
+SHA512 (libbgcode-20231123-8ae75bd0eea622f0e34cae311b3bd065b55eae9b.tar.gz) = 13d5fe20b1faee5068a3c385041a680de5cdcec7fc34bc3f28c52bdab4d6b9e6170ad5ce5bb78399e956fc7f3fb5409e8e4adf0ff4850be686b3caf4d76ee3aa
+Size (libbgcode-20231123-8ae75bd0eea622f0e34cae311b3bd065b55eae9b.tar.gz) = 456463 bytes
+SHA1 (patch-tests_CMakeLists.txt) = 87b6a5317811b0a665e447338a3b744fdd9bba99
+SHA1 (patch-tests_catch__main.hpp) = dd8f317807668849d89c18eb764707ef71d9efbc
+SHA1 (patch-tests_convert_convert__tests.cpp) = 9073e63140d41e3294cafa0d91b87c5fb7a7426b
+SHA1 (patch-tests_core_core__tests.cpp) = 9547e562564b5593cdc2873ea3d3078e7985b556
diff --git a/libbgcode/patches/patch-tests_CMakeLists.txt b/libbgcode/patches/patch-tests_CMakeLists.txt
new file mode 100644
index 0000000000..3a1f3a8f49
--- /dev/null
+++ b/libbgcode/patches/patch-tests_CMakeLists.txt
@@ -0,0 +1,28 @@
+$NetBSD$
+
+Support Catch2 v3.
+
+--- tests/CMakeLists.txt.orig	2024-04-06 07:20:41.918851648 +0000
++++ tests/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-find_package(Catch2 2.9 REQUIRED)
++find_package(Catch2 REQUIRED)
+ 
+ include(Catch)
+ 
+@@ -16,7 +16,7 @@ file(TO_NATIVE_PATH "${TEST_DATA_DIR}" T
+ add_library(test_common INTERFACE)
+ target_include_directories(test_common INTERFACE ${CMAKE_CURRENT_LIST_DIR})
+ target_compile_definitions(test_common INTERFACE TEST_DATA_DIR=R"\(${TEST_DATA_DIR}\)" CATCH_CONFIG_FAST_COMPILE)
+-target_link_libraries(test_common INTERFACE Catch2::Catch2 Boost::nowide)
++target_link_libraries(test_common INTERFACE Catch2::Catch2WithMain Boost::nowide)
+ 
+ if (EMSCRIPTEN)
+     target_link_libraries(test_common INTERFACE nodefs.js noderawfs.js)
+@@ -30,4 +30,4 @@ endif()
+ 
+ if (${PROJECT_NAME}_BUILD_COMPONENT_Convert)
+     add_subdirectory(convert)
+-endif ()
+\ No newline at end of file
++endif ()
diff --git a/libbgcode/patches/patch-tests_catch__main.hpp b/libbgcode/patches/patch-tests_catch__main.hpp
new file mode 100644
index 0000000000..2bc46ca37d
--- /dev/null
+++ b/libbgcode/patches/patch-tests_catch__main.hpp
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Support Catch2 v3.
+
+--- tests/catch_main.hpp.orig	2024-04-06 07:39:45.253486614 +0000
++++ tests/catch_main.hpp
+@@ -3,6 +3,6 @@
+ 
+ #define CATCH_CONFIG_EXTERNAL_INTERFACES
+ #define CATCH_CONFIG_MAIN
+-#include <catch2/catch.hpp>
++#include <catch2/catch_test_macros.hpp>
+ 
+ #endif // CATCH_MAIN
diff --git a/libbgcode/patches/patch-tests_convert_convert__tests.cpp b/libbgcode/patches/patch-tests_convert_convert__tests.cpp
new file mode 100644
index 0000000000..c5be44270d
--- /dev/null
+++ b/libbgcode/patches/patch-tests_convert_convert__tests.cpp
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Support Catch2 v3.
+
+--- tests/convert/convert_tests.cpp.orig	2024-04-06 07:43:35.839605465 +0000
++++ tests/convert/convert_tests.cpp
+@@ -3,6 +3,7 @@
+ #include "convert/convert.hpp"
+ 
+ #include <fstream>
++#include <iostream>
+ 
+ #include <boost/nowide/cstdio.hpp>
+ 
diff --git a/libbgcode/patches/patch-tests_core_core__tests.cpp b/libbgcode/patches/patch-tests_core_core__tests.cpp
new file mode 100644
index 0000000000..a12cd81910
--- /dev/null
+++ b/libbgcode/patches/patch-tests_core_core__tests.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Support Catch2 v3.
+
+--- tests/core/core_tests.cpp.orig	2024-04-06 07:42:50.424323910 +0000
++++ tests/core/core_tests.cpp
+@@ -2,6 +2,8 @@
+ 
+ #include "core/core.hpp"
+ 
++#include <iostream>
++
+ #include <boost/nowide/cstdio.hpp>
+ 
+ using namespace bgcode::core;