Date: Thursday, October 8, 2015 @ 21:46:02
  Author: anatolik
Revision: 143436

upgpkg: vtk 6.3.0-3

 - Agressively move dependencies into optdepends=(). VTK has modular structure 
and most of these modules optional.
 - Compile VTK with Qt5 FS#43007

Modified:
  vtk/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2015-10-08 18:29:36 UTC (rev 143435)
+++ PKGBUILD    2015-10-08 19:46:02 UTC (rev 143436)
@@ -3,18 +3,16 @@
 # Contributor: Andrzej Giniewicz <[email protected]>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 
-# TODO: for Qt5 see FS#43007
-
 pkgname=vtk
 pkgver=6.3.0
 _majorver=6.3
-pkgrel=2
+pkgrel=3
 pkgdesc='A software system for 3D computer graphics, image processing, and 
visualization'
 arch=('i686' 'x86_64')
 url='http://www.vtk.org/'
 license=('BSD')
-depends=('boost-libs' 'ffmpeg' 'qtwebkit' 'lesstif' 'jsoncpp')
-makedepends=('boost' 'cmake' 'java-environment' 'doxygen' 'gnuplot' 'tk' 
'wget' 'python2-matplotlib' 'python2-twisted' 'python2-mpi4py' 
'python2-autobahn' 'unixodbc' 'gdal' 'openmpi' 'mariadb' 'glew' 'gl2ps')
+depends=('gcc-libs')
+makedepends=('boost' 'cmake' 'java-environment' 'doxygen' 'gnuplot' 'tk' 
'wget' 'python2-matplotlib' 'python2-twisted' 'python2-mpi4py' 
'python2-autobahn' 'unixodbc' 'gdal' 'openmpi' 'mariadb' 'glew' 'gl2ps' 
'ffmpeg' 'lesstif' 'qt5-base' 'jsoncpp')
 optdepends=('python2: python bindings'
             'java-runtime: java bindings'
             'tk: tcl bindings'
@@ -72,6 +70,8 @@
   local cmake_system_flags=""
   # TODO: try to use system provided XDMF2, XDMF3, LIBPROJ4 NETCDF
   # VTK fails to compile with recent netcdf-cxx package, VTK should be ported 
to the latest API
+  # VTK does not work with XDMF2 compiled from git. TODO: make vtk compatible 
with system XDMF library. 
+  # Note: VTK explicitly disables system GLEW dependency, it uses embedded 
sources with modifications
   for lib in HDF5 EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA TWISTED 
ZOPE SIX AUTOBAHN MPI4PY JSONCPP GLEW GL2PS; do
     cmake_system_flags+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
   done
@@ -91,7 +91,7 @@
     -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \
     -DVTK_BUILD_ALL_MODULES:BOOL=ON \
     -DVTK_USE_LARGE_DATA:BOOL=ON \
-    -DVTK_QT_VERSION:STRING="4" \
+    -DVTK_QT_VERSION:STRING="5" \
     -DVTK_WRAP_JAVA:BOOL=ON \
     -DVTK_WRAP_PYTHON:BOOL=ON \
     -DVTK_WRAP_TCL:BOOL=ON \
@@ -121,7 +121,7 @@
   install -m644 "${srcdir}/VTK-$pkgver/Copyright.txt" 
"${pkgdir}/usr/share/licenses/vtk"
 
   # Fix path of QtDesigner plugin
-  install -dv "${pkgdir}/usr/lib/qt4"
-  mv "$pkgdir"/usr/plugins "$pkgdir"/usr/lib/qt4/plugins
+  install -dv "${pkgdir}/usr/lib/qt5"
+  mv "$pkgdir"/usr/plugins "$pkgdir"/usr/lib/qt5/plugins
 }
 

Reply via email to