inflatelib: use upstream patch for catch2 issue

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: inflatelib: use upstream patch for catch2 issue
From: Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Thu, 5 Nov 2026 21:30:22 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu Nov 5 22:30:05 2026 +0100
Changeset:	dccef2e1b3038d53db453951db0d9973feaef365

Modified Files:
	inflatelib/Makefile
	inflatelib/distinfo
Added Files:
	inflatelib/patches/patch-test_cpp_BitstreamTests.cpp
	inflatelib/patches/patch-test_cpp_CMakeLists.txt
	inflatelib/patches/patch-test_cpp_HuffmanTreeTests.cpp
	inflatelib/patches/patch-test_cpp_InflateTests.cpp
	inflatelib/patches/patch-test_cpp_WindowTests.cpp

Log Message:
inflatelib: use upstream patch for catch2 issue

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

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

diffstat:
 inflatelib/Makefile                                    |  9 ---------
 inflatelib/distinfo                                    |  5 +++++
 inflatelib/patches/patch-test_cpp_BitstreamTests.cpp   | 15 +++++++++++++++
 inflatelib/patches/patch-test_cpp_CMakeLists.txt       | 15 +++++++++++++++
 inflatelib/patches/patch-test_cpp_HuffmanTreeTests.cpp | 15 +++++++++++++++
 inflatelib/patches/patch-test_cpp_InflateTests.cpp     | 15 +++++++++++++++
 inflatelib/patches/patch-test_cpp_WindowTests.cpp      | 15 +++++++++++++++
 7 files changed, 80 insertions(+), 9 deletions(-)

diffs:
diff --git a/inflatelib/Makefile b/inflatelib/Makefile
index 924355208a..46274c2ef8 100644
--- a/inflatelib/Makefile
+++ b/inflatelib/Makefile
@@ -10,17 +10,8 @@ HOMEPAGE=	https://github.com/microsoft/inflatelib/
 COMMENT=	Deflate/Deflate64 decompression library written in C
 LICENSE=	mit
 
-#WRKSRC=	${WRKDIR}/${DISTNAME}
-
 USE_LANGUAGES=	c c++
 
-#CMAKE_CONFIGURE_ARGS+=	-DINFLATELIB_TEST=OFF
-
-# upstream uses a vcpkg-specific header file
-# https://github.com/microsoft/inflatelib/issues/34
-pre-build:
-	echo '#include <catch2/catch_all.hpp>' > ${BUILDLINK_DIR}/include/catch.hpp
-
 .include "../../devel/cmake/build.mk"
 .include "../../devel/catch2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inflatelib/distinfo b/inflatelib/distinfo
index 7e6f4f59cc..5fd5aa5018 100644
--- a/inflatelib/distinfo
+++ b/inflatelib/distinfo
@@ -3,3 +3,8 @@ $NetBSD$
 BLAKE2s (inflatelib-0.3.0.tar.gz) = cfb916da8815cd367ed03d3cd418be5b5d705f38e3bca72a99609f83a1c79923
 SHA512 (inflatelib-0.3.0.tar.gz) = d097e0d19715cd3933e9936aa3fd661490d6471f4368fa27bc5e2abc4bed92fe09254a5bfa6d41274c555bf05e6d5dea89ad9f26704097b628b06f122188c0b3
 Size (inflatelib-0.3.0.tar.gz) = 1351303 bytes
