Anton Gladky pushed to branch master at Debian Med / sight
Commits: c1dc6036 by Anton Gladky at 2024-06-21T14:30:22+02:00 Fix FTBFS against VTK9.3. (Closes: ##1073822) - - - - - d3357e35 by Anton Gladky at 2024-06-21T14:30:36+02:00 Update changelog. - - - - - 3 changed files: - debian/changelog - debian/patches/series - + debian/patches/vtk9.3.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +sight (23.1.0-3) unstable; urgency=medium + + * Team upload. + * [c1dc603] Fix FTBFS against VTK9.3. (Closes: ##1073822) + + -- Anton Gladky <gl...@debian.org> Fri, 21 Jun 2024 14:30:27 +0200 + sight (23.1.0-2) unstable; urgency=medium * d/p/gcc13.patch: Update patch (Closes: #1059140) ===================================== debian/patches/series ===================================== @@ -3,3 +3,4 @@ move-sightlog-in-libexec.patch lintian_warnings.patch fix-itk-build.patch gcc13.patch +vtk9.3.patch ===================================== debian/patches/vtk9.3.patch ===================================== @@ -0,0 +1,57 @@ +Description: Fix FTBFS against VTK 9.3 +Author: Anton Gladky <gl...@debian.org> +Bug-Debian: https://bugs.debian.org/1073822 + + +Index: sight-23.1.0/libs/core/core/runtime/detail/io/Validator.cpp +=================================================================== +--- sight-23.1.0.orig/libs/core/core/runtime/detail/io/Validator.cpp ++++ sight-23.1.0/libs/core/core/runtime/detail/io/Validator.cpp +@@ -110,7 +110,7 @@ void Validator::initializeContext() + } + + // Set the structured error callback +- xmlSchemaSetParserStructuredErrors(m_schemaParserContext.get(), Validator::ErrorHandler, this); ++ xmlSchemaSetParserStructuredErrors(m_schemaParserContext.get(), reinterpret_cast<xmlStructuredErrorFunc>(Validator::ErrorHandler), this); + } + + // Load XML schema content +@@ -127,7 +127,7 @@ void Validator::initializeContext() + if((m_schemaValidContext = SchemaValidCtxtSptr(xmlSchemaNewValidCtxt(m_schema.get()), xmlSchemaFreeValidCtxt))) + { + // Set the structured error callback +- xmlSchemaSetValidStructuredErrors(m_schemaValidContext.get(), Validator::ErrorHandler, this); ++ xmlSchemaSetValidStructuredErrors(m_schemaValidContext.get(), reinterpret_cast<xmlStructuredErrorFunc>(Validator::ErrorHandler), this); + } + } + +@@ -201,7 +201,7 @@ bool Validator::validate(xmlNodePtr node + + //------------------------------------------------------------------------------ + +-void Validator::ErrorHandler(void* userData, xmlErrorPtr error) ++void Validator::ErrorHandler(void* userData, const xmlErrorPtr error) + { + auto* validator = reinterpret_cast<Validator*>(userData); + +Index: sight-23.1.0/libs/core/core/runtime/detail/io/Validator.hpp +=================================================================== +--- sight-23.1.0.orig/libs/core/core/runtime/detail/io/Validator.hpp ++++ sight-23.1.0/libs/core/core/runtime/detail/io/Validator.hpp +@@ -26,6 +26,7 @@ + + #include <libxml/tree.h> + #include <libxml/xmlschemastypes.h> ++#include <libxml/xmlschemas.h> + + #include <filesystem> + #include <sstream> +@@ -131,7 +132,7 @@ private: + SchemaSptr m_schema; + SchemaValidCtxtSptr m_schemaValidContext; + +- static void ErrorHandler(void* userData, xmlErrorPtr error); ++ static void ErrorHandler(void* userData, const xmlErrorPtr error); + }; + + } // namespace sight::core::runtime::detail::io View it on GitLab: https://salsa.debian.org/med-team/sight/-/compare/ad95e86855d6c9f5e5c199054f1e1e7310eda4ed...d3357e350c105681187fe4e781309d8ebfd1b9df -- This project does not include diff previews in email notifications. View it on GitLab: https://salsa.debian.org/med-team/sight/-/compare/ad95e86855d6c9f5e5c199054f1e1e7310eda4ed...d3357e350c105681187fe4e781309d8ebfd1b9df You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list debian-med-com...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
