[arch-commits] Commit in vtk/trunk (PKGBUILD freetype.diff)

[Andrzej Giniewicz]

    Date: Friday, January 31, 2014 @ 15:18:30
  Author: aginiewicz
Revision: 105094

upgpkg: vtk 5.10.1-11

vtk: rebuild for recent changes in freetype

Added:
  vtk/trunk/freetype.diff
Modified:
  vtk/trunk/PKGBUILD

---------------+
 PKGBUILD      |   11 +++++++----
 freetype.diff |   16 ++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-31 12:59:35 UTC (rev 105093)
+++ PKGBUILD	2014-01-31 14:18:30 UTC (rev 105094)
@@ -12,13 +12,13 @@
 
 pkgname=vtk
 pkgver=5.10.1
-pkgrel=10
+pkgrel=11
 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.'
 arch=('i686' 'x86_64')
 url='http://www.vtk.org/'
 license=('BSD')
 depends=('libjpeg-turbo' 'boost' 'ffmpeg' 'qt4' 'lesstif' 'mariadb' 'hdf5' 'libgl')
-makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa-libgl' 'python2' 'tk')
+makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa-libgl' 'python2' 'tk' 'wget')
 optdepends=('python2: python bindings'
             'java-runtime: java bindings'
             'tk: tcl bindings'
@@ -26,7 +26,8 @@
             'graphviz: drawing tools')
 source=("http://www.vtk.org/files/release/${pkgver:0:4}/vtk-${pkgver}.tar.gz"
         "http://www.vtk.org/files/release/${pkgver:0:4}/vtkdata-${pkgver}.tar.gz"
-        ffmpeg-0.8.diff ffmpeg-0.11.diff ffmpeg-2.0.diff tcl-8.6.diff python-destdir.diff)
+        ffmpeg-0.8.diff ffmpeg-0.11.diff ffmpeg-2.0.diff
+        tcl-8.6.diff python-destdir.diff freetype.diff)
 md5sums=('264b0052e65bd6571a84727113508789'
          'b6355063264cd56bcd1396c92f6ca59a'
          'e992321c9d1def6034d0fa6607b40c5a'
@@ -33,7 +34,8 @@
          '81922ea61989e5591135f233a0400694'
          '4ff5668957336709dcd096fbac102558'
          'a804a9f034e24ef1a8b28542c15ce1a1'
-         'f7aba715bcc10de93a6ecf1cd6b0c560')
+         'f7aba715bcc10de93a6ecf1cd6b0c560'
+         '1e45b3664b395c70017ff46d3370c84d')
 
 build() {
   cd "${srcdir}"/VTK$pkgver
@@ -44,6 +46,7 @@
   patch -Np1 -i "${srcdir}/ffmpeg-2.0.diff"
   patch -Np1 -i "${srcdir}/tcl-8.6.diff"
   patch -Np1 -i "${srcdir}/python-destdir.diff"
+  patch -Np1 -i "${srcdir}/freetype.diff"
 
   cd "${srcdir}"
 

Added: freetype.diff
===================================================================
--- freetype.diff	                        (rev 0)
+++ freetype.diff	2014-01-31 14:18:30 UTC (rev 105094)
@@ -0,0 +1,16 @@
+--- VTK5.10.1/CMake/FindFREETYPE.cmake.orig	2014-01-30 12:40:11.252760741 +0100
++++ VTK5.10.1/CMake/FindFREETYPE.cmake	2014-01-30 12:40:43.235853875 +0100
+@@ -10,9 +10,11 @@
+ # also defined, but not for general use are
+ # FREETYPE_LIBRARY, where to find the FREETYPE library.
+ 
+-FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h)
++FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h
++  /usr/include/freetype2
++)
+ 
+-FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
++FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER config/ftheader.h
+   /usr/include/freetype2
+   /usr/local/include/freetype2
+   PATH_SUFFIXES freetype2