[3dprinter-general] Bug#1074119: PrusaSlicer CGAL 6.0 patch

[Gregor Riepl]

> Confirmation: The upstream PR fixes the compilation issue, after removing the duplicate lines.

Sorry, I spoke too soon... there's another compilation error in one of the unit tests.
I'll try to fix that as well.


/build/slic3r-prusa/tests/libslic3r/test_emboss.cpp: In function ‘void CATCH2_INTERNAL_TEST_28()’:
/build/slic3r-prusa/tests/libslic3r/test_emboss.cpp:907:90: error: ‘class std::optional<CGAL::Surface_mesh<CGAL::Point_3<CGAL::Epick> >::Property_map<CGAL::SM_Face_index, int> >’ has no member named ‘first’
   907 |     auto face_map = cgal_object.property_map<MyMesh::Face_index, int32_t>(face_map_name).first;
       |                                                                                          ^~~~~
/build/slic3r-prusa/tests/libslic3r/test_emboss.cpp:916:112: error: ‘class std::optional<CGAL::Surface_mesh<CGAL::Point_3<CGAL::Epick> >::Property_map<CGAL::SM_Edge_index, IntersectingElemnt> >’ has no member named ‘first’
   916 |     auto edge_shape_map = cgal_shape.property_map<MyMesh::Edge_index, IntersectingElemnt>(edge_shape_map_name).first;
       |                                                                                                                ^~~~~
/build/slic3r-prusa/tests/libslic3r/test_emboss.cpp:917:112: error: ‘class std::optional<CGAL::Surface_mesh<CGAL::Point_3<CGAL::Epick> >::Property_map<CGAL::SM_Face_index, IntersectingElemnt> >’ has no member named ‘first’
   917 |     auto face_shape_map = cgal_shape.property_map<MyMesh::Face_index, IntersectingElemnt>(face_shape_map_name).first;
       |                                                                                                                ^~~~~
/build/slic3r-prusa/tests/libslic3r/test_emboss.cpp:1033:39: error: no matching function for call to ‘CATCH2_INTERNAL_TEST_28()::Visitor::Visitor(<brace-enclosed initializer list>)’
  1033 |               face_map, vert_shape_map};
       |                                       ^
/build/slic3r-prusa/tests/libslic3r/test_emboss.cpp:926:9: note: candidate: ‘CATCH2_INTERNAL_TEST_28()::Visitor::Visitor(const MyMesh&, const MyMesh&, CGAL::Surface_mesh<CGAL::Point_3<CGAL::Epick> >::Property_map<CGAL::SM_Edge_index, IntersectingElemnt>, CGAL::Surface_mesh<CGAL::Point_3<CGAL::Epick> >::Property_map<CGAL::SM_Face_index, IntersectingElemnt>, CGAL::Surface_mesh<CGAL::Point_3<CGAL::Epick> >::Property_map<CGAL::SM_Face_index, int>, CGAL::Surface_mesh<CGAL::Point_3<CGAL::Epick> >::Property_map<CGAL::SM_Vertex_index, IntersectingElemnt>)’
   926 |         Visitor(const MyMesh &object, const MyMesh &shape,
       |         ^~~~~~~
/build/slic3r-prusa/tests/libslic3r/test_emboss.cpp:926:9: note:   conversion of argument 3 would be ill-formed:
/build/slic3r-prusa/tests/libslic3r/test_emboss.cpp:925:12: note: candidate: ‘CATCH2_INTERNAL_TEST_28()::Visitor::Visitor(const CATCH2_INTERNAL_TEST_28()::Visitor&)’
   925 |     struct Visitor : public CGAL::Polygon_mesh_processing::Corefinement::Default_visitor<MyMesh> {
       |            ^~~~~~~
/build/slic3r-prusa/tests/libslic3r/test_emboss.cpp:925:12: note:   candidate expects 1 argument, 6 provided
/build/slic3r-prusa/tests/libslic3r/test_emboss.cpp:925:12: note: candidate: ‘CATCH2_INTERNAL_TEST_28()::Visitor::Visitor(CATCH2_INTERNAL_TEST_28()::Visitor&&)’
/build/slic3r-prusa/tests/libslic3r/test_emboss.cpp:925:12: note:   candidate expects 1 argument, 6 provided