svn commit: r553412 - branches/2020Q4/math/vtk6/files

[Tobias C. Berner]

Author: tcberner
Date: Tue Oct 27 04:21:52 2020
New Revision: 553412
URL: https://svnweb.freebsd.org/changeset/ports/553412

Log:
  MFH: r553411
  
  math/vtk6: fix build against freetype 2.10.4
  
  - similar patch is applied to math/vtk8
  
  PR:		250375
  
  Approved by:	ports-secteam (implicit)

Added:
  branches/2020Q4/math/vtk6/files/patch-Rendering_FreeType_vtkFreeTypeTools.cxx
     - copied unchanged from r553411, head/math/vtk6/files/patch-Rendering_FreeType_vtkFreeTypeTools.cxx
  branches/2020Q4/math/vtk6/files/patch-Rendering_FreeType_vtkFreeTypeUtilities.cxx
     - copied unchanged from r553411, head/math/vtk6/files/patch-Rendering_FreeType_vtkFreeTypeUtilities.cxx
Modified:
Directory Properties:
  branches/2020Q4/   (props changed)

Copied: branches/2020Q4/math/vtk6/files/patch-Rendering_FreeType_vtkFreeTypeTools.cxx (from r553411, head/math/vtk6/files/patch-Rendering_FreeType_vtkFreeTypeTools.cxx)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q4/math/vtk6/files/patch-Rendering_FreeType_vtkFreeTypeTools.cxx	Tue Oct 27 04:21:52 2020	(r553412, copy of r553411, head/math/vtk6/files/patch-Rendering_FreeType_vtkFreeTypeTools.cxx)
@@ -0,0 +1,11 @@
+--- Rendering/FreeType/vtkFreeTypeTools.cxx.orig	2020-10-26 19:28:43 UTC
++++ Rendering/FreeType/vtkFreeTypeTools.cxx
+@@ -280,7 +280,7 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMapCache()
+ }
+ 
+ //----------------------------------------------------------------------------
+-FT_CALLBACK_DEF(FT_Error)
++static FT_Error
+ vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id,
+                               FT_Library lib,
+                               FT_Pointer request_data,

Copied: branches/2020Q4/math/vtk6/files/patch-Rendering_FreeType_vtkFreeTypeUtilities.cxx (from r553411, head/math/vtk6/files/patch-Rendering_FreeType_vtkFreeTypeUtilities.cxx)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q4/math/vtk6/files/patch-Rendering_FreeType_vtkFreeTypeUtilities.cxx	Tue Oct 27 04:21:52 2020	(r553412, copy of r553411, head/math/vtk6/files/patch-Rendering_FreeType_vtkFreeTypeUtilities.cxx)
@@ -0,0 +1,11 @@
+--- Rendering/FreeType/vtkFreeTypeUtilities.cxx.orig	2020-10-26 19:35:51 UTC
++++ Rendering/FreeType/vtkFreeTypeUtilities.cxx
+@@ -325,7 +325,7 @@ void vtkFreeTypeUtilities::MapIdToTextProperty(unsigne
+ 
+ //----------------------------------------------------------------------------
+ #ifdef VTK_FREETYPE_CACHING_SUPPORTED
+-FT_CALLBACK_DEF(FT_Error)
++static FT_Error
+ vtkFreeTypeUtilitiesFaceRequester(FTC_FaceID face_id,
+                                   FT_Library lib,
+                                   FT_Pointer request_data,