[arch-commits] Commit in vtk/trunk (PKGBUILD vtk-type.patch)

[Jan de Groot]

    Date: Friday, February 27, 2015 @ 15:40:42
  Author: jgc
Revision: 128365

upgpkg: vtk 6.1.0-8

jsoncpp rebuild

Added:
  vtk/trunk/vtk-type.patch
Modified:
  vtk/trunk/PKGBUILD

----------------+
 PKGBUILD       |    8 +++++---
 vtk-type.patch |   23 +++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-27 14:00:58 UTC (rev 128364)
+++ PKGBUILD	2015-02-27 14:40:42 UTC (rev 128365)
@@ -13,7 +13,7 @@
 pkgname=vtk
 pkgver=6.1.0
 _majorver=6.1
-pkgrel=7
+pkgrel=8
 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.'
 arch=('i686' 'x86_64')
 url='http://www.vtk.org/'
@@ -31,13 +31,14 @@
 source=("http://www.vtk.org/files/release/${_majorver}/VTK-${pkgver}.tar.gz"
         "http://www.vtk.org/files/release/${_majorver}/VTKData-${pkgver}.tar.gz"
         "http://www.vtk.org/files/release/${_majorver}/VTKLargeData-${pkgver}.tar.gz"
-        mesa.diff hdf5.diff)
+        mesa.diff hdf5.diff vtk-type.patch)
 options=(staticlibs)
 md5sums=('25e4dfb3bad778722dcaec80cd5dab7d'
          'f82c8fe151279c0422ab8a6cfe991c94'
          '5bc47885923ef30e3ac77fcdf6d4e599'
          '381921f3169facf5d6ef22de3cb3fbe5'
-         '1cf6b69312ed424a3595c3c11c82750d')
+         '1cf6b69312ed424a3595c3c11c82750d'
+         'ec131e2c51b826d75bd996a410745279')
 
 prepare() {
   cd "${srcdir}"/VTK-$pkgver
@@ -45,6 +46,7 @@
   # fix compilation errors:
   patch -Np1 -i "${srcdir}/mesa.diff"
   patch -Np1 -i "${srcdir}/hdf5.diff"
+  patch -Np1 -i "${srcdir}/vtk-type.patch"
 
   sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
       -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \

Added: vtk-type.patch
===================================================================
--- vtk-type.patch	                        (rev 0)
+++ vtk-type.patch	2015-02-27 14:40:42 UTC (rev 128365)
@@ -0,0 +1,23 @@
+diff -up VTK-6.1.0/Rendering/FreeType/vtkFreeTypeTools.cxx.type VTK-6.1.0/Rendering/FreeType/vtkFreeTypeTools.cxx
+--- VTK-6.1.0/Rendering/FreeType/vtkFreeTypeTools.cxx.type	2014-01-22 08:55:41.000000000 -0700
++++ VTK-6.1.0/Rendering/FreeType/vtkFreeTypeTools.cxx	2015-01-08 15:00:40.492667074 -0700
+@@ -1186,7 +1186,7 @@ bool vtkFreeTypeTools::CalculateBounding
+     if (bitmap)
+       {
+       metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent);
+-      metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)),
++      metaData.descent = std::min(-(static_cast<int>(bitmap->rows) - (bitmapGlyph->top - 1)),
+                                   metaData.descent);
+       }
+     ++heightString;
+@@ -1951,8 +1951,8 @@ void vtkFreeTypeTools::GetLineMetrics(T
+     if (bitmap)
+       {
+       bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left);
+-      bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width);
+-      bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows);
++      bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast<int>(bitmap->width));
++      bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast<int>(bitmap->rows));
+       bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1);
+       }
+     else