[arch-commits] Commit in labplot/trunk (PKGBUILD hdf5-1.8.patch)

[Ronald van Haren]

    Date: Tuesday, February 16, 2010 @ 10:06:54
  Author: ronald
Revision: 69056

upgpkg: labplot 1.6.0.2-6
rebuild against netcdf 4.1; add patch to fix hdf5 1.8 support

Added:
  labplot/trunk/hdf5-1.8.patch
Modified:
  labplot/trunk/PKGBUILD

----------------+
 PKGBUILD       |   18 ++++++++++-------
 hdf5-1.8.patch |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-02-16 14:03:18 UTC (rev 69055)
+++ PKGBUILD	2010-02-16 15:06:54 UTC (rev 69056)
@@ -5,23 +5,27 @@
 
 pkgname=labplot
 pkgver=1.6.0.2
-pkgrel=5
+pkgrel=6
 pkgdesc="Plotting, Data analysis and visualisation"
 arch=('i686' 'x86_64')
 url="http://staff.mbi-berlin.de/gerlach/Linux/LabPlot/"
 license=("GPL")
-depends=('kdelibs3' 'gsl' 'imagemagick>=6.5.1.9' \
-	'fftw>=3.2.1' 'netcdf>=3.6.2')
+depends=('kdelibs3' 'gsl' 'imagemagick' \
+	'fftw' 'netcdf>=4.1')
 makedepends=('libxml++>=2.26' 'audiofile')
 options=('!libtool' '!makeflags')
-source=(http://downloads.sourceforge.net/$pkgname/LabPlot-$pkgver.tar.gz define-missing-constant.patch)
-md5sums=('850256dcd02c4a8ede5b5fe3fbc21ab7' 'e8133bb7b8da63f4ae5a0b998c37b702')
-sha1sums=('2df566fa440f1afa53043c8bd8d0f84df8264b87' '0a931f2646cf8ea05c3bb85ed0bcee09cc721f42')
-# http://staff.mbi-berlin.de/gerlach/Linux/LabPlot/src/$origname-$pkgver.tar.gz)
+source=(http://downloads.sourceforge.net/$pkgname/LabPlot-$pkgver.tar.gz define-missing-constant.patch
+	'hdf5-1.8.patch')
 
+md5sums=('850256dcd02c4a8ede5b5fe3fbc21ab7' 'e8133bb7b8da63f4ae5a0b998c37b702'
+         '1d38c7304a53b238f8cecb337771ed6f')
+
+
 build() {
  cd $srcdir/LabPlot-${pkgver}
  patch -p1 < ../define-missing-constant.patch || return 1
+ patch -Np0 -i ${srcdir}/hdf5-1.8.patch || return 1
+
  # source kde3 variables
  source /etc/profile.d/kde3.sh
 

Added: hdf5-1.8.patch
===================================================================
--- hdf5-1.8.patch	                        (rev 0)
+++ hdf5-1.8.patch	2010-02-16 15:06:54 UTC (rev 69056)
@@ -0,0 +1,58 @@
+--- src.orig/FilterHDF5.cc	2009-10-15 17:33:15.736674721 +0200
++++ src/FilterHDF5.cc	2009-10-15 17:23:51.386155522 +0200
+@@ -76,7 +76,7 @@
+ 		printf(" GROUP \"%s\" \n", name);
+ 		numgroups++;
+ 
+-		hid_t group = H5Gopen(loc_id, name);
++		hid_t group = H5Gopen(loc_id, name, H5P_DEFAULT);
+ 
+ 		int nrattr = H5Aget_num_attrs(group);
+ 		printf(" GROUP has %d attributes\n",nrattr);
+@@ -129,7 +129,7 @@
+ 		printf("	DATASET \"%s\"\n", name);
+ 
+ 		hid_t dataset;
+-		dataset = H5Dopen(loc_id, name);
++		dataset = H5Dopen(loc_id, name, H5P_DEFAULT);
+ 
+ 		numsets++;
+ 		data.resize(numsets);
+@@ -260,7 +260,7 @@
+ 
+ 						int *matrix = new int[DY];
+ 						hsize_t tdims[] = {1};
+-						hid_t s4_tid = H5Tarray_create(H5T_NATIVE_INT,1,tdims,NULL);
++						hid_t s4_tid = H5Tarray_create(H5T_NATIVE_INT,1,tdims);
+ 						hid_t s3_tid = H5Tcreate(H5T_COMPOUND, sizeof(s4_tid));
+ 						status = H5Tinsert(s3_tid, H5Tget_member_name (datatype,j), 0, s4_tid);
+ 
+@@ -279,7 +279,7 @@
+ 
+ 						float *matrix = new float[DY];
+ 						hsize_t tdims[] = {1};
+-						hid_t s4_tid = H5Tarray_create(H5T_NATIVE_FLOAT,1,tdims,NULL);
++						hid_t s4_tid = H5Tarray_create(H5T_NATIVE_FLOAT,1,tdims);
+ 						hid_t s3_tid = H5Tcreate(H5T_COMPOUND, sizeof(s4_tid));
+ 						status = H5Tinsert(s3_tid, H5Tget_member_name (datatype,j), 0, s4_tid);
+ 
+@@ -467,7 +467,7 @@
+ 	hid_t file = H5Fopen(filename.latin1(), H5F_ACC_RDONLY, H5P_DEFAULT);
+ 
+ 	printf(" ROOT GROUP :\n");
+-	hid_t group = H5Gopen(file, "/");
++	hid_t group = H5Gopen(file, "/", H5P_DEFAULT);
+ 
+ 	int nrattr = H5Aget_num_attrs(group);
+ 	attributes.resize(nrattr);
+@@ -567,7 +567,8 @@
+ 				H5Tset_order(datatype, H5T_ORDER_BE);
+ 				break;
+ 			}
+-			hid_t dataset = H5Dcreate(file,s->Title().latin1(),type,dataspace,H5P_DEFAULT);
++			hid_t dataset = H5Dcreate(file,s->Title().latin1(),type,dataspace,
++				H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ 
+ 			hid_t status;
+ 			switch(datatype) {
+