upgpkg: paraview 5.1.2-3

patch for coexistence of vtk and paraview (libhdf5.settings bug)

3 files changed, 52 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d012627b3bc1..e6a95848f51b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Oct  6 11:47:30 UTC 2016
+# Thu Oct 13 15:40:32 UTC 2016
 pkgbase = paraview
 	pkgdesc = Parallel Visualization Application using VTK
 	pkgver = 5.1.2
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.paraview.org
 	arch = i686
 	arch = x86_64
@@ -31,9 +31,11 @@ pkgbase = paraview
 	source = http://paraview.org/files/v5.1/ParaView-v5.1.2.tar.gz
 	source = paraview_32bit.patch
 	source = paraview-desktop.patch
+	source = vtk_hdf5_internal.patch
 	sha1sums = 449f104090b1fa84d1ee4b852dbfc6269cba9db4
 	sha1sums = c25134330c582371e1009b51445cdb435144b53f
 	sha1sums = d7da23daca34cd015294c4d2f702cdc4a81f0853
+	sha1sums = cbadaa87cd775d1edb1dbc1db4dedb9f3cdc4fd5
 
 pkgname = paraview
 
diff --git a/PKGBUILD b/PKGBUILD
index 53b507394fd4..9f97c5ec88d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=paraview
 pkgver=5.1.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Parallel Visualization Application using VTK'
 arch=('i686' 'x86_64')
 url='http://www.paraview.org'
@@ -20,16 +20,20 @@ optdepends=('python2-matplotlib: Needed to support equation rendering using Math
 	        'python2-numpy: Needed for using some filters such as "Python Calculator"')
 source=("http://paraview.org/files/v${pkgver:0:3}/ParaView-v${pkgver}.tar.gz"
 	    'paraview_32bit.patch'
-	    'paraview-desktop.patch')
+	    'paraview-desktop.patch'
+	    'vtk_hdf5_internal.patch')
 sha1sums=('449f104090b1fa84d1ee4b852dbfc6269cba9db4'
 	  'c25134330c582371e1009b51445cdb435144b53f'
-	  'd7da23daca34cd015294c4d2f702cdc4a81f0853')
+	  'd7da23daca34cd015294c4d2f702cdc4a81f0853'
+	  'cbadaa87cd775d1edb1dbc1db4dedb9f3cdc4fd5')
 
 prepare() {
   cd "${srcdir}/ParaView-v${pkgver}"
   patch -p1 -i ../paraview_32bit.patch
   
   patch -p1 -i ../paraview-desktop.patch
+  
+  patch -p1 -i ../vtk_hdf5_internal.patch
 
   rm -rf "${srcdir}/build"
   mkdir "${srcdir}/build"
@@ -84,6 +88,8 @@ build() {
    ../ParaView-v${pkgver}
 
    make
+   
+   #sed -i 's/share\/cmake\/hdf5/share\/cmake\/hdf5_paraview/g' VTK/ThirdParty/hdf5/vtkhdf5/cmake_install.cmake
 }
 
 package() {
diff --git a/vtk_hdf5_internal.patch b/vtk_hdf5_internal.patch
new file mode 100644
index 000000000000..839881f6b811
--- /dev/null
+++ b/vtk_hdf5_internal.patch
@@ -0,0 +1,39 @@
+diff -Naur ParaView-v5.1.2_org/VTK/ThirdParty/hdf5/vtkhdf5/CMakeInstallation.cmake ParaView-v5.1.2/VTK/ThirdParty/hdf5/vtkhdf5/CMakeInstallation.cmake
+--- ParaView-v5.1.2_org/VTK/ThirdParty/hdf5/vtkhdf5/CMakeInstallation.cmake	2016-07-26 21:52:16.000000000 +0200
++++ ParaView-v5.1.2/VTK/ThirdParty/hdf5/vtkhdf5/CMakeInstallation.cmake	2016-10-13 17:01:06.326836570 +0200
+@@ -58,7 +58,7 @@
+   )
+   install (
+       FILES ${HDF5_BINARY_DIR}/CMakeFiles/FindHDF5${HDF_PACKAGE_EXT}.cmake
+-      DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE}
++      DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE}_paraview
+       COMPONENT configinstall
+   )
+ endif (NOT HDF5_EXTERNALLY_CONFIGURED)
+@@ -73,7 +73,7 @@
+   )
+   install (
+       FILES ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config.cmake
+-      DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE}
++      DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE}_paraview
+       COMPONENT configinstall
+   )
+ endif (NOT HDF5_EXTERNALLY_CONFIGURED)
+@@ -88,7 +88,7 @@
+   )
+   install (
+       FILES ${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-config-version.cmake
+-      DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE}
++      DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE}_paraview
+       COMPONENT configinstall
+   )
+ endif (NOT HDF5_EXTERNALLY_CONFIGURED)
+@@ -107,7 +107,7 @@
+ )
+ install (
+     FILES ${HDF5_BINARY_DIR}/libhdf5.settings
+-    DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE}
++    DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE}_paraview
+     COMPONENT libraries
+ )
+