32bit compilation fix

3 files changed, 23 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc7440162b68..2fb16ef53508 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = paraview
 	pkgdesc = Parallel Visualization Application using VTK
 	pkgver = 4.4.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.paraview.org
 	arch = i686
 	arch = x86_64
@@ -28,9 +28,11 @@ pkgbase = paraview
 	source = http://paraview.org/files/v4.4/ParaView-v4.4.0-source.tar.gz
 	source = paraview.png
 	source = paraview.desktop
+	source = paraview_32bit.patch
 	sha1sums = 276fc91f2a7aec72b7740c5312b560cc76157370
 	sha1sums = a2dff014e1235dfaa93cd523286f9c97601d3bbc
 	sha1sums = 1f94c8ff79bb2bd2c02d6b403ea1f4599616531b
+	sha1sums = c25134330c582371e1009b51445cdb435144b53f
 
 pkgname = paraview
 
diff --git a/PKGBUILD b/PKGBUILD
index 61c5b60292d5..d4e4bfa9146f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=paraview
 pkgver=4.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Parallel Visualization Application using VTK'
 arch=('i686' 'x86_64')
 url='http://www.paraview.org'
@@ -19,13 +19,18 @@ 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}-source.tar.gz"
 	    'paraview.png'
-	    'paraview.desktop')
+	    'paraview.desktop'
+	    'paraview_32bit.patch')
 sha1sums=('276fc91f2a7aec72b7740c5312b560cc76157370'
           'a2dff014e1235dfaa93cd523286f9c97601d3bbc'
-          '1f94c8ff79bb2bd2c02d6b403ea1f4599616531b')
+          '1f94c8ff79bb2bd2c02d6b403ea1f4599616531b'
+	  'c25134330c582371e1009b51445cdb435144b53f')
 
 prepare() {
   cd "${srcdir}/ParaView-v${pkgver}-source"
+
+  patch -p1 -i ../paraview_32bit.patch
+
   
   rm -rf "${srcdir}/build"
   mkdir "${srcdir}/build"
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++) {