Subject: bug#46989: closed (Re: [bug#46989] [PATCH] gnu: vtk: Fix build failure.)

From: [email-masked] (GNU bug Tracking System)
Date: Tue, 09 Mar 2021 21:02:02 +0000

Your bug report

#46989: [PATCH] gnu: vtk: Fix build failure.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
46989: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=46989
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#46989] [PATCH] gnu: vtk: Fix build failure.
From: Efraim Flashner <[email-masked]>
To: Felix Gruber <[email-masked]>
Cc: [email-masked]
Date: Tue, 9 Mar 2021 23:00:39 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Thanks! Patch pushed.

-- 
Efraim Flashner   <[email-masked]>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

Subject: [PATCH] gnu: vtk: Fix build failure.
From: Felix Gruber <[email-masked]>
To: [email-masked]
Cc: Felix Gruber <[email-masked]>
Date: Sun, 7 Mar 2021 15:32:33 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/image-processing.scm (vtk): Fix build failure.
[source]: Add patch to fix build failure with recent versions of freetype.
* gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                  |  3 +-
 gnu/packages/image-processing.scm             |  3 ++
 .../vtk-fix-freetypetools-build-failure.patch | 36 +++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index fb3b395852..2d2cba3f95 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -31,7 +31,7 @@
 # Copyright © 2020 R Veera Kumar <[email-masked]>
 # Copyright © 2020 Nicolò Balzarotti <[email-masked]>
 # Copyright © 2020 Michael Rohleder <[email-masked]>
-# Copyright © 2020 Felix Gruber <[email-masked]>
+# Copyright © 2020, 2021 Felix Gruber <[email-masked]>
 # Copyright © 2020 Ryan Prior <[email-masked]>
 # Copyright © 2020 Jan Wielkiewicz <[email-masked]>
 # Copyright © 2020 Brice Waegeneire <[email-masked]>
@@ -1718,6 +1718,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/vsearch-unbundle-cityhash.patch		\
   %D%/packages/patches/vte-CVE-2012-2738-pt1.patch			\
   %D%/packages/patches/vte-CVE-2012-2738-pt2.patch			\
+  %D%/packages/patches/vtk-fix-freetypetools-build-failure.patch	\
   %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch	\
   %D%/packages/patches/webkitgtk-share-store.patch		\
   %D%/packages/patches/webkitgtk-bind-all-fonts.patch		\
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 5dfd18d1bd..6f4576b8b9 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2020 Pierre Neidhardt <[email-masked]>
 ;;; Copyright © 2020 Brendan Tildesley <[email-masked]>
 ;;; Copyright © 2021 Oleh Malyi <[email-masked]>
+;;; Copyright © 2021 Felix Gruber <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -254,6 +255,8 @@ many popular formats.")
               (sha256
                (base32
                 "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl"))
+              (patches
+               (search-patches "vtk-fix-freetypetools-build-failure.patch"))
               (modules '((guix build utils)))
               (snippet
                '(begin
diff --git a/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch b/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch
new file mode 100644
index 0000000000..6988e65872
--- /dev/null
+++ b/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch
@@ -0,0 +1,36 @@
+This fixes a build failure in VTK when building against recent versions
+of freetype.
+
+  https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7432
+
+Patch by Ben Boeckel <[email-masked]>
+
+Subject: [PATCH] vtkFreeTypeTools: avoid using an internal macro
+
+This macro has been removed upstream as it was always intended to be
+private.
+---
+ Rendering/FreeType/vtkFreeTypeTools.cxx | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/Rendering/FreeType/vtkFreeTypeTools.cxx b/Rendering/FreeType/vtkFreeTypeTools.cxx
+index c54289dc60..03b899c4da 100644
+--- a/Rendering/FreeType/vtkFreeTypeTools.cxx
++++ b/Rendering/FreeType/vtkFreeTypeTools.cxx
+@@ -387,11 +387,8 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMapCache()
+ }
+ 
+ //----------------------------------------------------------------------------
+-FT_CALLBACK_DEF(FT_Error)
+-vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id,
+-                              FT_Library lib,
+-                              FT_Pointer request_data,
+-                              FT_Face* face)
++static FT_Error vtkFreeTypeToolsFaceRequester(
++  FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face)
+ {
+ #if VTK_FTFC_DEBUG_CD
+   printf("vtkFreeTypeToolsFaceRequester()\n");
+-- 
+2.30.1
+
-- 
2.30.1