[arch-commits] Commit in paraview/trunk (PKGBUILD paraview-vtk-freetype-2.10.3.patch)

[Bruno Pagani]

    Date: Wednesday, October 14, 2020 @ 14:27:14
  Author: archange
Revision: 723908

pdal 2.2 rebuild

Also fixes an issue with recent FreeType.

Added:
  paraview/trunk/paraview-vtk-freetype-2.10.3.patch
Modified:
  paraview/trunk/PKGBUILD

------------------------------------+
 PKGBUILD                           |   10 +++++++---
 paraview-vtk-freetype-2.10.3.patch |   18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-14 14:24:45 UTC (rev 723907)
+++ PKGBUILD	2020-10-14 14:27:14 UTC (rev 723908)
@@ -8,7 +8,7 @@
 pkgname=${_pkg}
 #-${_mpi}
 pkgver=5.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Parallel Visualization application using VTK (${_mpi} version)"
 arch=(x86_64)
 url="https://www.paraview.org"
@@ -22,9 +22,11 @@
 makedepends=(cmake boost mesa gcc-fortran ninja qt5-tools qt5-xmlpatterns eigen pegtl utf8cpp)
 conflicts=(vtk)
 source=("${url}/files/v${pkgver:0:3}/ParaView-v${pkgver/R/-R}.tar.xz"
-        paraview-cgns-4.1.patch::https://gitlab.kitware.com/paraview/paraview/-/commit/3d48a287141eb911b4888440e09c262743b4db3c.patch)
+        paraview-cgns-4.1.patch::https://gitlab.kitware.com/paraview/paraview/-/commit/3d48a287141eb911b4888440e09c262743b4db3c.patch
+        paraview-vtk-freetype-2.10.3.patch)
 sha256sums=('7653950392a0d7c0287c26f1d3a25cdbaa11baa7524b0af0e6a1a0d7d487d034'
-            '917485fbff57b922e67e40ee35d265769b05b4b62c397e4c9ce00244f5fd07ae')
+            '9760a7ba33c6f46e3cb8dc8d0e2370ee1208d759b3c8c6c304e7e4b366391a13'
+            'b547a665eaf980669b929f3a95e61cc8af4892ba3a41441ef98f8487886081ce')
 
 prepare() {
     cd ParaView-v${pkgver/R/-R}
@@ -31,6 +33,8 @@
     patch -p1 -i ../paraview-cgns-4.1.patch
     # We have a patched libharu
     sed -i "s|2.4.0|2.3.0|" VTK/ThirdParty/libharu/CMakeLists.txt
+    # https://bugs.archlinux.org/task/68244
+    patch -Np1 -i ../paraview-vtk-freetype-2.10.3.patch
 }
 
 build() {

Added: paraview-vtk-freetype-2.10.3.patch
===================================================================
--- paraview-vtk-freetype-2.10.3.patch	                        (rev 0)
+++ paraview-vtk-freetype-2.10.3.patch	2020-10-14 14:27:14 UTC (rev 723908)
@@ -0,0 +1,18 @@
+diff --git a/VTK/ThirdParty/freetype/vtk_freetype.h.in b/VTK/ThirdParty/freetype/vtk_freetype.h.in
+index c3f6f4f3..fd525e55 100644
+--- a/VTK/ThirdParty/freetype/vtk_freetype.h.in
++++ b/VTK/ThirdParty/freetype/vtk_freetype.h.in
+@@ -20,6 +20,13 @@
+ 
+ #ifdef VTK_USE_SYSTEM_FREETYPE
+ # include <ft2build.h>
++#ifndef FT_CALLBACK_DEF
++#ifdef __cplusplus
++#define FT_CALLBACK_DEF( x )  extern "C"  x
++#else
++#define FT_CALLBACK_DEF( x )  static  x
++#endif
++#endif /* FT_CALLBACK_DEF */
+ #else
+ # include <vtkfreetype/include/ft2build.h>
+ #endif