upgpkg: paraview 5.0.1-3

added patch to build against gcc-6.x

5 files changed, 57 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d0e72066ab58..0db29b9d73a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue May  3 14:15:41 UTC 2016
+# Sat May  7 15:32:44 UTC 2016
 pkgbase = paraview
 	pkgdesc = Parallel Visualization Application using VTK
 	pkgver = 5.0.1
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.paraview.org
 	arch = i686
 	arch = x86_64
@@ -16,11 +16,9 @@ pkgbase = paraview
 	depends = python2
 	depends = ffmpeg
 	depends = boost
-	depends = cgns
 	depends = glew
 	depends = expat
 	depends = freetype2
-	depends = hdf5
 	depends = libjpeg
 	depends = libxml2
 	depends = libtheora
@@ -30,17 +28,15 @@ pkgbase = paraview
 	optdepends = python2-matplotlib: Needed to support equation rendering using MathText markup language
 	optdepends = python2-numpy: Needed for using some filters such as "Python Calculator"
 	source = http://paraview.org/files/v5.0/ParaView-v5.0.1-source.tar.gz
-	source = paraview.png
-	source = paraview.desktop
 	source = paraview_32bit.patch
 	source = 0001-find_hdf5.patch
 	source = ffmpeg3_compat.patch
+	source = vtk-gcc6.patch
 	sha1sums = 3d72635df84421c2bc4d59ec4a121348966ec28f
-	sha1sums = a2dff014e1235dfaa93cd523286f9c97601d3bbc
-	sha1sums = 1f94c8ff79bb2bd2c02d6b403ea1f4599616531b
 	sha1sums = c25134330c582371e1009b51445cdb435144b53f
 	sha1sums = 3f8701c349194cff12f5d1104fbc070a52dd3da1
 	sha1sums = a78177f8dd6dedd9ad189fa12730ec53c7d02508
+	sha1sums = b9f32419d0d0b1c03dc99eae932ec1c03a936cf0
 
 pkgname = paraview
 
diff --git a/PKGBUILD b/PKGBUILD
index 458bb5d837fe..837f9d3f953b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,32 +7,29 @@
 
 pkgname=paraview
 pkgver=5.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Parallel Visualization Application using VTK'
 arch=('i686' 'x86_64')
 url='http://www.paraview.org'
 license=('custom')
