Hello community, here is the log from the commit of package vtk for openSUSE:Factory checked in at 2020-10-24 15:17:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vtk (Old) and /work/SRC/openSUSE:Factory/.vtk.new.3463 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vtk" Sat Oct 24 15:17:39 2020 rev:51 rq:843470 version:9.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/vtk/vtk.changes 2020-07-20 21:03:40.425232984 +0200 +++ /work/SRC/openSUSE:Factory/.vtk.new.3463/vtk.changes 2020-10-24 15:17:59.392259796 +0200 @@ -1,0 +2,6 @@ +Tue Oct 20 14:06:35 UTC 2020 - Ismail Dönmez <idon...@suse.com> + +- Add vtk-freetype-2.10.3-replace-FT_CALLBACK_DEF.patch to fix + compilation with FreeType 2.10.3+ + +------------------------------------------------------------------- New: ---- vtk-freetype-2.10.3-replace-FT_CALLBACK_DEF.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vtk.spec ++++++ --- /var/tmp/diff_new_pack.HM0mhz/_old 2020-10-24 15:18:00.244260604 +0200 +++ /var/tmp/diff_new_pack.HM0mhz/_new 2020-10-24 15:18:00.248260608 +0200 @@ -148,6 +148,8 @@ Patch13: 0001-Fix-PyVTKAddFile_-function-signature-mismatch.patch # PATCH-FIX-UPSTREAM -- https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7115 Patch14: 0001-Replace-invalid-GL_LINE-with-GL_LINES-for-glDrawArra.patch +# PATCH-FIX-UPSTREAM -- https://gitlab.kitware.com/vtk/vtk/-/issues/18033 +Patch15: vtk-freetype-2.10.3-replace-FT_CALLBACK_DEF.patch BuildRequires: R-base-devel BuildRequires: chrpath BuildRequires: cmake >= 3.4 @@ -404,6 +406,7 @@ %endif %patch13 -p1 %patch14 -p1 +%patch15 -p1 # Replace relative path ../../../../VTKData with %%{_datadir}/vtkdata # otherwise it will break on symlinks. ++++++ vtk-freetype-2.10.3-replace-FT_CALLBACK_DEF.patch ++++++ Index: VTK-9.0.1/Rendering/FreeType/vtkFreeTypeTools.cxx =================================================================== --- VTK-9.0.1.orig/Rendering/FreeType/vtkFreeTypeTools.cxx +++ VTK-9.0.1/Rendering/FreeType/vtkFreeTypeTools.cxx @@ -378,7 +378,7 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMap } //---------------------------------------------------------------------------- -FT_CALLBACK_DEF(FT_Error) +extern "C" FT_Error vtkFreeTypeToolsFaceRequester( FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face) { Index: VTK-9.0.1/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx =================================================================== --- VTK-9.0.1.orig/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx +++ VTK-9.0.1/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx @@ -26,10 +26,8 @@ vtkStandardNewMacro(vtkFontConfigFreeTypeTools); -namespace -{ // The FreeType face requester callback: -FT_CALLBACK_DEF(FT_Error) +extern "C" FT_Error vtkFontConfigFreeTypeToolsFaceRequester( FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face) { @@ -71,7 +69,6 @@ vtkFontConfigFreeTypeToolsFaceRequester( return static_cast<FT_Error>(0); } -} // end anon namespace void vtkFontConfigFreeTypeTools::PrintSelf(ostream& os, vtkIndent indent) {
