This patch has been taken from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1012689 --- a/addons/vtk/CMakeLists.txt +++ b/addons/vtk/CMakeLists.txt @@ -20,9 +20,9 @@ IF(WITH_VTKIO) if (STRICT_DEPENDECIES) - FIND_PACKAGE(VTK REQUIRED COMPONENTS vtkIOImage vtkIOXML vtkIOLegacy) + FIND_PACKAGE(VTK REQUIRED COMPONENTS IOImage IOXML IOLegacy) else (STRICT_DEPENDECIES) - FIND_PACKAGE(VTK COMPONENTS vtkIOImage vtkIOXML vtkIOLegacy) + FIND_PACKAGE(VTK COMPONENTS IOImage IOXML IOLegacy) endif (STRICT_DEPENDECIES) IF(VTK_FOUND) DEFINE_PROPERTY(GLOBAL PROPERTY HAVE_VTK_PROP BRIEF_DOCS "yeah" FULL_DOCS "yeah") @@ -41,8 +41,17 @@ SET(VTK_LINK_LIBS_3D ${SELECTED_VTK_LIBS} mia3d) PLUGIN_WITH_TEST_AND_PREFIX2("mesh" "io" vtkmesh "${VTK_LINK_LIBS_MESH}") + target_link_libraries(mesh-io-vtkmesh ${VTK_LIBRARIES}) + target_link_libraries(mesh-io-vtkmesh-common ${VTK_LIBRARIES}) + target_link_libraries(test-mesh-io-vtkmesh ${VTK_LIBRARIES}) PLUGIN_WITH_TEST_AND_PREFIX2("3dvf" "io" vtkvf "${VTK_LINK_LIBS_3D}") + target_link_libraries(3dvf-io-vtkvf ${VTK_LIBRARIES}) + target_link_libraries(3dvf-io-vtkvf-common ${VTK_LIBRARIES}) + target_link_libraries(test-3dvf-io-vtkvf ${VTK_LIBRARIES}) PLUGIN_WITH_TEST_AND_PREFIX2("3dimage" "io" vtkimage "${VTK_LINK_LIBS_3D}") + target_link_libraries(3dimage-io-vtkimage ${VTK_LIBRARIES}) + target_link_libraries(3dimage-io-vtkimage-common ${VTK_LIBRARIES}) + target_link_libraries(test-3dimage-io-vtkimage ${VTK_LIBRARIES}) ELSEIF(VTK_FOUND) MESSAGE(MESSAGE "VTK not found, disabled") --- a/addons/vtk/vtkmesh.cc +++ b/addons/vtk/vtkmesh.cc @@ -78,7 +78,8 @@ // read all cells, if a cell is formed of more than 3 corners, then triangulate, // if it hes less then 3 corners, ignore it (no wireframes supported here auto triangles = CVtkMeshIO::PTrianglefield(new CVtkMeshIO::CTrianglefield ()); - vtkIdType npts, *pts; + vtkIdType npts; + vtkIdType const *pts; auto strips = mesh.GetStrips(); while (strips->GetNextCell(npts, pts)) { @@ -183,7 +184,7 @@ auto is = mesh.normals_begin(); for (auto i = 0; i < n_normals; ++i, ++is) { - normals->GetTupleValue(i, &is->x); + normals->GetTypedTuple(i, &is->x); cvdebug() << i << ": read normal " << *is << "\n"; } } @@ -217,7 +218,7 @@ auto is = mesh.color_begin(); for (auto i = 0; i < n_colors; ++i, ++is) - colors->GetTupleValue(i, &is->x); + colors->GetTypedTuple(i, &is->x); } PTriangleMesh CVtkMeshIO::do_load(string const& filename) const title='2023-04-21 16:16:38 +0200'>2023-04-21tests: Fix checks for expected failures....Addresses <https://issues.guix.gnu.org/62406>. With 'set -e', a return status inverted with '!' does not cause the shell to exit immediately. Instead use '&& false' to indicate an expected failure. * tests/guix-archive.sh, tests/guix-build-branch.sh, tests/guix-build.sh, tests/guix-daemon.sh, tests/guix-download.sh, tests/guix-environment-container.sh, tests/guix-environment.sh, tests/guix-gc.sh, tests/guix-git-authenticate.sh, tests/guix-graph.sh, tests/guix-hash.sh, tests/guix-home.sh, tests/guix-pack-relocatable.sh, tests/guix-pack.sh, tests/guix-package-aliases.sh, tests/guix-package-net.sh, tests/guix-package.sh, tests/guix-refresh.sh, tests/guix-shell.sh, tests/guix-style.sh, tests/guix-system.sh: Replace uses of '! ...' with '... && false' or `test ! ...` as appropriate. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Eric Bavier 2022-02-14git-authenticate: Ensure the target is a descendant of the introductory commit....Fixes a bug whereby authentication of a commit *not* descending from the introductory commit could succeed, provided the commit verifies the authorization invariant. In the example below, A is a common ancestor of the introductory commit I and of commit X. Authentication of X would succeed, even though it is not a descendant of I, as long as X is authorized according to the '.guix-authorizations' in A: X I \ / A This is because, 'authenticate-repository' would not check whether X descends from I, and the call (commit-difference X I) would return X. In practice that only affects forks because it means that ancestors of the introductory commit already contain a '.guix-authorizations' file. * guix/git-authenticate.scm (authenticate-repository): Add call to 'commit-descendant?'. * tests/channels.scm ("authenticate-channel, not a descendant of introductory commit"): New test. * tests/git-authenticate.scm ("authenticate-repository, target not a descendant of intro"): New test. * tests/guix-git-authenticate.sh: Expect earlier test to fail since 9549f0283a78fe36f2d4ff2a04ef8ad6b0c02604 is not a descendant of $intro_commit. Add new test targeting an ancestor of the introductory commit, and another test targeting the v1.2.0 commit. * doc/guix.texi (Specifying Channel Authorizations): Add a sentence. Ludovic Courtès