+SHA1 (patch-test_cpp_BitstreamTests.cpp) = 7fa5dd5f26a93148cdf971dfed8adca19acd3fd0
+SHA1 (patch-test_cpp_CMakeLists.txt) = 7e8fcca0971ee238ae961c2e501e2d05974abdbc
+SHA1 (patch-test_cpp_HuffmanTreeTests.cpp) = 3fb622c2ee459279882b0680989287b3d9386be3
+SHA1 (patch-test_cpp_InflateTests.cpp) = b2c15d19f45d5f9f149b88ad1dfa69861c34e300
+SHA1 (patch-test_cpp_WindowTests.cpp) = e2b9647615316d5739af0d294a7c15844e6dc626
diff --git a/inflatelib/patches/patch-test_cpp_BitstreamTests.cpp b/inflatelib/patches/patch-test_cpp_BitstreamTests.cpp
new file mode 100644
index 0000000000..1faba17f85
--- /dev/null
+++ b/inflatelib/patches/patch-test_cpp_BitstreamTests.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+https://github.com/microsoft/inflatelib/pull/36
+
+--- test/cpp/BitstreamTests.cpp.orig	2026-08-21 23:40:16.000000000 +0000
++++ test/cpp/BitstreamTests.cpp
+@@ -6,7 +6,7 @@
+  *    TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+  *    PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  */
+-#include <catch.hpp>
++#include <catch2/catch_test_macros.hpp>
+ #include <span>
+ 
+ #include <bitstream.h>
diff --git a/inflatelib/patches/patch-test_cpp_CMakeLists.txt b/inflatelib/patches/patch-test_cpp_CMakeLists.txt
new file mode 100644
index 0000000000..c604408fd1
--- /dev/null
+++ b/inflatelib/patches/patch-test_cpp_CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD$
+
+https://github.com/microsoft/inflatelib/pull/36
+
+--- test/cpp/CMakeLists.txt.orig	2026-08-21 23:40:16.000000000 +0000
++++ test/cpp/CMakeLists.txt
+@@ -1,7 +1,7 @@ add_executable(cpptests)
+ 
+ add_executable(cpptests)
+ 
+-find_package(Catch2 CONFIG REQUIRED)
++find_package(Catch2 3.0 CONFIG REQUIRED)
+ target_link_libraries(cpptests
+     PRIVATE
+         inflatelib::inflatelib
diff --git a/inflatelib/patches/patch-test_cpp_HuffmanTreeTests.cpp b/inflatelib/patches/patch-test_cpp_HuffmanTreeTests.cpp
new file mode 100644
index 0000000000..57901d780e
--- /dev/null
+++ b/inflatelib/patches/patch-test_cpp_HuffmanTreeTests.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+https://github.com/microsoft/inflatelib/pull/36
+
+--- test/cpp/HuffmanTreeTests.cpp.orig	2026-08-21 23:40:16.000000000 +0000
++++ test/cpp/HuffmanTreeTests.cpp
+@@ -6,7 +6,7 @@
+  *    TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+  *    PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  */
+-#include <catch.hpp>
++#include <catch2/catch_test_macros.hpp>
+ #include <span>
+ 
+ #include <internal.h>
diff --git a/inflatelib/patches/patch-test_cpp_InflateTests.cpp b/inflatelib/patches/patch-test_cpp_InflateTests.cpp
new file mode 100644
index 0000000000..e102320733
--- /dev/null
+++ b/inflatelib/patches/patch-test_cpp_InflateTests.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+https://github.com/microsoft/inflatelib/pull/36
+
+--- test/cpp/InflateTests.cpp.orig	2026-08-21 23:40:16.000000000 +0000
++++ test/cpp/InflateTests.cpp
+@@ -6,7 +6,7 @@
+  *    TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+  *    PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  */
+-#include <catch.hpp>
++#include <catch2/catch_test_macros.hpp>
+ 
+ #define __STDC_WANT_LIB_EXT1__ 1 /* For fopen_s */
+ #include <cstdio>
diff --git a/inflatelib/patches/patch-test_cpp_WindowTests.cpp b/inflatelib/patches/patch-test_cpp_WindowTests.cpp
new file mode 100644
index 0000000000..9eded0e77c
--- /dev/null
+++ b/inflatelib/patches/patch-test_cpp_WindowTests.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+https://github.com/microsoft/inflatelib/pull/36
+
+--- test/cpp/WindowTests.cpp.orig	2026-08-21 23:40:16.000000000 +0000
++++ test/cpp/WindowTests.cpp
+@@ -6,7 +6,7 @@
+  *    TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+  *    PARTICULAR PURPOSE AND NONINFRINGEMENT.
+  */
+-#include <catch.hpp>
++#include <catch2/catch_test_macros.hpp>
+ #include <span>
+ 
+ #include <window.h>
Prev by Date: rust-beta: update to 1.100.0beta.10
Next by Date: crush: Update to 0.100.0
Previous by Thread: rust-beta: update to 1.100.0beta.10
Next by Thread: crush: Update to 0.100.0
Indexes:
Home | Main Index | Thread Index | Old Index