Update 5.0.0

4 files changed, 70 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9864f4b3d4de..ca52487f089e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Wed Feb 24 05:17:21 UTC 2016
 pkgbase = paraview-manta
 	pkgdesc = Parallel Visualization Application using VTK (with MantaView plugin)
-	pkgver = 4.4.0
+	pkgver = 5.0.0
 	pkgrel = 1
 	url = http://www.paraview.org
 	arch = i686
@@ -8,12 +10,12 @@ pkgbase = paraview-manta
 	license = custom
 	makedepends = cmake
 	makedepends = mesa
-	depends = qtwebkit
+	depends = qt5-tools
 	depends = openmpi
 	depends = python2
-	depends = ffmpeg-compat
+	depends = ffmpeg
 	depends = boost
-	depends = libcgns-paraview
+	depends = cgns
 	depends = expat
 	depends = freetype2
 	depends = hdf5
@@ -28,12 +30,16 @@ pkgbase = paraview-manta
 	optdepends = python2-numpy: Needed for using some filters such as "Python Calculator"
 	provides = paraview
 	conflicts = paraview
-	source = http://paraview.org/files/v4.4/ParaView-v4.4.0-source.tar.gz
+	source = http://paraview.org/files/v5.0/ParaView-v5.0.0-source.tar.gz
 	source = paraview.png
 	source = paraview.desktop
-	sha1sums = 276fc91f2a7aec72b7740c5312b560cc76157370
+	source = paraview_32bit.patch
+	source = 0001-find_hdf5.patch
+	sha1sums = 909da124e13a385ce4bfb5afd4d0089aa5271904
 	sha1sums = a2dff014e1235dfaa93cd523286f9c97601d3bbc
 	sha1sums = 1f94c8ff79bb2bd2c02d6b403ea1f4599616531b
+	sha1sums = c25134330c582371e1009b51445cdb435144b53f
+	sha1sums = 3f8701c349194cff12f5d1104fbc070a52dd3da1
 
 pkgname = paraview-manta
 
diff --git a/0001-find_hdf5.patch b/0001-find_hdf5.patch
new file mode 100644
index 000000000000..731a28b6f91e
--- /dev/null
+++ b/0001-find_hdf5.patch
@@ -0,0 +1,10 @@
+--- VTK/ThirdParty/netcdf/vtknetcdf/CMakeLists.txt	2015-10-01 16:27:10.529402587 +0200
++++ VTK/ThirdParty/netcdf/vtknetcdf/CMakeLists.txt.new	2015-10-01 16:26:47.586013737 +0200
+@@ -229,6 +229,7 @@
+ SET(CXX NETCDF_ENABLE_CXX)
+ 
+ # NetCDF4 needs HDF5 HL support. Check that's available.
++find_package(HDF5 REQUIRED)
+ set (USE_NETCDF4 OFF)
+ if (NOT VTK_USE_SYSTEM_HDF5)
+   # using VTK's HDF5, we always build that with HL support.
diff --git a/PKGBUILD b/PKGBUILD
index 1f43d3f402ac..fc12a52b40d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,18 @@
-# Maintainer:  <gucong@gc-desktop>
+# Maintainer: George Eleftheriou <eleftg>
+# Contributor: Mathias Anselmann <mathias.anselmann@gmail.com>
+# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Michele Mocciola <mickele>
+# Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name>
 
 pkgname=paraview-manta
-pkgver=4.4.0
+pkgver=5.0.0
 pkgrel=1
 pkgdesc='Parallel Visualization Application using VTK (with MantaView plugin)'
 arch=('i686' 'x86_64')
 url='http://www.paraview.org'
 license=('custom')
