summaryrefslogtreecommitdiff
path: root/community/paraview
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-02-10 23:15:14 +0000
committerroot <root@rshg054.dnsready.net>2012-02-10 23:15:14 +0000
commit9d1489b877a1fa7c2674cf1f744804db42d93bfc (patch)
tree33f1f96e0a8a2cc9a6a2939dfa0517a2ea47dcce /community/paraview
parent4bc61018eec54dbe50e7556ce01d2ef2859b2c9f (diff)
Fri Feb 10 23:15:14 UTC 2012
Diffstat (limited to 'community/paraview')
-rw-r--r--community/paraview/PKGBUILD17
-rw-r--r--community/paraview/fix-build-with-zlib-1.2.6.diff36
2 files changed, 49 insertions, 4 deletions
diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD
index 32fce25f2..fb95c3280 100644
--- a/community/paraview/PKGBUILD
+++ b/community/paraview/PKGBUILD
@@ -4,23 +4,28 @@
pkgname=paraview
pkgver=3.12.0
-pkgrel=3
+pkgrel=5
pkgdesc='Parallel Visualization Application using VTK'
arch=('i686' 'x86_64')
url='http://www.paraview.org'
license=('custom')
-depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'hdf5' 'libcgns2' 'libtiff' 'libtheora')
+depends=('qt' 'python2' 'libgl' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'libcgns2'
+ # The following is a list of libraries we explicitly tell cmake to use the system library of
+ 'hdf5' 'freetype2' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'expat' 'libxml2' 'libtheora'
+ )
makedepends=('cmake' 'desktop-file-utils' 'boost')
source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz"
'paraview.png'
'paraview.desktop'
'fix-boost-graph-api-changes.diff'
- '12859-VisItBrige-external-tiff-support.diff')
+ '12859-VisItBrige-external-tiff-support.diff'
+ 'fix-build-with-zlib-1.2.6.diff')
md5sums=('8feabc6261e2060648eaac593d85b1de'
'db623002bc71a257ddfdd0c9c7b14c3f'
'4e4b7172ed18171c37446fd7c4f1e8f5'
'2aa5b98288cadd201ffbd057f18929b0'
- '9321279c8fc6f289a7cf228648edcb5f')
+ '9321279c8fc6f289a7cf228648edcb5f'
+ 'e4506b4ed0d2ae60072388f098be6c33')
build() {
cd ParaView-${pkgver}/VTK
@@ -32,6 +37,10 @@ build() {
# fix http://paraview.org/Bug/view.php?id=12849 remove on next pkgver bump
patch -Np1 -i ${srcdir}/12859-VisItBrige-external-tiff-support.diff
+ cd ${srcdir}/ParaView-${pkgver}
+ # fix http://paraview.org/Bug/view.php?id=12924
+ patch -Np0 -i ${srcdir}/fix-build-with-zlib-1.2.6.diff
+
mkdir ${srcdir}/build
cd ${srcdir}/build
diff --git a/community/paraview/fix-build-with-zlib-1.2.6.diff b/community/paraview/fix-build-with-zlib-1.2.6.diff
new file mode 100644
index 000000000..6540de045
--- /dev/null
+++ b/community/paraview/fix-build-with-zlib-1.2.6.diff
@@ -0,0 +1,36 @@
+--- Utilities/VisItBridge/databases/BOV/avtBOVFileFormat.C.original 2012-02-09 16:22:56.420371795 +0000
++++ Utilities/VisItBridge/databases/BOV/avtBOVFileFormat.C 2012-02-09 16:25:59.652228526 +0000
+@@ -703,10 +703,10 @@
+ {
+ // Read past the specified offset.
+ if(byteOffset > 0)
+- gzseek(gz_handle, byteOffset, SEEK_SET);
++ gzseek((gzFile)gz_handle, byteOffset, SEEK_SET);
+
+ // Read the whole dataset
+- gzread(gz_handle, whole_buff, whole_nelem * unit_size);
++ gzread((gzFile)gz_handle, whole_buff, whole_nelem * unit_size);
+ }
+ else
+ {
+@@ -1046,9 +1046,9 @@
+ {
+ // Read past the specified offset.
+ if(byteOffset > 0)
+- gzseek(gz_handle, byteOffset, SEEK_SET);
++ gzseek((gzFile)gz_handle, byteOffset, SEEK_SET);
+
+- gzread(gz_handle, rv->GetVoidPointer(0),
++ gzread((gzFile)gz_handle, rv->GetVoidPointer(0),
+ nvals * dataNumComponents * unit_size);
+ }
+ else
+@@ -1192,7 +1192,7 @@
+ // Close the file descriptors.
+ //
+ if (gzipped)
+- gzclose(gz_handle);
++ gzclose((gzFile)gz_handle);
+ else
+ fclose(file_handle);
+