From owner-svn-ports-branches@freebsd.org Tue Oct 27 04:21:53 2020 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CF4EE43C536; Tue, 27 Oct 2020 04:21:53 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CKz7558X5z4Gds; Tue, 27 Oct 2020 04:21:53 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 940AF25C7B; Tue, 27 Oct 2020 04:21:53 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09R4LrsD021945; Tue, 27 Oct 2020 04:21:53 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09R4LrhG021944; Tue, 27 Oct 2020 04:21:53 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202010270421.09R4LrhG021944@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Tue, 27 Oct 2020 04:21:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r553412 - branches/2020Q4/math/vtk6/files X-SVN-Group: ports-branches X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: branches/2020Q4/math/vtk6/files X-SVN-Commit-Revision: 553412 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Oct 2020 04:21:53 -0000 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,