-depends=('qt5-tools' 'openmpi' 'python2' 'ffmpeg' 'boost' 'cgns' 'glew'
-	 'expat' 'freetype2' 'hdf5' 'libjpeg' 'libxml2' 'libtheora' 'libpng' 'libtiff' 'zlib')
+depends=('qt5-tools' 'openmpi' 'python2' 'ffmpeg' 'boost' 'glew'
+	 'expat' 'freetype2' 'libjpeg' 'libxml2' 'libtheora' 'libpng' 'libtiff' 'zlib')
 makedepends=('cmake' 'mesa' 'gcc-fortran')
 optdepends=('python2-matplotlib: Needed to support equation rendering using MathText markup language'
 	        'python2-numpy: Needed for using some filters such as "Python Calculator"')
 source=("http://paraview.org/files/v${pkgver:0:3}/ParaView-v${pkgver}-source.tar.gz"
-	    'paraview.png'
-	    'paraview.desktop'
 	    'paraview_32bit.patch'
 	    '0001-find_hdf5.patch'
-	    'ffmpeg3_compat.patch')
+	    'ffmpeg3_compat.patch'
+	    'vtk-gcc6.patch')
 sha1sums=('3d72635df84421c2bc4d59ec4a121348966ec28f'
-          'a2dff014e1235dfaa93cd523286f9c97601d3bbc'
-          '1f94c8ff79bb2bd2c02d6b403ea1f4599616531b'
 	  'c25134330c582371e1009b51445cdb435144b53f'
 	  '3f8701c349194cff12f5d1104fbc070a52dd3da1'
-	  'a78177f8dd6dedd9ad189fa12730ec53c7d02508')
+	  'a78177f8dd6dedd9ad189fa12730ec53c7d02508'
+	  'b9f32419d0d0b1c03dc99eae932ec1c03a936cf0')
 
 prepare() {
   cd "${srcdir}/ParaView-v${pkgver}-source"
-
   patch -p1 -i ../paraview_32bit.patch
 
   # Find HDF before the check (for NetCDF)
@@ -42,6 +39,8 @@ prepare() {
   cd "${srcdir}/ParaView-v${pkgver}-source/VTK"
   
   patch -p1 -i ../../ffmpeg3_compat.patch
+  
+  patch -p1 -i ../../vtk-gcc6.patch
 
   
   rm -rf "${srcdir}/build"
@@ -106,8 +105,4 @@ package() {
 
   #Install license
   install -Dm644 "${srcdir}/ParaView-v${pkgver}-source/License_v1.2.txt" "${pkgdir}/usr/share/licenses/paraview/LICENSE"
-
-  #Install desktop shortcuts
-  install -Dm644 "${srcdir}/paraview.png" "${pkgdir}/usr/share/pixmaps/paraview.png"
-  desktop-file-install --dir="${pkgdir}"/usr/share/applications "${srcdir}/paraview.desktop"
 }
diff --git a/paraview.desktop b/paraview.desktop
deleted file mode 100644
index 40d907b6b4dc..000000000000
--- a/paraview.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=ParaView
-GenericName=Data Viewer
-Comment=ParaView allows visualization of large data sets
-Type=Application
-Terminal=false
-Icon=paraview
-Categories=Graphics;
-Exec=/usr/bin/paraview
diff --git a/paraview.png b/paraview.png
deleted file mode 100644
index 6e39f3d4f7f9..000000000000
--- a/paraview.png
+++ /dev/null
diff --git a/vtk-gcc6.patch b/vtk-gcc6.patch
new file mode 100644
index 000000000000..e7f6ce637b86
--- /dev/null
+++ b/vtk-gcc6.patch
@@ -0,0 +1,44 @@
+diff --git a/CMake/GenerateExportHeader.cmake b/CMake/GenerateExportHeader.cmake
+index ecfae31..80244df 100644
+--- a/CMake/GenerateExportHeader.cmake
++++ b/CMake/GenerateExportHeader.cmake
+@@ -163,10 +163,10 @@ endmacro()
+ macro(_test_compiler_hidden_visibility)
+ 
+   if(CMAKE_COMPILER_IS_GNUCXX)
+-    execute_process(COMMAND ${CMAKE_C_COMPILER} ARGS --version
++    execute_process(COMMAND ${CMAKE_C_COMPILER} --version
+       OUTPUT_VARIABLE _gcc_version_info
+       ERROR_VARIABLE _gcc_version_info)
+-    string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]*"
++    string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
+       _gcc_version "${_gcc_version_info}")
+     # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
+     # patch level, handle this here:
+@@ -181,7 +181,7 @@ macro(_test_compiler_hidden_visibility)
+   endif()
+ 
+   if(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
+-    execute_process(COMMAND ${CMAKE_CXX_COMPILER} ARGS -V
++    execute_process(COMMAND ${CMAKE_CXX_COMPILER} -V
+       OUTPUT_VARIABLE _intel_version_info
+       ERROR_VARIABLE _intel_version_info)
+     string(REGEX REPLACE ".*Version ([0-9]+(\\.[0-9]+)+).*" "\\1"
+diff --git a/CMake/vtkCompilerExtras.cmake b/CMake/vtkCompilerExtras.cmake
+index e39bd30..4dc928a 100644
+--- a/CMake/vtkCompilerExtras.cmake
++++ b/CMake/vtkCompilerExtras.cmake
+@@ -28,11 +28,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+   endif()
+ 
+   # Now check if we can use visibility to selectively export symbols
+-  execute_process(COMMAND ${CMAKE_C_COMPILER} ARGS --version
++  execute_process(COMMAND ${CMAKE_C_COMPILER} --version
+     OUTPUT_VARIABLE _gcc_version_info
+     ERROR_VARIABLE _gcc_version_info)
+ 
+-  string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]*"
++  string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
+     _gcc_version "${_gcc_version_info}")
+   if(NOT _gcc_version)
+     string (REGEX REPLACE ".*\\(GCC\\).*([34]\\.[0-9]).*" "\\1.0"