-depends=('qtwebkit' 'openmpi' 'python2' 'ffmpeg-compat' 'boost' 'libcgns-paraview'
+depends=('qt5-tools' 'openmpi' 'python2' 'ffmpeg' 'boost' 'cgns'
 	 'expat' 'freetype2' 'hdf5' 'libjpeg' 'libxml2' 'libtheora' 'libpng' 'libtiff' 'zlib' 'manta')
 makedepends=('cmake' 'mesa')
 optdepends=('python2-matplotlib: Needed to support equation rendering using MathText markup language'
@@ -17,14 +22,24 @@ provides=('paraview')
 source=("http://paraview.org/files/v${pkgver:0:3}/ParaView-v${pkgver}-source.tar.gz"
 	    'paraview.png'
 	    'paraview.desktop'
-       )
-sha1sums=('276fc91f2a7aec72b7740c5312b560cc76157370'
+	    'paraview_32bit.patch'
+	    '0001-find_hdf5.patch')
+sha1sums=('909da124e13a385ce4bfb5afd4d0089aa5271904'
           'a2dff014e1235dfaa93cd523286f9c97601d3bbc'
-          '1f94c8ff79bb2bd2c02d6b403ea1f4599616531b')
+          '1f94c8ff79bb2bd2c02d6b403ea1f4599616531b'
+          'c25134330c582371e1009b51445cdb435144b53f'
+          '3f8701c349194cff12f5d1104fbc070a52dd3da1')
 
 prepare() {
   cd "${srcdir}/ParaView-v${pkgver}-source"
 
+  patch -p1 -i ../paraview_32bit.patch
+  
+  # Find HDF before the check (for NetCDF)
+  patch "VTK/ThirdParty/netcdf/vtknetcdf/CMakeLists.txt" \
+    "../0001-find_hdf5.patch"
+
+  
   rm -rf "${srcdir}/build"
   mkdir "${srcdir}/build"
   cd "${srcdir}/build"
@@ -46,11 +61,15 @@ build() {
 
    # flags to use ffmpeg-compat instead of ffmpeg until
    # http://paraview.org/Bug/view.php?id=14215 gets fixed
-   local ffmpeg_compat_flags="-DFFMPEG_INCLUDE_DIR:PATH=/usr/include/ffmpeg-compat \
-   	 -DFFMPEG_avcodec_LIBRARY=/usr/lib/ffmpeg-compat/libavcodec.so \
-   	 -DFFMPEG_avformat_LIBRARY=/usr/lib/ffmpeg-compat/libavformat.so \
-   	 -DFFMPEG_avutil_LIBRARY=/usr/lib/ffmpeg-compat/libavutil.so \
-   	 -DFFMPEG_swscale_LIBRARY=/usr/lib/ffmpeg-compat/libswscale.so"
+   local ffmpeg_system_flags="-DFFMPEG_INCLUDE_DIR:PATH=/usr/include/ \
+   	 -DFFMPEG_avcodec_LIBRARY=/usr/lib/libavcodec.so \
+   	 -DFFMPEG_avformat_LIBRARY=/usr/lib/libavformat.so \
+   	 -DFFMPEG_avutil_LIBRARY=/usr/lib/libavutil.so \
+   	 -DFFMPEG_swscale_LIBRARY=/usr/lib/libswscale.so"
+
+   local manta_system_flags="-DPARAVIEW_BUILD_PLUGIN_MantaView:BOOL=ON \
+     -DMANTA_BUILD:PATH=/usr/ \
+     -DMANTA_SOURCE:PATH=/usr/include/"
 
    # enable when http://paraview.org/Bug/view.php?id=12852 gets fixed:
    #-DCMAKE_SKIP_RPATH:BOOL=YES \
@@ -66,15 +85,15 @@ build() {
    -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \
    -DPARAVIEW_USE_MPI:BOOL=ON \
    -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON \
-   -DQT_HELP_GENERATOR:FILEPATH=/usr/lib/qt4/bin/qhelpgenerator \
-   -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
+   -DPARAVIEW_QT_VERSION=5 \
+   -DVTK_QT_VERSION=5 \
+   -DQT_HELP_GENERATOR:FILEPATH=/usr/lib/qt/bin/qhelpgenerator \
+   -DQT_QMAKE_EXECUTABLE=qmake-qt5 \
    -DVISIT_BUILD_READER_CGNS:BOOL=ON \
-   -DPARAVIEW_BUILD_PLUGIN_MantaView:BOOL=ON \
-   -DMANTA_BUILD:PATH=/usr \
-   -DMANTA_SOURCE:PATH=/usr/include \
    ${cmake_system_flags} \
    ${cmake_system_python_flags} \
-   ${ffmpeg_compat_flags} \
+   ${ffmpeg_system_flags} \
+   ${manta_system_flags} \
    ../ParaView-v${pkgver}-source
 
    make
diff --git a/paraview_32bit.patch b/paraview_32bit.patch
new file mode 100644
index 000000000000..7968334142d8
--- /dev/null
+++ b/paraview_32bit.patch
@@ -0,0 +1,12 @@
+diff -Naur ParaView-v4.4.0-source_org/Utilities/VisItBridge/databases/paraDIS/paraDIS_lib/paradis.C ParaView-v4.4.0-source/Utilities/VisItBridge/databases/paraDIS/paraDIS_lib/paradis.C
+--- ParaView-v4.4.0-source_org/Utilities/VisItBridge/databases/paraDIS/paraDIS_lib/paradis.C	2015-09-11 19:58:54.000000000 +0200
++++ ParaView-v4.4.0-source/Utilities/VisItBridge/databases/paraDIS/paraDIS_lib/paradis.C	2015-12-09 09:24:56.260264846 +0100
+@@ -762,7 +762,7 @@
+     if (mNeighborSegments.size() < 4) 
+       return crossarms; 
+ 
+-   vector<Arm*> armpair(2,NULL); 
++   vector<Arm*> armpair(2,(Arm*)NULL); 
+     vector<bool> matched(mNeighborSegments.size(), false); 
+     // first, identify looped cross arms
+     for (uint32_t segnum = 0; segnum < mNeighborSegments.size()-1; segnum++) {