From: Renato Aguiar Subject: cad/prusaslicer: reduce number of patches To: OpenBSD ports Cc: Ian Darwin , Johannes Thyssen Tishman Date: Tue, 20 Feb 2024 20:38:55 -0800 Significantly reduce number of patches in cad/prusaslicer by consolidating most of the changes needed in tests for supporting catch2 v3 in a new header (tests/catch2/catch.hpp) that was originally imported by all tests. diff -NPru -x CVS /usr/ports/cad/prusaslicer/Makefile ./Makefile --- /usr/ports/cad/prusaslicer/Makefile Sat Feb 10 09:15:16 2024 +++ ./Makefile Tue Feb 20 20:23:18 2024 @@ -4,7 +4,7 @@ V = 2.7.1 PKGNAME = prusaslicer-${V} -REVISION = 0 +REVISION = 1 GH_ACCOUNT = prusa3d GH_PROJECT = PrusaSlicer diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_arrange_test_arrange_cpp ./patches/patch-tests_arrange_test_arrange_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_arrange_test_arrange_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_arrange_test_arrange_cpp Wed Dec 31 16:00:00 1969 @@ -1,18 +0,0 @@ -Index: tests/arrange/test_arrange.cpp ---- tests/arrange/test_arrange.cpp.orig -+++ tests/arrange/test_arrange.cpp -@@ -1,4 +1,4 @@ --#include -+#include - #include "test_utils.hpp" - - #include -@@ -39,6 +39,8 @@ - #include - - #include -+ -+using Catch::Approx; - - template - static std::vector prusa_parts(double infl = 0.) { diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_arrange_test_arrange_integration_cpp ./patches/patch-tests_arrange_test_arrange_integration_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_arrange_test_arrange_integration_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_arrange_test_arrange_integration_cpp Wed Dec 31 16:00:00 1969 @@ -1,18 +0,0 @@ -Index: tests/arrange/test_arrange_integration.cpp ---- tests/arrange/test_arrange_integration.cpp.orig -+++ tests/arrange/test_arrange_integration.cpp -@@ -1,4 +1,4 @@ --#include -+#include - #include "test_utils.hpp" - - #include -@@ -11,6 +11,8 @@ - #include "libslic3r/Geometry/ConvexHull.hpp" - #include "libslic3r/Format/3mf.hpp" - #include "libslic3r/ModelArrange.hpp" -+ -+using Catch::Approx; - - static Slic3r::Model get_example_model_with_20mm_cube() - { diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_catch2_catch_hpp ./patches/patch-tests_catch2_catch_hpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_catch2_catch_hpp Wed Dec 31 16:00:00 1969 +++ ./patches/patch-tests_catch2_catch_hpp Tue Feb 20 19:27:47 2024 @@ -0,0 +1,18 @@ +Index: tests/catch2/catch.hpp +--- tests/catch2/catch.hpp.orig ++++ tests/catch2/catch.hpp +@@ -0,0 +1,14 @@ ++#ifndef __OPENBSD_PORT_COMPAT_CATCH2__ ++#define __OPENBSD_PORT_COMPAT_CATCH2__ ++ ++#include ++#include ++ ++using Catch::Approx; ++ ++namespace Catch { ++ using Catch::Matchers::Equals; ++ using Catch::Matchers::MatcherBase; ++}; ++ ++#endif // __OPENBSD_PORT_COMPAT_CATCH2__ diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_avoid_crossing_perimeters_cpp ./patches/patch-tests_fff_print_test_avoid_crossing_perimeters_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_avoid_crossing_perimeters_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_avoid_crossing_perimeters_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/fff_print/test_avoid_crossing_perimeters.cpp ---- tests/fff_print/test_avoid_crossing_perimeters.cpp.orig -+++ tests/fff_print/test_avoid_crossing_perimeters.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "test_data.hpp" - diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_bridges_cpp ./patches/patch-tests_fff_print_test_bridges_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_bridges_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_bridges_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/fff_print/test_bridges.cpp ---- tests/fff_print/test_bridges.cpp.orig -+++ tests/fff_print/test_bridges.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include - #include diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_clipper_cpp ./patches/patch-tests_fff_print_test_clipper_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_clipper_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_clipper_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/fff_print/test_clipper.cpp ---- tests/fff_print/test_clipper.cpp.orig -+++ tests/fff_print/test_clipper.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "test_data.hpp" - #include "libslic3r/ClipperZUtils.hpp" diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_cooling_cpp ./patches/patch-tests_fff_print_test_cooling_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_cooling_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_cooling_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/fff_print/test_cooling.cpp ---- tests/fff_print/test_cooling.cpp.orig -+++ tests/fff_print/test_cooling.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include - #include diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_custom_gcode_cpp ./patches/patch-tests_fff_print_test_custom_gcode_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_custom_gcode_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_custom_gcode_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/fff_print/test_custom_gcode.cpp ---- tests/fff_print/test_custom_gcode.cpp.orig -+++ tests/fff_print/test_custom_gcode.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include - #include diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_data_cpp ./patches/patch-tests_fff_print_test_data_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_data_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_data_cpp Wed Dec 31 16:00:00 1969 @@ -1,12 +0,0 @@ -Index: tests/fff_print/test_data.cpp ---- tests/fff_print/test_data.cpp.orig -+++ tests/fff_print/test_data.cpp -@@ -389,7 +389,7 @@ bool contains_regex(const std::string &data, const std - - } } // namespace Slic3r::Test - --#include -+#include - - SCENARIO("init_print functionality", "[test_data]") { - GIVEN("A default config") { diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_extrusion_entity_cpp ./patches/patch-tests_fff_print_test_extrusion_entity_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_extrusion_entity_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_extrusion_entity_cpp Wed Dec 31 16:00:00 1969 @@ -1,17 +0,0 @@ -Index: tests/fff_print/test_extrusion_entity.cpp ---- tests/fff_print/test_extrusion_entity.cpp.orig -+++ tests/fff_print/test_extrusion_entity.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include - -@@ -10,6 +10,7 @@ - - #include "test_data.hpp" - -+using Catch::Approx; - using namespace Slic3r; - - static inline Slic3r::Point random_point(float LO=-50, float HI=50) diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_fill_cpp ./patches/patch-tests_fff_print_test_fill_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_fill_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_fill_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/fff_print/test_fill.cpp ---- tests/fff_print/test_fill.cpp.orig -+++ tests/fff_print/test_fill.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include - #include diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_flow_cpp ./patches/patch-tests_fff_print_test_flow_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_flow_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_flow_cpp Wed Dec 31 16:00:00 1969 @@ -1,17 +0,0 @@ -Index: tests/fff_print/test_flow.cpp ---- tests/fff_print/test_flow.cpp.orig -+++ tests/fff_print/test_flow.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include - #include -@@ -10,6 +10,7 @@ - #include "libslic3r/Flow.hpp" - #include "libslic3r/libslic3r.h" - -+using Catch::Approx; - using namespace Slic3r::Test; - using namespace Slic3r; - diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_gaps_cpp ./patches/patch-tests_fff_print_test_gaps_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_gaps_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_gaps_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/fff_print/test_gaps.cpp ---- tests/fff_print/test_gaps.cpp.orig -+++ tests/fff_print/test_gaps.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/GCodeReader.hpp" - #include "libslic3r/Geometry/ConvexHull.hpp" diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_gcode_cpp ./patches/patch-tests_fff_print_test_gcode_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_gcode_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_gcode_cpp Wed Dec 31 16:00:00 1969 @@ -1,24 +0,0 @@ -Index: tests/fff_print/test_gcode.cpp ---- tests/fff_print/test_gcode.cpp.orig -+++ tests/fff_print/test_gcode.cpp -@@ -1,9 +1,10 @@ --#include -+#include - - #include - - #include "libslic3r/GCode.hpp" - -+using Catch::Approx; - using namespace Slic3r; - using namespace Slic3r::GCode::Impl; - -@@ -22,7 +23,7 @@ SCENARIO("Origin manipulation", "[GCode]") { - } - } - --struct ApproxEqualsPoints : public Catch::MatcherBase { -+struct ApproxEqualsPoints : public Catch::Matchers::MatcherBase { - ApproxEqualsPoints(const Points& expected, unsigned tolerance): expected(expected), tolerance(tolerance) {} - bool match(const Points& points) const override { - if (points.size() != expected.size()) { diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_gcodefindreplace_cpp ./patches/patch-tests_fff_print_test_gcodefindreplace_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_gcodefindreplace_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_gcodefindreplace_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/fff_print/test_gcodefindreplace.cpp ---- tests/fff_print/test_gcodefindreplace.cpp.orig -+++ tests/fff_print/test_gcodefindreplace.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include - diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_gcodewriter_cpp ./patches/patch-tests_fff_print_test_gcodewriter_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_gcodewriter_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_gcodewriter_cpp Wed Dec 31 16:00:00 1969 @@ -1,36 +0,0 @@ -Index: tests/fff_print/test_gcodewriter.cpp ---- tests/fff_print/test_gcodewriter.cpp.orig -+++ tests/fff_print/test_gcodewriter.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include - -@@ -12,22 +12,22 @@ SCENARIO("set_speed emits values with fixed-point outp - GCodeWriter writer; - WHEN("set_speed is called to set speed to 99999.123") { - THEN("Output string is G1 F99999.123") { -- REQUIRE_THAT(writer.set_speed(99999.123), Catch::Equals("G1 F99999.123\n")); -+ REQUIRE_THAT(writer.set_speed(99999.123), Catch::Matchers::Equals("G1 F99999.123\n")); - } - } - WHEN("set_speed is called to set speed to 1") { - THEN("Output string is G1 F1") { -- REQUIRE_THAT(writer.set_speed(1.0), Catch::Equals("G1 F1\n")); -+ REQUIRE_THAT(writer.set_speed(1.0), Catch::Matchers::Equals("G1 F1\n")); - } - } - WHEN("set_speed is called to set speed to 203.200022") { - THEN("Output string is G1 F203.2") { -- REQUIRE_THAT(writer.set_speed(203.200022), Catch::Equals("G1 F203.2\n")); -+ REQUIRE_THAT(writer.set_speed(203.200022), Catch::Matchers::Equals("G1 F203.2\n")); - } - } - WHEN("set_speed is called to set speed to 203.200522") { - THEN("Output string is G1 F203.201") { -- REQUIRE_THAT(writer.set_speed(203.200522), Catch::Equals("G1 F203.201\n")); -+ REQUIRE_THAT(writer.set_speed(203.200522), Catch::Matchers::Equals("G1 F203.201\n")); - } - } - } diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_model_cpp ./patches/patch-tests_fff_print_test_model_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_model_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_model_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/fff_print/test_model.cpp ---- tests/fff_print/test_model.cpp.orig -+++ tests/fff_print/test_model.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/libslic3r.h" - #include "libslic3r/Model.hpp" diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_multi_cpp ./patches/patch-tests_fff_print_test_multi_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_multi_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_multi_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/fff_print/test_multi.cpp ---- tests/fff_print/test_multi.cpp.orig -+++ tests/fff_print/test_multi.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include - #include diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_perimeters_cpp ./patches/patch-tests_fff_print_test_perimeters_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_perimeters_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_perimeters_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/fff_print/test_perimeters.cpp ---- tests/fff_print/test_perimeters.cpp.orig -+++ tests/fff_print/test_perimeters.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include - #include diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_print_cpp ./patches/patch-tests_fff_print_test_print_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_print_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_print_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/fff_print/test_print.cpp ---- tests/fff_print/test_print.cpp.orig -+++ tests/fff_print/test_print.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/libslic3r.h" - #include "libslic3r/Print.hpp" diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_printgcode_cpp ./patches/patch-tests_fff_print_test_printgcode_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_printgcode_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_printgcode_cpp Wed Dec 31 16:00:00 1969 @@ -1,17 +0,0 @@ -Index: tests/fff_print/test_printgcode.cpp ---- tests/fff_print/test_printgcode.cpp.orig -+++ tests/fff_print/test_printgcode.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/libslic3r.h" - #include "libslic3r/GCodeReader.hpp" -@@ -8,6 +8,7 @@ - #include - #include - -+using Catch::Approx; - using namespace Slic3r; - using namespace Slic3r::Test; - diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_printobject_cpp ./patches/patch-tests_fff_print_test_printobject_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_printobject_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_printobject_cpp Wed Dec 31 16:00:00 1969 @@ -1,17 +0,0 @@ -Index: tests/fff_print/test_printobject.cpp ---- tests/fff_print/test_printobject.cpp.orig -+++ tests/fff_print/test_printobject.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/libslic3r.h" - #include "libslic3r/Print.hpp" -@@ -6,6 +6,7 @@ - - #include "test_data.hpp" - -+using Catch::Approx; - using namespace Slic3r; - using namespace Slic3r::Test; - diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_shells_cpp ./patches/patch-tests_fff_print_test_shells_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_shells_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_shells_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/fff_print/test_shells.cpp ---- tests/fff_print/test_shells.cpp.orig -+++ tests/fff_print/test_shells.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/GCodeReader.hpp" - diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_skirt_brim_cpp ./patches/patch-tests_fff_print_test_skirt_brim_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_skirt_brim_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_skirt_brim_cpp Wed Dec 31 16:00:00 1969 @@ -1,17 +0,0 @@ -Index: tests/fff_print/test_skirt_brim.cpp ---- tests/fff_print/test_skirt_brim.cpp.orig -+++ tests/fff_print/test_skirt_brim.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/GCodeReader.hpp" - #include "libslic3r/Config.hpp" -@@ -8,6 +8,7 @@ - - #include "test_data.hpp" // get access to init_print, etc - -+using Catch::Approx; - using namespace Slic3r::Test; - using namespace Slic3r; - diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_support_material_cpp ./patches/patch-tests_fff_print_test_support_material_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_support_material_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_support_material_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/fff_print/test_support_material.cpp ---- tests/fff_print/test_support_material.cpp.orig -+++ tests/fff_print/test_support_material.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/GCodeReader.hpp" - #include "libslic3r/Layer.hpp" diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_thin_walls_cpp ./patches/patch-tests_fff_print_test_thin_walls_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_thin_walls_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_thin_walls_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/fff_print/test_thin_walls.cpp ---- tests/fff_print/test_thin_walls.cpp.orig -+++ tests/fff_print/test_thin_walls.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include - #include diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_trianglemesh_cpp ./patches/patch-tests_fff_print_test_trianglemesh_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_fff_print_test_trianglemesh_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_fff_print_test_trianglemesh_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/fff_print/test_trianglemesh.cpp ---- tests/fff_print/test_trianglemesh.cpp.orig -+++ tests/fff_print/test_trianglemesh.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/TriangleMesh.hpp" - #include "libslic3r/TriangleMeshSlicer.hpp" diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_3mf_cpp ./patches/patch-tests_libslic3r_test_3mf_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_3mf_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_3mf_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/libslic3r/test_3mf.cpp ---- tests/libslic3r/test_3mf.cpp.orig -+++ tests/libslic3r/test_3mf.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/Model.hpp" - #include "libslic3r/Format/3mf.hpp" diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_aabbindirect_cpp ./patches/patch-tests_libslic3r_test_aabbindirect_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_aabbindirect_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_aabbindirect_cpp Wed Dec 31 16:00:00 1969 @@ -1,17 +0,0 @@ -Index: tests/libslic3r/test_aabbindirect.cpp ---- tests/libslic3r/test_aabbindirect.cpp.orig -+++ tests/libslic3r/test_aabbindirect.cpp -@@ -1,11 +1,12 @@ - #include --#include -+#include - #include - - #include - #include - #include - -+using Catch::Approx; - using namespace Slic3r; - - TEST_CASE("Building a tree over a box, ray caster and closest query", "[AABBIndirect]") diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_anyptr_cpp ./patches/patch-tests_libslic3r_test_anyptr_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_anyptr_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_anyptr_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/libslic3r/test_anyptr.cpp ---- tests/libslic3r/test_anyptr.cpp.orig -+++ tests/libslic3r/test_anyptr.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include - #include diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_arachne_cpp ./patches/patch-tests_libslic3r_test_arachne_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_arachne_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_arachne_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/libslic3r/test_arachne.cpp ---- tests/libslic3r/test_arachne.cpp.orig -+++ tests/libslic3r/test_arachne.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/Arachne/WallToolPaths.hpp" - #include "libslic3r/ClipperUtils.hpp" diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_arc_welder_cpp ./patches/patch-tests_libslic3r_test_arc_welder_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_arc_welder_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_arc_welder_cpp Wed Dec 31 16:00:00 1969 @@ -1,17 +0,0 @@ -Index: tests/libslic3r/test_arc_welder.cpp ---- tests/libslic3r/test_arc_welder.cpp.orig -+++ tests/libslic3r/test_arc_welder.cpp -@@ -1,4 +1,4 @@ --#include -+#include - #include - - #include -@@ -8,6 +8,7 @@ - #include - #include - -+using Catch::Approx; - using namespace Slic3r; - - TEST_CASE("arc basics", "[ArcWelder]") { diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_astar_cpp ./patches/patch-tests_libslic3r_test_astar_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_astar_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_astar_cpp Wed Dec 31 16:00:00 1969 @@ -1,16 +0,0 @@ -Index: tests/libslic3r/test_astar.cpp ---- tests/libslic3r/test_astar.cpp.orig -+++ tests/libslic3r/test_astar.cpp -@@ -1,10 +1,11 @@ --#include -+#include - - #include "libslic3r/BoundingBox.hpp" - #include "libslic3r/AStar.hpp" - #include "libslic3r/Execution/ExecutionSeq.hpp" - #include "libslic3r/PointGrid.hpp" - -+using Catch::Approx; - using namespace Slic3r; - - TEST_CASE("Testing basic invariants of AStar", "[AStar]") { diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_clipper_offset_cpp ./patches/patch-tests_libslic3r_test_clipper_offset_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_clipper_offset_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_clipper_offset_cpp Wed Dec 31 16:00:00 1969 @@ -1,17 +0,0 @@ -Index: tests/libslic3r/test_clipper_offset.cpp ---- tests/libslic3r/test_clipper_offset.cpp.orig -+++ tests/libslic3r/test_clipper_offset.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include - #include -@@ -7,6 +7,7 @@ - #include "libslic3r/ExPolygon.hpp" - #include "libslic3r/SVG.hpp" - -+using Catch::Approx; - using namespace Slic3r; - - // #define TESTS_EXPORT_SVGS diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_clipper_utils_cpp ./patches/patch-tests_libslic3r_test_clipper_utils_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_clipper_utils_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_clipper_utils_cpp Wed Dec 31 16:00:00 1969 @@ -1,17 +0,0 @@ -Index: tests/libslic3r/test_clipper_utils.cpp ---- tests/libslic3r/test_clipper_utils.cpp.orig -+++ tests/libslic3r/test_clipper_utils.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include - #include -@@ -8,6 +8,7 @@ - #include "libslic3r/ExPolygon.hpp" - #include "libslic3r/SVG.hpp" - -+using Catch::Approx; - using namespace Slic3r; - - SCENARIO("Various Clipper operations - xs/t/11_clipper.t", "[ClipperUtils]") { diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_color_cpp ./patches/patch-tests_libslic3r_test_color_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_color_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_color_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/libslic3r/test_color.cpp ---- tests/libslic3r/test_color.cpp.orig -+++ tests/libslic3r/test_color.cpp -@@ -1,4 +1,4 @@ --#include -+#include - #include "libslic3r/libslic3r.h" - - #include "libslic3r/Color.hpp" diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_config_cpp ./patches/patch-tests_libslic3r_test_config_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_config_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_config_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/libslic3r/test_config.cpp ---- tests/libslic3r/test_config.cpp.orig -+++ tests/libslic3r/test_config.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/Config.hpp" - #include "libslic3r/PrintConfig.hpp" diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_curve_fitting_cpp ./patches/patch-tests_libslic3r_test_curve_fitting_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_curve_fitting_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_curve_fitting_cpp Wed Dec 31 16:00:00 1969 @@ -1,16 +0,0 @@ -Index: tests/libslic3r/test_curve_fitting.cpp ---- tests/libslic3r/test_curve_fitting.cpp.orig -+++ tests/libslic3r/test_curve_fitting.cpp -@@ -1,9 +1,11 @@ --#include -+#include - #include - - #include - #include - #include -+ -+using Catch::Approx; - - TEST_CASE("Curves: cubic b spline fit test", "[Curves]") { - using namespace Slic3r; diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_cut_surface_cpp ./patches/patch-tests_libslic3r_test_cut_surface_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_cut_surface_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_cut_surface_cpp Tue Feb 20 19:27:47 2024 @@ -1,11 +1,7 @@ Index: tests/libslic3r/test_cut_surface.cpp --- tests/libslic3r/test_cut_surface.cpp.orig +++ tests/libslic3r/test_cut_surface.cpp -@@ -1,10 +1,10 @@ --#include -+#include - - #include +@@ -4,7 +4,7 @@ #include // its_make_cube + its_merge using namespace Slic3r; diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_elephant_foot_compensation_cpp ./patches/patch-tests_libslic3r_test_elephant_foot_compensation_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_elephant_foot_compensation_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_elephant_foot_compensation_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/libslic3r/test_elephant_foot_compensation.cpp ---- tests/libslic3r/test_elephant_foot_compensation.cpp.orig -+++ tests/libslic3r/test_elephant_foot_compensation.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include - #include diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_emboss_cpp ./patches/patch-tests_libslic3r_test_emboss_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_emboss_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_emboss_cpp Tue Feb 20 19:27:47 2024 @@ -1,12 +1,6 @@ Index: tests/libslic3r/test_emboss.cpp --- tests/libslic3r/test_emboss.cpp.orig +++ tests/libslic3r/test_emboss.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include - #include // only debug visualization @@ -412,7 +412,7 @@ TEST_CASE("ray segment intersection", "[MeshBoolean]") CHECK(abs(*t1 - *t2) < std::numeric_limits::epsilon()); } diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_expolygon_cpp ./patches/patch-tests_libslic3r_test_expolygon_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_expolygon_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_expolygon_cpp Wed Dec 31 16:00:00 1969 @@ -1,22 +0,0 @@ -Index: tests/libslic3r/test_expolygon.cpp ---- tests/libslic3r/test_expolygon.cpp.orig -+++ tests/libslic3r/test_expolygon.cpp -@@ -1,9 +1,10 @@ --#include -+#include - - #include "libslic3r/Point.hpp" - #include "libslic3r/Polygon.hpp" - #include "libslic3r/ExPolygon.hpp" - -+using Catch::Approx; - using namespace Slic3r; - - static inline bool points_close(const Point &p1, const Point &p2) -@@ -160,4 +161,4 @@ TEST_CASE("Serialization of expolygons to string", "[E - } - - CHECK(expolys == expolys_loaded); --} -\ No newline at end of file -+} diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_geometry_cpp ./patches/patch-tests_libslic3r_test_geometry_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_geometry_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_geometry_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/libslic3r/test_geometry.cpp ---- tests/libslic3r/test_geometry.cpp.orig -+++ tests/libslic3r/test_geometry.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/Point.hpp" - #include "libslic3r/BoundingBox.hpp" diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_hollowing_cpp ./patches/patch-tests_libslic3r_test_hollowing_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_hollowing_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_hollowing_cpp Wed Dec 31 16:00:00 1969 @@ -1,11 +0,0 @@ -Index: tests/libslic3r/test_hollowing.cpp ---- tests/libslic3r/test_hollowing.cpp.orig -+++ tests/libslic3r/test_hollowing.cpp -@@ -1,6 +1,6 @@ - #include - #include --#include -+#include - - #include "libslic3r/SLA/Hollowing.hpp" - diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_indexed_triangle_set_cpp ./patches/patch-tests_libslic3r_test_indexed_triangle_set_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_indexed_triangle_set_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_indexed_triangle_set_cpp Wed Dec 31 16:00:00 1969 @@ -1,12 +0,0 @@ -Index: tests/libslic3r/test_indexed_triangle_set.cpp ---- tests/libslic3r/test_indexed_triangle_set.cpp.orig -+++ tests/libslic3r/test_indexed_triangle_set.cpp -@@ -1,6 +1,7 @@ - #include - #include --#include -+#include -+#include - - #include "libslic3r/TriangleMesh.hpp" - diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_jump_point_search_cpp ./patches/patch-tests_libslic3r_test_jump_point_search_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_jump_point_search_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_jump_point_search_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/libslic3r/test_jump_point_search.cpp ---- tests/libslic3r/test_jump_point_search.cpp.orig -+++ tests/libslic3r/test_jump_point_search.cpp -@@ -1,4 +1,4 @@ --#include -+#include - #include "libslic3r/BoundingBox.hpp" - #include "libslic3r/JumpPointSearch.hpp" - diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_kdtreeindirect_cpp ./patches/patch-tests_libslic3r_test_kdtreeindirect_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_kdtreeindirect_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_kdtreeindirect_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/libslic3r/test_kdtreeindirect.cpp ---- tests/libslic3r/test_kdtreeindirect.cpp.orig -+++ tests/libslic3r/test_kdtreeindirect.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/KDTreeIndirect.hpp" - #include "libslic3r/Execution/ExecutionSeq.hpp" diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_marchingsquares_cpp ./patches/patch-tests_libslic3r_test_marchingsquares_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_marchingsquares_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_marchingsquares_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/libslic3r/test_marchingsquares.cpp ---- tests/libslic3r/test_marchingsquares.cpp.orig -+++ tests/libslic3r/test_marchingsquares.cpp -@@ -1,4 +1,4 @@ --#include -+#include - #include - - #include diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_meshboolean_cpp ./patches/patch-tests_libslic3r_test_meshboolean_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_meshboolean_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_meshboolean_cpp Wed Dec 31 16:00:00 1969 @@ -1,15 +0,0 @@ -Index: tests/libslic3r/test_meshboolean.cpp ---- tests/libslic3r/test_meshboolean.cpp.orig -+++ tests/libslic3r/test_meshboolean.cpp -@@ -1,9 +1,10 @@ --#include -+#include - #include - - #include - #include - -+using Catch::Approx; - using namespace Slic3r; - - TEST_CASE("CGAL and TriangleMesh conversions", "[MeshBoolean]") { diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_mutable_polygon_cpp ./patches/patch-tests_libslic3r_test_mutable_polygon_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_mutable_polygon_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_mutable_polygon_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/libslic3r/test_mutable_polygon.cpp ---- tests/libslic3r/test_mutable_polygon.cpp.orig -+++ tests/libslic3r/test_mutable_polygon.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/Point.hpp" - #include "libslic3r/MutablePolygon.hpp" diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_mutable_priority_queue_cpp ./patches/patch-tests_libslic3r_test_mutable_priority_queue_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_mutable_priority_queue_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_mutable_priority_queue_cpp Wed Dec 31 16:00:00 1969 @@ -1,12 +0,0 @@ -Index: tests/libslic3r/test_mutable_priority_queue.cpp ---- tests/libslic3r/test_mutable_priority_queue.cpp.orig -+++ tests/libslic3r/test_mutable_priority_queue.cpp -@@ -1,6 +1,7 @@ --#include -+#include - - #include -+#include - - #include "libslic3r/MutablePriorityQueue.hpp" - diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_optimizers_cpp ./patches/patch-tests_libslic3r_test_optimizers_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_optimizers_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_optimizers_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/libslic3r/test_optimizers.cpp ---- tests/libslic3r/test_optimizers.cpp.orig -+++ tests/libslic3r/test_optimizers.cpp -@@ -1,4 +1,4 @@ --#include -+#include - #include - - #include diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_placeholder_parser_cpp ./patches/patch-tests_libslic3r_test_placeholder_parser_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_placeholder_parser_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_placeholder_parser_cpp Wed Dec 31 16:00:00 1969 @@ -1,14 +0,0 @@ -Index: tests/libslic3r/test_placeholder_parser.cpp ---- tests/libslic3r/test_placeholder_parser.cpp.orig -+++ tests/libslic3r/test_placeholder_parser.cpp -@@ -1,8 +1,9 @@ --#include -+#include - - #include "libslic3r/PlaceholderParser.hpp" - #include "libslic3r/PrintConfig.hpp" - -+using Catch::Approx; - using namespace Slic3r; - - SCENARIO("Placeholder parser scripting", "[PlaceholderParser]") { diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_png_io_cpp ./patches/patch-tests_libslic3r_test_png_io_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_png_io_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_png_io_cpp Wed Dec 31 16:00:00 1969 @@ -1,12 +0,0 @@ -Index: tests/libslic3r/test_png_io.cpp ---- tests/libslic3r/test_png_io.cpp.orig -+++ tests/libslic3r/test_png_io.cpp -@@ -2,7 +2,7 @@ - #define NOMINMAX - #endif - --#include -+#include - - #include - diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_polygon_cpp ./patches/patch-tests_libslic3r_test_polygon_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_polygon_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_polygon_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/libslic3r/test_polygon.cpp ---- tests/libslic3r/test_polygon.cpp.orig -+++ tests/libslic3r/test_polygon.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/Point.hpp" - #include "libslic3r/Polygon.hpp" diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_polyline_cpp ./patches/patch-tests_libslic3r_test_polyline_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_polyline_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_polyline_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/libslic3r/test_polyline.cpp ---- tests/libslic3r/test_polyline.cpp.orig -+++ tests/libslic3r/test_polyline.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/Point.hpp" - #include "libslic3r/Polyline.hpp" diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_quadric_edge_collapse_cpp ./patches/patch-tests_libslic3r_test_quadric_edge_collapse_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_quadric_edge_collapse_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_quadric_edge_collapse_cpp Tue Feb 20 19:27:47 2024 @@ -1,12 +1,6 @@ Index: tests/libslic3r/test_quadric_edge_collapse.cpp --- tests/libslic3r/test_quadric_edge_collapse.cpp.orig +++ tests/libslic3r/test_quadric_edge_collapse.cpp -@@ -1,4 +1,4 @@ --#include -+#include - #include - - #include @@ -240,7 +240,7 @@ TEST_CASE("Simplify frog_legs.obj to 5% by Quadric edg } diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_region_expansion_cpp ./patches/patch-tests_libslic3r_test_region_expansion_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_region_expansion_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_region_expansion_cpp Wed Dec 31 16:00:00 1969 @@ -1,17 +0,0 @@ -Index: tests/libslic3r/test_region_expansion.cpp ---- tests/libslic3r/test_region_expansion.cpp.orig -+++ tests/libslic3r/test_region_expansion.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include - #include -@@ -7,6 +7,7 @@ - #include - #include - -+using Catch::Approx; - using namespace Slic3r; - - //#define DEBUG_TEMP_DIR "d:\\temp\\" diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_static_map_cpp ./patches/patch-tests_libslic3r_test_static_map_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_static_map_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_static_map_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/libslic3r/test_static_map.cpp ---- tests/libslic3r/test_static_map.cpp.orig -+++ tests/libslic3r/test_static_map.cpp -@@ -1,4 +1,4 @@ --#include -+#include - #include - - #include "libslic3r/StaticMap.hpp" diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_stl_cpp ./patches/patch-tests_libslic3r_test_stl_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_stl_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_stl_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/libslic3r/test_stl.cpp ---- tests/libslic3r/test_stl.cpp.orig -+++ tests/libslic3r/test_stl.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/Model.hpp" - #include "libslic3r/Format/STL.hpp" diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_support_spots_generator_cpp ./patches/patch-tests_libslic3r_test_support_spots_generator_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_support_spots_generator_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_support_spots_generator_cpp Wed Dec 31 16:00:00 1969 @@ -1,13 +0,0 @@ -Index: tests/libslic3r/test_support_spots_generator.cpp ---- tests/libslic3r/test_support_spots_generator.cpp.orig -+++ tests/libslic3r/test_support_spots_generator.cpp -@@ -1,7 +1,8 @@ - #include "libslic3r/Point.hpp" --#include -+#include - #include - -+using Catch::Approx; - using namespace Slic3r; - using namespace SupportSpotsGenerator; - diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_surface_mesh_cpp ./patches/patch-tests_libslic3r_test_surface_mesh_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_surface_mesh_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_surface_mesh_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/libslic3r/test_surface_mesh.cpp ---- tests/libslic3r/test_surface_mesh.cpp.orig -+++ tests/libslic3r/test_surface_mesh.cpp -@@ -1,4 +1,4 @@ --#include -+#include - #include - - diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_timeutils_cpp ./patches/patch-tests_libslic3r_test_timeutils_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_timeutils_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_timeutils_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/libslic3r/test_timeutils.cpp ---- tests/libslic3r/test_timeutils.cpp.orig -+++ tests/libslic3r/test_timeutils.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/Time.hpp" - diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_triangulation_cpp ./patches/patch-tests_libslic3r_test_triangulation_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_triangulation_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_triangulation_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/libslic3r/test_triangulation.cpp ---- tests/libslic3r/test_triangulation.cpp.orig -+++ tests/libslic3r/test_triangulation.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include - #include // only debug visualization diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_utils_cpp ./patches/patch-tests_libslic3r_test_utils_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_utils_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_utils_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/libslic3r/test_utils.cpp ---- tests/libslic3r/test_utils.cpp.orig -+++ tests/libslic3r/test_utils.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/libslic3r.h" - diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_voronoi_cpp ./patches/patch-tests_libslic3r_test_voronoi_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_libslic3r_test_voronoi_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_libslic3r_test_voronoi_cpp Tue Feb 20 19:27:47 2024 @@ -1,12 +1,6 @@ Index: tests/libslic3r/test_voronoi.cpp --- tests/libslic3r/test_voronoi.cpp.orig +++ tests/libslic3r/test_voronoi.cpp -@@ -1,4 +1,4 @@ --#include -+#include - #include - - #include @@ -340,7 +340,7 @@ TEST_CASE("Voronoi division by zero 12903", "[Voronoi] // Funny sample from a dental industry? // Vojtech confirms this test fails and rightly so, because the input data contain self intersections. diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_sla_print_sla_archive_readwrite_tests_cpp ./patches/patch-tests_sla_print_sla_archive_readwrite_tests_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_sla_print_sla_archive_readwrite_tests_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_sla_print_sla_archive_readwrite_tests_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/sla_print/sla_archive_readwrite_tests.cpp ---- tests/sla_print/sla_archive_readwrite_tests.cpp.orig -+++ tests/sla_print/sla_archive_readwrite_tests.cpp -@@ -1,4 +1,4 @@ --#include -+#include - #include - - #include "libslic3r/SLAPrint.hpp" diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_sla_print_sla_print_tests_cpp ./patches/patch-tests_sla_print_sla_print_tests_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_sla_print_sla_print_tests_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_sla_print_sla_print_tests_cpp Wed Dec 31 16:00:00 1969 @@ -1,12 +0,0 @@ -Index: tests/sla_print/sla_print_tests.cpp ---- tests/sla_print/sla_print_tests.cpp.orig -+++ tests/sla_print/sla_print_tests.cpp -@@ -9,6 +9,8 @@ - #include - #include - -+using Catch::Approx; -+ - namespace { - - const char *const BELOW_PAD_TEST_OBJECTS[] = { diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_sla_print_sla_raycast_tests_cpp ./patches/patch-tests_sla_print_sla_raycast_tests_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_sla_print_sla_raycast_tests_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_sla_print_sla_raycast_tests_cpp Wed Dec 31 16:00:00 1969 @@ -1,17 +0,0 @@ -Index: tests/sla_print/sla_raycast_tests.cpp ---- tests/sla_print/sla_raycast_tests.cpp.orig -+++ tests/sla_print/sla_raycast_tests.cpp -@@ -1,4 +1,4 @@ --#include -+#include - #include - - #include -@@ -6,6 +6,7 @@ - - #include "sla_test_utils.hpp" - -+using Catch::Approx; - using namespace Slic3r; - - // First do a simple test of the hole raycaster. diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_sla_print_sla_supptgen_tests_cpp ./patches/patch-tests_sla_print_sla_supptgen_tests_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_sla_print_sla_supptgen_tests_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_sla_print_sla_supptgen_tests_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/sla_print/sla_supptgen_tests.cpp ---- tests/sla_print/sla_supptgen_tests.cpp.orig -+++ tests/sla_print/sla_supptgen_tests.cpp -@@ -1,4 +1,4 @@ --#include -+#include - #include - - #include diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_sla_print_sla_supptreeutils_tests_cpp ./patches/patch-tests_sla_print_sla_supptreeutils_tests_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_sla_print_sla_supptreeutils_tests_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_sla_print_sla_supptreeutils_tests_cpp Wed Dec 31 16:00:00 1969 @@ -1,18 +0,0 @@ -Index: tests/sla_print/sla_supptreeutils_tests.cpp ---- tests/sla_print/sla_supptreeutils_tests.cpp.orig -+++ tests/sla_print/sla_supptreeutils_tests.cpp -@@ -1,4 +1,4 @@ --#include -+#include - #include - - #include -@@ -6,6 +6,8 @@ - #include "libslic3r/Execution/ExecutionSeq.hpp" - #include "libslic3r/SLA/SupportTreeUtils.hpp" - #include "libslic3r/SLA/SupportTreeUtilsLegacy.hpp" -+ -+using Catch::Approx; - - // Test pair hash for 'nums' random number pairs. - template void test_pairhash() diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_sla_print_sla_test_utils_cpp ./patches/patch-tests_sla_print_sla_test_utils_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_sla_print_sla_test_utils_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_sla_print_sla_test_utils_cpp Wed Dec 31 16:00:00 1969 @@ -1,12 +0,0 @@ -Index: tests/sla_print/sla_test_utils.cpp ---- tests/sla_print/sla_test_utils.cpp.orig -+++ tests/sla_print/sla_test_utils.cpp -@@ -6,6 +6,8 @@ - - #include - -+using Catch::Approx; -+ - void test_support_model_collision( - const std::string &obj_filename, - const sla::SupportTreeConfig &input_supportcfg, diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_sla_print_sla_test_utils_hpp ./patches/patch-tests_sla_print_sla_test_utils_hpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_sla_print_sla_test_utils_hpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_sla_print_sla_test_utils_hpp Wed Dec 31 16:00:00 1969 @@ -1,12 +0,0 @@ -Index: tests/sla_print/sla_test_utils.hpp ---- tests/sla_print/sla_test_utils.hpp.orig -+++ tests/sla_print/sla_test_utils.hpp -@@ -1,7 +1,7 @@ - #ifndef SLA_TEST_UTILS_HPP - #define SLA_TEST_UTILS_HPP - --#include -+#include - #include - - // Debug diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_slic3rutils_slic3r_arrangejob_tests_cpp ./patches/patch-tests_slic3rutils_slic3r_arrangejob_tests_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_slic3rutils_slic3r_arrangejob_tests_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_slic3rutils_slic3r_arrangejob_tests_cpp Wed Dec 31 16:00:00 1969 @@ -1,18 +0,0 @@ -Index: tests/slic3rutils/slic3r_arrangejob_tests.cpp ---- tests/slic3rutils/slic3r_arrangejob_tests.cpp.orig -+++ tests/slic3rutils/slic3r_arrangejob_tests.cpp -@@ -1,4 +1,4 @@ --#include "catch2/catch.hpp" -+#include - #include "test_utils.hpp" - - #include -@@ -12,6 +12,8 @@ - #include "libslic3r/SLAPrint.hpp" - - #include "libslic3r/Format/3mf.hpp" -+ -+using Catch::Approx; - - class RandomArrangeSettings: public Slic3r::arr2::ArrangeSettingsView { - Slic3r::arr2::ArrangeSettingsDb::Values m_v; diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_slic3rutils_slic3r_jobs_tests_cpp ./patches/patch-tests_slic3rutils_slic3r_jobs_tests_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_slic3rutils_slic3r_jobs_tests_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_slic3rutils_slic3r_jobs_tests_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/slic3rutils/slic3r_jobs_tests.cpp ---- tests/slic3rutils/slic3r_jobs_tests.cpp.orig -+++ tests/slic3rutils/slic3r_jobs_tests.cpp -@@ -1,4 +1,4 @@ --#include "catch2/catch.hpp" -+#include - - #include - #include diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_slic3rutils_slic3r_version_tests_cpp ./patches/patch-tests_slic3rutils_slic3r_version_tests_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_slic3rutils_slic3r_version_tests_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_slic3rutils_slic3r_version_tests_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/slic3rutils/slic3r_version_tests.cpp ---- tests/slic3rutils/slic3r_version_tests.cpp.orig -+++ tests/slic3rutils/slic3r_version_tests.cpp -@@ -1,4 +1,4 @@ --#include "catch2/catch.hpp" -+#include - - #include "slic3r/Config/Version.hpp" - diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_thumbnails_test_thumbnails_ini_string_cpp ./patches/patch-tests_thumbnails_test_thumbnails_ini_string_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_thumbnails_test_thumbnails_ini_string_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_thumbnails_test_thumbnails_ini_string_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/thumbnails/test_thumbnails_ini_string.cpp ---- tests/thumbnails/test_thumbnails_ini_string.cpp.orig -+++ tests/thumbnails/test_thumbnails_ini_string.cpp -@@ -1,4 +1,4 @@ --#include -+#include - - #include "libslic3r/Config.hpp" - #include "libslic3r/PrintConfig.hpp" diff -NPru -x CVS /usr/ports/cad/prusaslicer/patches/patch-tests_thumbnails_test_thumbnails_input_string_cpp ./patches/patch-tests_thumbnails_test_thumbnails_input_string_cpp --- /usr/ports/cad/prusaslicer/patches/patch-tests_thumbnails_test_thumbnails_input_string_cpp Wed Feb 7 10:31:05 2024 +++ ./patches/patch-tests_thumbnails_test_thumbnails_input_string_cpp Wed Dec 31 16:00:00 1969 @@ -1,9 +0,0 @@ -Index: tests/thumbnails/test_thumbnails_input_string.cpp ---- tests/thumbnails/test_thumbnails_input_string.cpp.orig -+++ tests/thumbnails/test_thumbnails_input_string.cpp -@@ -1,4 +1,4 @@ --#include -+#include - #include - - #include -- Renato Aguiar