GNU bug report logs - #46989
[PATCH] gnu: vtk: Fix build failure.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 46989 in the body.
You can then email your comments to 46989 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Felix Gruber <felgru <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH] gnu: vtk: Fix build failure.
Date: Sun,  7 Mar 2021 15:32:33 +0100

* 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 <vkor <at> vkten.in>
 # Copyright © 2020 Nicolò Balzarotti <nicolo <at> nixo.xyz>
 # Copyright © 2020 Michael Rohleder <mike <at> rohleder.de>
-# Copyright © 2020 Felix Gruber <felgru <at> posteo.net>
+# Copyright © 2020, 2021 Felix Gruber <felgru <at> posteo.net>
 # Copyright © 2020 Ryan Prior <rprior <at> protonmail.com>
 # Copyright © 2020 Jan Wielkiewicz <tona_kosmicznego_smiecia <at> interia.pl>
 # Copyright © 2020 Brice Waegeneire <brice <at> waegenei.re>
@@ -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 <mail <at> ambrevar.xyz>
 ;;; Copyright © 2020 Brendan Tildesley <mail <at> brendan.scot>
 ;;; Copyright © 2021 Oleh Malyi <astroclubzp <at> gmail.com>
+;;; Copyright © 2021 Felix Gruber <felgru <at> posteo.net>
 ;;;
 ;;; 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 <ben.boeckel <at> kitware.com>
+
+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

Message #10 received at 46989-done <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Felix Gruber <felgru <at> posteo.net>
Cc: 46989-done <at> debbugs.gnu.org
Subject: Re: [bug#46989] [PATCH] gnu: vtk: Fix build failure.
Date: Tue, 9 Mar 2021 23:00:39 +0200

[Message part 1 (text/plain, inline)]

Thanks! Patch pushed.

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

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.