commit: f3bc4636bb78dc58dfb46b805874834a60f11794 Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Tue Feb 10 08:21:34 2026 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Tue Feb 10 08:32:18 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3bc4636
net-im/biboumi: fix cmake2 v3 detection Closes: https://bugs.gentoo.org/969522 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> net-im/biboumi/biboumi-10.0_pre20260110.ebuild | 5 +++ ...ke-Explicitly-search-for-Catch2-version-3.patch | 36 ++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/net-im/biboumi/biboumi-10.0_pre20260110.ebuild b/net-im/biboumi/biboumi-10.0_pre20260110.ebuild index 6997da380540..7d576e2d4eb9 100644 --- a/net-im/biboumi/biboumi-10.0_pre20260110.ebuild +++ b/net-im/biboumi/biboumi-10.0_pre20260110.ebuild @@ -46,6 +46,11 @@ RDEPEND=" DOCS=( README.rst CHANGELOG.rst doc/user.rst ) +PATCHES=( + # https://codeberg.org/poezio/biboumi/pulls/3540/ + "${FILESDIR}"/biboumi-10-cmake-Explicitly-search-for-Catch2-version-3.patch +) + src_configure() { local mycmakeargs=( -DSERVICE_USER="${PN}" diff --git a/net-im/biboumi/files/biboumi-10-cmake-Explicitly-search-for-Catch2-version-3.patch b/net-im/biboumi/files/biboumi-10-cmake-Explicitly-search-for-Catch2-version-3.patch new file mode 100644 index 000000000000..96c8cf68b90e --- /dev/null +++ b/net-im/biboumi/files/biboumi-10-cmake-Explicitly-search-for-Catch2-version-3.patch @@ -0,0 +1,36 @@ +From 3d321c7d92bd1c42007b50929ccc9b492b921dec Mon Sep 17 00:00:00 2001 +From: Florian Schmaus <[email protected]> +Date: Tue, 10 Feb 2026 08:53:34 +0100 +Subject: [PATCH] cmake: Explicitly search for Catch2 version 3 + +The current CMakeLists block + +find_package(Catch2) +if(Catch2_FOUND) + target_link_libraries(test_suite Catch2::Catch2WithMain) + include(CTest) + include(Catch) + catch_discover_tests(test_suite) +endif() + +would search for any Catch2 version, but later tries to link against +Catch2 version 3 (Catch2WithMain). This means the block would fail on +systems that have Catch2 version 2 installed, but not Catch2 version +3. Fix that by requesting Catch2 version 3 when invoking +find_package(). + +Link: https://bugs.gentoo.org/969522 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -296,7 +296,7 @@ endforeach() + # + ## Catch unit test framework + # +-find_package(Catch2) ++find_package(Catch2 3) + if(Catch2_FOUND) + target_link_libraries(test_suite Catch2::Catch2WithMain) + include(CTest) +-- +2.52.0 +
