commit: dc3dfee2aba63e93ca6e6d9460f934650cd2893b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Feb 25 22:42:18 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Feb 28 21:34:32 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc3dfee2
net-im/biboumi: drop 9.0-r4 Bug: https://bugs.gentoo.org/968815 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> net-im/biboumi/Manifest | 2 - net-im/biboumi/biboumi-9.0-r4.ebuild | 129 --------- ...t-use-as-a-namespace-separator-with-expat.patch | 301 --------------------- .../files/biboumi-9.0-use-system-catch2.patch | 229 ---------------- 4 files changed, 661 deletions(-) diff --git a/net-im/biboumi/Manifest b/net-im/biboumi/Manifest index 94546b185d9f..da91b011340c 100644 --- a/net-im/biboumi/Manifest +++ b/net-im/biboumi/Manifest @@ -1,3 +1 @@ DIST biboumi-10.0_pre20260110.tar.gz 209704 BLAKE2B 4cf2775326740d1d36e8ace1148b0840ac4cf453b4c9d484b02c7a6c1038ddd79ce7616f9acb99c44d89ecdb41301957b68dcb46f8cc43d776df8faf1fb31164 SHA512 b83a74e6ea055d9fb2fe428153aafe7947ccbbe31ee29bd58ade9a2fc69befeadde98a52dbfe10a12380432cc186e968d3e8bfd3abfa2c5121e5ee77c8708447 -DIST biboumi-9.0-fix-missing-include.patch 663 BLAKE2B b81558e1b85bb7612e68e4e4723234e1fe51fd23a3941c59865ad94e922e095ddccc7a62d04ca73295fd0845a854010e98ac2aa6c67a63980b3e7ceb3a917375 SHA512 923f3333ae5bbaeccd0690a063e20206a18f1b7a65d829c6a04df52e7c2cc3549d0da592f0021538f080a119cb80390f8fc517d0d4c15d96fc76a1fb5fc32f84 -DIST biboumi-9.0.tar.xz 161192 BLAKE2B 27c19f5c44e23caae07bd579b01d663e73cd8b432203ac95ae77e651936eea7cc443f389e589acebe5b36c32e96f215fdf0a86c97193726d601b53b709a2d66e SHA512 cfaacd831b56031906922472275c55fd6f1a5307ebe54959d21e3799ad4612499e8beeb34e8736df9eabc9fec1a861d17567250d64f316ace47395fd6c8f3c18 diff --git a/net-im/biboumi/biboumi-9.0-r4.ebuild b/net-im/biboumi/biboumi-9.0-r4.ebuild deleted file mode 100644 index c0fc190a14c3..000000000000 --- a/net-im/biboumi/biboumi-9.0-r4.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 2020-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -MY_PV="${PV/_/-}" - -DESCRIPTION="XMPP gateway to IRC" -HOMEPAGE="https://biboumi.codeberg.page"; -SRC_URI=" - https://git.louiz.org/biboumi/snapshot/biboumi-${MY_PV}.tar.xz - https://lab.louiz.org/flow/biboumi/-/commit/f9d58a44871931ef9b60354fade6f8d7b24cc668.patch -> - ${PN}-9.0-fix-missing-include.patch -" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="amd64" -IUSE="+idn postgres +sqlite +ssl systemd test udns" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dev-libs/expat - virtual/libiconv - sys-apps/util-linux - sqlite? ( dev-db/sqlite:3 ) - postgres? ( dev-db/postgresql:* ) - idn? ( net-dns/libidn:= ) - udns? ( net-libs/udns ) - ssl? ( dev-libs/botan:2= ) - !ssl? ( dev-libs/libgcrypt ) - systemd? ( sys-apps/systemd:= ) -" -DEPEND=" - ${COMMON_DEPEND} - test? ( <dev-cpp/catch-3:0 ) -" -BDEPEND="dev-python/sphinx" -RDEPEND=" - ${COMMON_DEPEND} - acct-user/biboumi -" - -S="${WORKDIR}/${PN}-${MY_PV}" - -DOCS=( README.rst CHANGELOG.rst doc/user.rst ) - -PATCHES=( - "${FILESDIR}/${PN}-9.0-do-not-use-as-a-namespace-separator-with-expat.patch" - "${FILESDIR}/${PN}-9.0-use-system-catch2.patch" - "${DISTDIR}/${PN}-9.0-fix-missing-include.patch" -) - -src_configure() { - local mycmakeargs=( - -DSERVICE_USER="${PN}" - -DSERVICE_GROUP="${PN}" - ) - - # Account for biboumi's atypical configuration system. - if use systemd; then - mycmakeargs+=(-DWITH_SYSTEMD=yes) - else - mycmakeargs+=(-DWITHOUT_SYSTEMD=yes) - fi - - if use idn; then - mycmakeargs+=(-DWITH_LIBIDN=yes) - else - mycmakeargs+=(-DWITHOUT_LIBIDN=yes) - fi - - if use ssl; then - mycmakeargs+=(-DWITH_BOTAN=yes) - else - mycmakeargs+=(-DWITHOUT_BOTAN=yes) - fi - - if use udns; then - mycmakeargs+=(-DWITH_UDNS=yes) - else - mycmakeargs+=(-DWITHOUT_UDNS=yes) - fi - - if use sqlite; then - mycmakeargs+=(-DWITH_SQLITE3=yes) - else - mycmakeargs+=(-DWITHOUT_SQLITE3=yes) - fi - - if use postgres; then - mycmakeargs+=(-DWITH_POSTGRESQL=yes) - else - mycmakeargs+=(-DWITHOUT_POSTGRESQL=yes) - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - cmake_build man -} - -src_test() { - cmake_build check -} - -src_install() { - cmake_src_install - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" "${PN}" - - diropts --owner=biboumi --group=biboumi --mode=750 - if use sqlite; then - keepdir /var/lib/biboumi - fi - keepdir /var/log/biboumi - - insinto /etc/biboumi - insopts --group=biboumi --mode=640 - newins conf/biboumi.cfg biboumi.cfg.example -} diff --git a/net-im/biboumi/files/biboumi-9.0-do-not-use-as-a-namespace-separator-with-expat.patch b/net-im/biboumi/files/biboumi-9.0-do-not-use-as-a-namespace-separator-with-expat.patch deleted file mode 100644 index f82cbae81928..000000000000 --- a/net-im/biboumi/files/biboumi-9.0-do-not-use-as-a-namespace-separator-with-expat.patch +++ /dev/null @@ -1,301 +0,0 @@ -From 0061298dd0945f7f67e7fa340c6649b179c804d5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?louiz=E2=80=99?= <[email protected]> -Date: Thu, 10 Mar 2022 23:23:47 +0100 -Subject: [PATCH] Do not use ':' as a namespace separator with expat - -Instead use \1, and build our own nodes by explicitely separating the -namespace and the node name. ---- - src/xmpp/adhoc_command.cpp | 6 +++--- - src/xmpp/adhoc_commands_handler.cpp | 12 ++++++------ - src/xmpp/biboumi_adhoc_commands.cpp | 28 ++++++++++++++-------------- - src/xmpp/xmpp_component.cpp | 2 +- - src/xmpp/xmpp_parser.cpp | 2 +- - src/xmpp/xmpp_parser.hpp | 4 ++-- - src/xmpp/xmpp_stanza.cpp | 14 +++++++++++++- - src/xmpp/xmpp_stanza.hpp | 6 ++++++ - tests/xmpp.cpp | 2 ++ - 9 files changed, 48 insertions(+), 28 deletions(-) - -diff --git a/src/xmpp/adhoc_command.cpp b/src/xmpp/adhoc_command.cpp -index fbf4ce200b82..f8c8e4f146d6 100644 ---- a/src/xmpp/adhoc_command.cpp -+++ b/src/xmpp/adhoc_command.cpp -@@ -26,7 +26,7 @@ void PingStep1(XmppComponent&, AdhocSession&, XmlNode& command_node) - - void HelloStep1(XmppComponent&, AdhocSession&, XmlNode& command_node) - { -- XmlSubNode x(command_node, "jabber:x:data:x"); -+ XmlSubNode x(command_node, "jabber:x:data", "x"); - x["type"] = "form"; - XmlSubNode title(x, "title"); - title.set_inner("Configure your name."); -@@ -65,9 +65,9 @@ void HelloStep2(XmppComponent&, AdhocSession& session, XmlNode& command_node) - } - } - command_node.delete_all_children(); -- XmlSubNode error(command_node, ADHOC_NS":error"); -+ XmlSubNode error(command_node, ADHOC_NS, "error"); - error["type"] = "modify"; -- XmlSubNode condition(error, STANZA_NS":bad-request"); -+ XmlSubNode condition(error, STANZA_NS, "bad-request"); - session.terminate(); - } - -diff --git a/src/xmpp/adhoc_commands_handler.cpp b/src/xmpp/adhoc_commands_handler.cpp -index ff4c1e5506fb..7a84b2e11a45 100644 ---- a/src/xmpp/adhoc_commands_handler.cpp -+++ b/src/xmpp/adhoc_commands_handler.cpp -@@ -36,16 +36,16 @@ XmlNode AdhocCommandsHandler::handle_request(const std::string& executor_jid, co - auto command_it = this->commands.find(node); - if (command_it == this->commands.end()) - { -- XmlSubNode error(command_node, ADHOC_NS":error"); -+ XmlSubNode error(command_node, ADHOC_NS, "error"); - error["type"] = "cancel"; -- XmlSubNode condition(error, STANZA_NS":item-not-found"); -+ XmlSubNode condition(error, STANZA_NS, "item-not-found"); - } - else if (command_it->second.is_admin_only() && - !Config::is_in_list("admin", jid.bare())) - { -- XmlSubNode error(command_node, ADHOC_NS":error"); -+ XmlSubNode error(command_node, ADHOC_NS, "error"); - error["type"] = "cancel"; -- XmlSubNode condition(error, STANZA_NS":forbidden"); -+ XmlSubNode condition(error, STANZA_NS, "forbidden"); - } - else - { -@@ -94,9 +94,9 @@ XmlNode AdhocCommandsHandler::handle_request(const std::string& executor_jid, co - } - else // unsupported action - { -- XmlSubNode error(command_node, ADHOC_NS":error"); -+ XmlSubNode error(command_node, ADHOC_NS, "error"); - error["type"] = "modify"; -- XmlSubNode condition(error, STANZA_NS":bad-request"); -+ XmlSubNode condition(error, STANZA_NS, "bad-request"); - } - } - return command_node; -diff --git a/src/xmpp/biboumi_adhoc_commands.cpp b/src/xmpp/biboumi_adhoc_commands.cpp -index 792955c37ec7..aea316d64042 100644 ---- a/src/xmpp/biboumi_adhoc_commands.cpp -+++ b/src/xmpp/biboumi_adhoc_commands.cpp -@@ -34,7 +34,7 @@ void DisconnectUserStep1(XmppComponent& xmpp_component, AdhocSession&, XmlNode& - { - auto& biboumi_component = dynamic_cast<BiboumiComponent&>(xmpp_component); - -- XmlSubNode x(command_node, "jabber:x:data:x"); -+ XmlSubNode x(command_node, "jabber:x:data", "x"); - x["type"] = "form"; - XmlSubNode title(x, "title"); - title.set_inner("Disconnect a user from the gateway"); -@@ -108,9 +108,9 @@ void DisconnectUserStep2(XmppComponent& xmpp_component, AdhocSession& session, X - return; - } - } -- XmlSubNode error(command_node, ADHOC_NS":error"); -+ XmlSubNode error(command_node, ADHOC_NS, "error"); - error["type"] = "modify"; -- XmlSubNode condition(error, STANZA_NS":bad-request"); -+ XmlSubNode condition(error, STANZA_NS, "bad-request"); - session.terminate(); - } - -@@ -124,7 +124,7 @@ void ConfigureGlobalStep1(XmppComponent&, AdhocSession& session, XmlNode& comman - auto options = Database::get_global_options(owner.bare()); - - command_node.delete_all_children(); -- XmlSubNode x(command_node, "jabber:x:data:x"); -+ XmlSubNode x(command_node, "jabber:x:data", "x"); - x["type"] = "form"; - XmlSubNode title(x, "title"); - title.set_inner("Configure some global default settings."); -@@ -220,9 +220,9 @@ void ConfigureGlobalStep2(XmppComponent& xmpp_component, AdhocSession& session, - note.set_inner("Configuration successfully applied."); - return; - } -- XmlSubNode error(command_node, ADHOC_NS":error"); -+ XmlSubNode error(command_node, ADHOC_NS, "error"); - error["type"] = "modify"; -- XmlSubNode condition(error, STANZA_NS":bad-request"); -+ XmlSubNode condition(error, STANZA_NS, "bad-request"); - session.terminate(); - } - -@@ -238,7 +238,7 @@ void ConfigureIrcServerStep1(XmppComponent&, AdhocSession& session, XmlNode& com - auto commands = Database::get_after_connection_commands(options); - - command_node.delete_all_children(); -- XmlSubNode x(command_node, "jabber:x:data:x"); -+ XmlSubNode x(command_node, "jabber:x:data", "x"); - x["type"] = "form"; - XmlSubNode title(x, "title"); - title.set_inner("Configure the IRC server " + server_domain); -@@ -565,9 +565,9 @@ void ConfigureIrcServerStep2(XmppComponent& xmpp_component, AdhocSession& sessio - note.set_inner("Configuration successfully applied."); - return; - } -- XmlSubNode error(command_node, ADHOC_NS":error"); -+ XmlSubNode error(command_node, ADHOC_NS, "error"); - error["type"] = "modify"; -- XmlSubNode condition(error, STANZA_NS":bad-request"); -+ XmlSubNode condition(error, STANZA_NS, "bad-request"); - session.terminate(); - } - -@@ -586,7 +586,7 @@ void insert_irc_channel_configuration_form(XmlNode& node, const Jid& requester, - auto options = Database::get_irc_channel_options_with_server_default(requester.local + "@" + requester.domain, - iid.get_server(), iid.get_local()); - node.delete_all_children(); -- XmlSubNode x(node, "jabber:x:data:x"); -+ XmlSubNode x(node, "jabber:x:data", "x"); - x["type"] = "form"; - XmlSubNode title(x, "title"); - title.set_inner("Configure the IRC channel " + iid.get_local() + " on server " + iid.get_server()); -@@ -671,9 +671,9 @@ void ConfigureIrcChannelStep2(XmppComponent& xmpp_component, AdhocSession& sessi - } - else - { -- XmlSubNode error(command_node, ADHOC_NS":error"); -+ XmlSubNode error(command_node, ADHOC_NS, "error"); - error["type"] = "modify"; -- XmlSubNode condition(error, STANZA_NS":bad-request"); -+ XmlSubNode condition(error, STANZA_NS, "bad-request"); - session.terminate(); - } - } -@@ -749,7 +749,7 @@ void DisconnectUserFromServerStep1(XmppComponent& xmpp_component, AdhocSession& - { // Send a form to select the user to disconnect - auto& biboumi_component = dynamic_cast<BiboumiComponent&>(xmpp_component); - -- XmlSubNode x(command_node, "jabber:x:data:x"); -+ XmlSubNode x(command_node, "jabber:x:data", "x"); - x["type"] = "form"; - XmlSubNode title(x, "title"); - title.set_inner("Disconnect a user from selected IRC servers"); -@@ -794,7 +794,7 @@ void DisconnectUserFromServerStep2(XmppComponent& xmpp_component, AdhocSession& - command_node.delete_all_children(); - auto& biboumi_component = dynamic_cast<BiboumiComponent&>(xmpp_component); - -- XmlSubNode x(command_node, "jabber:x:data:x"); -+ XmlSubNode x(command_node, "jabber:x:data", "x"); - x["type"] = "form"; - XmlSubNode title(x, "title"); - title.set_inner("Disconnect a user from selected IRC servers"); -diff --git a/src/xmpp/xmpp_component.cpp b/src/xmpp/xmpp_component.cpp -index de9a7a631be6..62a98ce3bb2c 100644 ---- a/src/xmpp/xmpp_component.cpp -+++ b/src/xmpp/xmpp_component.cpp -@@ -175,7 +175,7 @@ void XmppComponent::on_stanza(const Stanza& stanza) - - void XmppComponent::send_stream_error(const std::string& name, const std::string& explanation) - { -- Stanza node("stream:error"); -+ Stanza node("stream", "error"); - { - XmlSubNode error(node, name); - error["xmlns"] = STREAM_NS; -diff --git a/src/xmpp/xmpp_parser.cpp b/src/xmpp/xmpp_parser.cpp -index 781fe4cd94b0..1f25fa6f982b 100644 ---- a/src/xmpp/xmpp_parser.cpp -+++ b/src/xmpp/xmpp_parser.cpp -@@ -38,7 +38,7 @@ XmppParser::XmppParser(): - void XmppParser::init_xml_parser() - { - // Create the expat parser -- this->parser = XML_ParserCreateNS("UTF-8", ':'); -+ this->parser = XML_ParserCreateNS("UTF-8", '\1'); - XML_SetUserData(this->parser, static_cast<void*>(this)); - - // Install Expat handlers -diff --git a/src/xmpp/xmpp_parser.hpp b/src/xmpp/xmpp_parser.hpp -index ec42f9a326e1..1e5e4e55a875 100644 ---- a/src/xmpp/xmpp_parser.hpp -+++ b/src/xmpp/xmpp_parser.hpp -@@ -18,9 +18,9 @@ - * stanza is reasonnably short. - * - * The element names generated by expat contain the namespace of the -- * element, a colon (':') and then the actual name of the element. To get -+ * element, a \1 separator and then the actual name of the element. To get - * an element "x" with a namespace of "http://jabber.org/protocol/muc";, you -- * just look for an XmlNode named "http://jabber.org/protocol/muc:x"; -+ * just look for an XmlNode named "http://jabber.org/protocol/muc\1x"; - * - * TODO: enforce the size-limit for the stanza (limit the number of childs - * it can contain). For example forbid the parser going further than level -diff --git a/src/xmpp/xmpp_stanza.cpp b/src/xmpp/xmpp_stanza.cpp -index 435f33313b09..0103dd71a357 100644 ---- a/src/xmpp/xmpp_stanza.cpp -+++ b/src/xmpp/xmpp_stanza.cpp -@@ -52,7 +52,7 @@ XmlNode::XmlNode(const std::string& name, XmlNode* parent): - parent(parent) - { - // split the namespace and the name -- auto n = name.rfind(':'); -+ auto n = name.rfind('\1'); - if (n == std::string::npos) - this->name = name; - else -@@ -67,6 +67,18 @@ XmlNode::XmlNode(const std::string& name): - { - } - -+XmlNode::XmlNode(const std::string& xmlns, const std::string& name, XmlNode* parent): -+ name(name), -+ parent(parent) -+{ -+ this->attributes["xmlns"] = xmlns; -+} -+ -+XmlNode::XmlNode(const std::string& xmlns, const std::string& name): -+ XmlNode(xmlns, name, nullptr) -+{ -+} -+ - void XmlNode::delete_all_children() - { - this->children.clear(); -diff --git a/src/xmpp/xmpp_stanza.hpp b/src/xmpp/xmpp_stanza.hpp -index f4b394814e5b..a706337baca0 100644 ---- a/src/xmpp/xmpp_stanza.hpp -+++ b/src/xmpp/xmpp_stanza.hpp -@@ -25,6 +25,8 @@ class XmlNode - public: - explicit XmlNode(const std::string& name, XmlNode* parent); - explicit XmlNode(const std::string& name); -+ explicit XmlNode(const std::string& xmlns, const std::string& name, XmlNode* parent); -+ explicit XmlNode(const std::string& xmlns, const std::string& name); - /** - * The copy constructor does not copy the parent attribute. The children - * nodes are all copied recursively. -@@ -150,6 +152,10 @@ public: - XmlNode(name), - parent_to_add(parent_ref) - {} -+ XmlSubNode(XmlNode& parent_ref, const std::string& xmlns, const std::string& name): -+ XmlNode(xmlns, name), -+ parent_to_add(parent_ref) -+ {} - - ~XmlSubNode() - { -diff --git a/tests/xmpp.cpp b/tests/xmpp.cpp -index 14c51daa460f..c49c2fda94ea 100644 ---- a/tests/xmpp.cpp -+++ b/tests/xmpp.cpp -@@ -67,6 +67,8 @@ TEST_CASE("substanzas") - CHECK(!d.has_children()); - } - CHECK(b.has_children()); -+ XmlSubNode e(a, "namespace", "name"); -+ CHECK(e.get_tag("xmlns") == "namespace"); - } - CHECK(a.has_children()); - } --- -2.34.1 - diff --git a/net-im/biboumi/files/biboumi-9.0-use-system-catch2.patch b/net-im/biboumi/files/biboumi-9.0-use-system-catch2.patch deleted file mode 100644 index edda7a37c50b..000000000000 --- a/net-im/biboumi/files/biboumi-9.0-use-system-catch2.patch +++ /dev/null @@ -1,229 +0,0 @@ -From 414ab9e13fc9e9fa79f7f0a8e1b4a46cd3bd92fd Mon Sep 17 00:00:00 2001 -From: Florian Schmaus <[email protected]> -Date: Sun, 27 Feb 2022 11:06:42 +0100 -Subject: [PATCH] Use the system installation of catch2 if possible - ---- - CMakeLists.txt | 41 ++++++++++++++++++++++++----------------- - tests/colors.cpp | 2 +- - tests/config.cpp | 2 +- - tests/database.cpp | 2 +- - tests/encoding.cpp | 2 +- - tests/iid.cpp | 2 +- - tests/io_tester.cpp | 2 +- - tests/irc.cpp | 2 +- - tests/jid.cpp | 2 +- - tests/logger.cpp | 2 +- - tests/network.cpp | 2 +- - tests/test.cpp | 2 +- - tests/timed_events.cpp | 2 +- - tests/utils.cpp | 2 +- - tests/uuid.cpp | 2 +- - tests/xmpp.cpp | 2 +- - 16 files changed, 39 insertions(+), 32 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f07b97feb57b..8175012fe070 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -288,24 +288,31 @@ foreach(file ${source_all}) - endforeach() - - # --## Add a rule to download the catch unit test framework -+## Catch unit test framework - # --include(ExternalProject) --ExternalProject_Add(catch -- GIT_REPOSITORY "https://lab.louiz.org/louiz/Catch.git"; -- PREFIX "external" -- UPDATE_COMMAND "" -- CONFIGURE_COMMAND "" -- BUILD_COMMAND "" -- INSTALL_COMMAND "" -- ) --set_target_properties(catch PROPERTIES EXCLUDE_FROM_ALL TRUE) --ExternalProject_Get_Property(catch SOURCE_DIR) --if(NOT EXISTS ${CMAKE_SOURCE_DIR}/tests/catch.hpp) -- target_include_directories(test_suite -- PUBLIC "${SOURCE_DIR}/single_include/" -- ) -- add_dependencies(test_suite catch) -+find_package(Catch2 2.2.1) -+if(Catch2_FOUND) -+ target_link_libraries(test_suite Catch2::Catch2) -+else() -+ # No system-wide installation of the catch unit test framework was -+ # found, download it. -+ include(ExternalProject) -+ ExternalProject_Add(catch -+ GIT_REPOSITORY "https://lab.louiz.org/louiz/Catch.git"; -+ PREFIX "external" -+ UPDATE_COMMAND "" -+ CONFIGURE_COMMAND "" -+ BUILD_COMMAND "" -+ INSTALL_COMMAND "" -+ ) -+ set_target_properties(catch PROPERTIES EXCLUDE_FROM_ALL TRUE) -+ ExternalProject_Get_Property(catch SOURCE_DIR) -+ if(NOT EXISTS ${CMAKE_SOURCE_DIR}/tests/catch.hpp) -+ target_include_directories(test_suite -+ PUBLIC "${SOURCE_DIR}/single_include/" -+ ) -+ add_dependencies(test_suite catch) -+ endif() - endif() - - # -diff --git a/tests/colors.cpp b/tests/colors.cpp -index bf529896dce7..a9761dfff648 100644 ---- a/tests/colors.cpp -+++ b/tests/colors.cpp -@@ -1,4 +1,4 @@ --#include "catch.hpp" -+#include "catch2/catch.hpp" - - #include <bridge/colors.hpp> - #include <xmpp/xmpp_stanza.hpp> -diff --git a/tests/config.cpp b/tests/config.cpp -index ec9844fbd5f6..76cfe92e3e51 100644 ---- a/tests/config.cpp -+++ b/tests/config.cpp -@@ -1,4 +1,4 @@ --#include "catch.hpp" -+#include "catch2/catch.hpp" - #include "io_tester.hpp" - - #include <iostream> -diff --git a/tests/database.cpp b/tests/database.cpp -index 070a46013997..bf6bc20324cb 100644 ---- a/tests/database.cpp -+++ b/tests/database.cpp -@@ -1,4 +1,4 @@ --#include "catch.hpp" -+#include "catch2/catch.hpp" - - #include <biboumi.h> - -diff --git a/tests/encoding.cpp b/tests/encoding.cpp -index b5192ffbdb8d..8129abc9230e 100644 ---- a/tests/encoding.cpp -+++ b/tests/encoding.cpp -@@ -1,4 +1,4 @@ --#include "catch.hpp" -+#include "catch2/catch.hpp" - - #include <utils/encoding.hpp> - -diff --git a/tests/iid.cpp b/tests/iid.cpp -index 63b2ba38ca55..7e61f35e348b 100644 ---- a/tests/iid.cpp -+++ b/tests/iid.cpp -@@ -1,4 +1,4 @@ --#include "catch.hpp" -+#include "catch2/catch.hpp" - - #include <irc/iid.hpp> - #include <irc/irc_user.hpp> -diff --git a/tests/io_tester.cpp b/tests/io_tester.cpp -index 19c97c91aff8..34f89fdac603 100644 ---- a/tests/io_tester.cpp -+++ b/tests/io_tester.cpp -@@ -1,5 +1,5 @@ - #include "io_tester.hpp" --#include "catch.hpp" -+#include "catch2/catch.hpp" - #include <iostream> - - /** -diff --git a/tests/irc.cpp b/tests/irc.cpp -index 0f30f15e2fdf..cb53e3f226ff 100644 ---- a/tests/irc.cpp -+++ b/tests/irc.cpp -@@ -1,4 +1,4 @@ --#include "catch.hpp" -+#include "catch2/catch.hpp" - - #include <irc/irc_message.hpp> - -diff --git a/tests/jid.cpp b/tests/jid.cpp -index 592d6f3d0b78..516f961fabbb 100644 ---- a/tests/jid.cpp -+++ b/tests/jid.cpp -@@ -1,4 +1,4 @@ --#include "catch.hpp" -+#include "catch2/catch.hpp" - - #include <xmpp/jid.hpp> - #include <biboumi.h> -diff --git a/tests/logger.cpp b/tests/logger.cpp -index 1e3392a4bd43..b4736da3648d 100644 ---- a/tests/logger.cpp -+++ b/tests/logger.cpp -@@ -1,4 +1,4 @@ --#include "catch.hpp" -+#include "catch2/catch.hpp" - - #include <logger/logger.hpp> - #include <config/config.hpp> -diff --git a/tests/network.cpp b/tests/network.cpp -index a52eb6acfef8..790190f8d0bf 100644 ---- a/tests/network.cpp -+++ b/tests/network.cpp -@@ -1,4 +1,4 @@ --#include "catch.hpp" -+#include "catch2/catch.hpp" - #include <network/tls_policy.hpp> - #include <sstream> - -diff --git a/tests/test.cpp b/tests/test.cpp -index 0c7c351f437f..62bf7476a189 100644 ---- a/tests/test.cpp -+++ b/tests/test.cpp -@@ -1,2 +1,2 @@ - #define CATCH_CONFIG_MAIN --#include "catch.hpp" -+#include "catch2/catch.hpp" -diff --git a/tests/timed_events.cpp b/tests/timed_events.cpp -index fece422e99d5..6eaf99b3e1b9 100644 ---- a/tests/timed_events.cpp -+++ b/tests/timed_events.cpp -@@ -1,4 +1,4 @@ --#include "catch.hpp" -+#include "catch2/catch.hpp" - - #include <utils/timed_events.hpp> - -diff --git a/tests/utils.cpp b/tests/utils.cpp -index 6151733e7cf4..22b45cf3113b 100644 ---- a/tests/utils.cpp -+++ b/tests/utils.cpp -@@ -1,4 +1,4 @@ --#include "catch.hpp" -+#include "catch2/catch.hpp" - - #include <utils/tolower.hpp> - #include <utils/revstr.hpp> -diff --git a/tests/uuid.cpp b/tests/uuid.cpp -index 12c6c32adbeb..7720e3aaee30 100644 ---- a/tests/uuid.cpp -+++ b/tests/uuid.cpp -@@ -1,4 +1,4 @@ --#include "catch.hpp" -+#include "catch2/catch.hpp" - - #include <xmpp/xmpp_component.hpp> - -diff --git a/tests/xmpp.cpp b/tests/xmpp.cpp -index 14c51daa460f..01508a63481d 100644 ---- a/tests/xmpp.cpp -+++ b/tests/xmpp.cpp -@@ -1,4 +1,4 @@ --#include "catch.hpp" -+#include "catch2/catch.hpp" - - #include <xmpp/xmpp_parser.hpp> - #include <xmpp/auth.hpp> --- -2.34.1 -
