Description: Revert Catch2 v3 switch Debian won't be packaging Catch2 version 3 for the time being, according to . I think that's a shame, but whatever. This patch reverts upstream commit d0fe27708edf976f1aad25064a2dcdc6cb887ec1 Author: Andrea Pappacoda Forwarded: not-needed Last-Update: 2023-01-23 --- yuzu-0-1317+ds.orig/CMakeLists.txt +++ yuzu-0-1317+ds/CMakeLists.txt @@ -244,7 +244,7 @@ if (ENABLE_WEB_SERVICE) endif() if (YUZU_TESTS) - find_package(Catch2 3.0.1 REQUIRED) + find_package(Catch2 2.13 REQUIRED) endif() find_package(Boost 1.73.0 COMPONENTS context) --- yuzu-0-1317+ds.orig/src/tests/common/bit_field.cpp +++ yuzu-0-1317+ds/src/tests/common/bit_field.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include "common/bit_field.h" TEST_CASE("BitField", "[common]") { --- yuzu-0-1317+ds.orig/src/tests/common/cityhash.cpp +++ yuzu-0-1317+ds/src/tests/common/cityhash.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include +#include #include "common/cityhash.h" --- yuzu-0-1317+ds.orig/src/tests/common/fibers.cpp +++ yuzu-0-1317+ds/src/tests/common/fibers.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include "common/common_types.h" #include "common/fiber.h" --- yuzu-0-1317+ds.orig/src/tests/common/host_memory.cpp +++ yuzu-0-1317+ds/src/tests/common/host_memory.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include +#include #include "common/host_memory.h" #include "common/literals.h" --- yuzu-0-1317+ds.orig/src/tests/common/param_package.cpp +++ yuzu-0-1317+ds/src/tests/common/param_package.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2017 Citra Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include +#include #include #include "common/logging/backend.h" #include "common/param_package.h" --- yuzu-0-1317+ds.orig/src/tests/common/range_map.cpp +++ yuzu-0-1317+ds/src/tests/common/range_map.cpp @@ -3,7 +3,7 @@ #include -#include +#include #include "common/range_map.h" --- yuzu-0-1317+ds.orig/src/tests/common/ring_buffer.cpp +++ yuzu-0-1317+ds/src/tests/common/ring_buffer.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include "common/ring_buffer.h" namespace Common { --- yuzu-0-1317+ds.orig/src/tests/common/scratch_buffer.cpp +++ yuzu-0-1317+ds/src/tests/common/scratch_buffer.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include "common/common_types.h" #include "common/scratch_buffer.h" --- yuzu-0-1317+ds.orig/src/tests/common/unique_function.cpp +++ yuzu-0-1317+ds/src/tests/common/unique_function.cpp @@ -3,7 +3,7 @@ #include -#include +#include #include "common/unique_function.h" --- yuzu-0-1317+ds.orig/src/tests/core/core_timing.cpp +++ yuzu-0-1317+ds/src/tests/core/core_timing.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2016 Dolphin Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include +#include #include #include --- yuzu-0-1317+ds.orig/src/tests/core/internal_network/network.cpp +++ yuzu-0-1317+ds/src/tests/core/internal_network/network.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#include +#include #include "core/internal_network/network.h" #include "core/internal_network/sockets.h" --- yuzu-0-1317+ds.orig/src/tests/input_common/calibration_configuration_job.cpp +++ yuzu-0-1317+ds/src/tests/input_common/calibration_configuration_job.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include "input_common/drivers/udp_client.h" #include "input_common/helpers/udp_protocol.h" --- yuzu-0-1317+ds.orig/src/tests/video_core/buffer_base.cpp +++ yuzu-0-1317+ds/src/tests/video_core/buffer_base.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include "common/alignment.h" #include "common/common_types.h"