rpm/vtk
SHA256
1
0
Fork 0
forked from pool/vtk
Code Pull Requests Activity

Accepting request 843011 from home:namtrac:branches:science

Browse Source 
- Add vtk-freetype-2.10.3-replace-FT_CALLBACK_DEF.patch to fix
  compilation with FreeType 2.10.3+

OBS-URL: https://build.opensuse.org/request/show/843011
OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=167
This commit is contained in:
Stefan Brüns 2020-10-22 17:34:26 +00:00 committed by Git OBS Bridge
parent 54b481982f
commit e8ae3d366c
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
vtk-freetype-2.10.3-replace-FT_CALLBACK_DEF.patch Normal file
View File

@ -0,0 +1,37 @@
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)
{

6
vtk.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Oct 20 14:06:35 UTC 2020 - Ismail Dönmez <idonmez@suse.com>
- Add vtk-freetype-2.10.3-replace-FT_CALLBACK_DEF.patch to fix
compilation with FreeType 2.10.3+
-------------------------------------------------------------------
Thu Jul 16 16:55:31 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

3
vtk.spec
View File

@ -148,6 +148,8 @@ Patch12: 0001-Guard-glPointSize-with-GL_ES_VERSION_3_0.patch
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 @@ languages.
%endif
%patch13 -p1
%patch14 -p1
%patch15 -p1
# Replace relative path ../../../../VTKData with %%{_datadir}/vtkdata
# otherwise it will break on symlinks.