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

[Andrzej Giniewicz]

    Date: Saturday, December 6, 2014 @ 20:24:16
  Author: aginiewicz
Revision: 123547

upgpkg: vtk 6.1.0-7

vtk: use build flags to utilize more system packages, fix qt plugin path

Modified:
  vtk/trunk/PKGBUILD

----------+
 PKGBUILD |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-06 19:20:59 UTC (rev 123546)
+++ PKGBUILD	2014-12-06 19:24:16 UTC (rev 123547)
@@ -8,18 +8,18 @@
 # Contributor: Fabian Moser
 # Contributor: djscholl
 
-# Qt5: see FS#43007
+# TODO: for Qt5 see FS#43007
 
 pkgname=vtk
 pkgver=6.1.0
 _majorver=6.1
-pkgrel=6
+pkgrel=7
 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' 'qtwebkit' 'lesstif' 'mariadb' 'hdf5' 'libgl' 'gdal' 'unixodbc' 'openmpi')
-makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'python2' 'tk' 'wget' 'python2-matplotlib' 'python2-twisted')
+depends=('boost' 'ffmpeg' 'qtwebkit' 'lesstif' 'mariadb' 'gdal' 'unixodbc' 'openmpi' 'jsoncpp')
+makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'tk' 'wget' 'python2-matplotlib' 'python2-twisted')
 optdepends=('python2: python bindings'
             'java-runtime: java bindings'
             'tk: tcl bindings'
@@ -27,7 +27,7 @@
             'graphviz: drawing tools'
             'python2-matplotlib: for Matplotlib rendering'
             'python2-twisted: for vtkWeb')
-provides=('python2-autobahn') # TODO: move it from AUR to make it an optdepend of vtkWeb instead of twisted
+provides=('python2-autobahn')
 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"
@@ -63,7 +63,8 @@
 
   # flags to enable using system libs
   local cmake_system_flags=""
-  for lib in HDF5 EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA; do
+  # TODO: try to use system provided AUTOBAHN, GL2PS, XDMF2, LIBPROJ4 and NETCDF
+  for lib in HDF5 EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA TWISTED ZOPE JSONCPP; do
     cmake_system_flags+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
   done
 
@@ -107,7 +108,8 @@
   install -dv "${pkgdir}/usr/share/licenses/vtk"
   install -m644 "${srcdir}/VTK-$pkgver/Copyright.txt" "${pkgdir}/usr/share/licenses/vtk"
 
-  # Get rid of twisted and zope-interface (FS#43000), because adding them as makedepends was not enough
-  rm -rf "${pkgdir}"/usr/lib/python2.7/site-packages/{twisted,zope}
+  # Fix path of QtDesigner plugin
+  install -dv "${pkgdir}/usr/lib/qt4"
+  mv "$pkgdir"/usr/plugins "$pkgdir"/usr/lib/qt4/plugins
 }