Update to 0.9pre5
This commit is contained in:
Orion Poplawski
parent
5b8704f8ef
commit
885a3113c7
@ -1 +1 @@
|
||||
gdl-0.9pre4.tar.gz
|
||||
gdl-0.9pre5.tar.gz
|
||||
|
||||
@ -1,94 +0,0 @@
|
||||
--- gdl-0.9pre3/src/ncdf_att_cl.cpp.const 2006-11-22 10:15:39.000000000 -0700
|
||||
+++ gdl-0.9pre3/src/ncdf_att_cl.cpp 2006-11-22 10:16:59.000000000 -0700
|
||||
@@ -237,7 +237,7 @@
|
||||
ncdf_att_handle_error(e,status,"NCDF_ATTGET",ip);
|
||||
|
||||
|
||||
- dimension dim((size_t *) &length, (size_t) 1);
|
||||
+ dimension dim((const SizeT *) &length, (SizeT) 1);
|
||||
DLongGDL* temp=new DLongGDL(dim, BaseGDL::NOZERO);
|
||||
memcpy(&(*temp)[0],&(*ip),length*sizeof(int));
|
||||
delete ip;
|
||||
@@ -255,7 +255,7 @@
|
||||
ncdf_att_handle_error(e,status,"NCDF_ATTGET",sp);
|
||||
|
||||
|
||||
- dimension dim((size_t *) &length, (size_t) 1);
|
||||
+ dimension dim((const SizeT *) &length, (SizeT) 1);
|
||||
DIntGDL* temp=new DIntGDL(dim, BaseGDL::NOZERO);
|
||||
|
||||
memcpy(&(*temp)[0],&(*sp),length*sizeof(short));
|
||||
@@ -277,7 +277,7 @@
|
||||
ncdf_att_handle_error(e,status,"NCDF_ATTGET",fp);
|
||||
|
||||
|
||||
- dimension dim((size_t *) &length, (size_t) 1);
|
||||
+ dimension dim((const SizeT *) &length, (SizeT) 1);
|
||||
DFloatGDL* temp=new DFloatGDL(dim, BaseGDL::NOZERO);
|
||||
|
||||
memcpy(&(*temp)[0],&(*fp),length*sizeof(float));
|
||||
@@ -299,7 +299,7 @@
|
||||
|
||||
ncdf_att_handle_error(e,status,"NCDF_ATTGET",dp);
|
||||
|
||||
- dimension dim((size_t *) &length, (size_t) 1);
|
||||
+ dimension dim((const SizeT *) &length, (SizeT) 1);
|
||||
DDoubleGDL* temp=new DDoubleGDL(dim, BaseGDL::NOZERO);
|
||||
|
||||
memcpy(&(*temp)[0],&(*dp),length*sizeof(double));
|
||||
@@ -339,7 +339,7 @@
|
||||
|
||||
ncdf_att_handle_error(e,status,"NCDF_ATTGET",bp);
|
||||
|
||||
- dimension dim((size_t *) &length, (size_t) 1);
|
||||
+ dimension dim((const SizeT *) &length, (SizeT) 1);
|
||||
DByteGDL* temp=new DByteGDL(dim, BaseGDL::NOZERO);
|
||||
|
||||
memcpy(&(*temp)[0],&(*bp),length*sizeof(unsigned char));
|
||||
--- gdl-0.9pre3/src/ncdf_var_cl.cpp.const 2006-11-22 07:34:57.000000000 -0700
|
||||
+++ gdl-0.9pre3/src/ncdf_var_cl.cpp 2006-11-22 10:46:03.000000000 -0700
|
||||
@@ -161,7 +161,7 @@
|
||||
DStructGDL* inq=new DStructGDL(ncdf_varinq);
|
||||
inq->InitTag("NAME",DStringGDL(var_name));
|
||||
|
||||
- dimension dim((size_t *) &var_ndims, (size_t) 1);
|
||||
+ dimension dim((const SizeT *) &var_ndims, (SizeT) 1);
|
||||
DULongGDL* dims_res = new DULongGDL(dim, BaseGDL::NOZERO);
|
||||
for( size_t i=0; i<var_ndims; ++i) {
|
||||
(*dims_res)[ i] = var_dims[i];
|
||||
@@ -271,7 +271,7 @@
|
||||
|
||||
|
||||
size_t one=1;
|
||||
- dimension dim((size_t *) &one, (size_t) 1);
|
||||
+ dimension dim((const SizeT *) &one, (SizeT) 1);
|
||||
if(var_type == NC_DOUBLE){
|
||||
|
||||
double dvar;
|
||||
@@ -436,7 +436,7 @@
|
||||
|
||||
|
||||
|
||||
- dimension dim(transposed_dim_length, var_ndims);
|
||||
+ dimension dim((const SizeT *) transposed_dim_length, (SizeT) var_ndims);
|
||||
if(var_type == NC_DOUBLE){
|
||||
double* dvar=new double[array_size];
|
||||
|
||||
@@ -631,7 +631,7 @@
|
||||
transposed_dim_length[trans[i]]=cou[i];
|
||||
array_size=array_size*cou[i];
|
||||
}
|
||||
- dimension dim(transposed_dim_length, var_ndims);
|
||||
+ dimension dim((const SizeT *) transposed_dim_length, (SizeT) var_ndims);
|
||||
if(var_type == NC_DOUBLE)
|
||||
{
|
||||
double* dvar=new double[array_size];
|
||||
@@ -818,7 +818,7 @@
|
||||
transposed_dim_length[trans[i]]=cou[i];
|
||||
array_size=array_size*cou[i];
|
||||
}
|
||||
- dimension dim(transposed_dim_length, var_ndims);
|
||||
+ dimension dim((const SizeT *) transposed_dim_length, (SizeT) var_ndims);
|
||||
|
||||
if(var_type == NC_DOUBLE)
|
||||
{
|
||||
@ -1,11 +0,0 @@
|
||||
--- gdl-0.9pre3/configure.python25 2006-11-22 07:58:06.000000000 -0700
|
||||
+++ gdl-0.9pre3/configure 2006-12-18 14:01:50.000000000 -0700
|
||||
@@ -20135,7 +20135,7 @@
|
||||
queryfile=$ac_confdir/query_version.py
|
||||
echo # tmp file auto (re)generated by GDL configure. Please delete > $queryfile
|
||||
echo import sys >> $queryfile
|
||||
- echo print sys.version.split\(\'.\'\)\[0\]+\".\"+sys.version.split\(\'.\'\)\[1\] >> $queryfile
|
||||
+ echo print sys.version.split\(\)\[0\].split\(\'.\'\)\[0\]+\".\"+sys.version.split\(\)\[0\].split\(\'.\'\)\[1\] >> $queryfile
|
||||
PYTHON_VERSION=`python $queryfile`
|
||||
rm $queryfile
|
||||
fi
|
||||
11
gdl.spec
11
gdl.spec
@ -1,15 +1,14 @@
|
||||
Name: gdl
|
||||
Version: 0.9
|
||||
Release: 0.pre4.2%{?dist}
|
||||
Release: 0.pre5%{?dist}
|
||||
Summary: GNU Data Language
|
||||
|
||||
Group: Applications/Engineering
|
||||
License: GPL
|
||||
URL: http://gnudatalanguage.sourceforge.net/
|
||||
Source0: http://dl.sf.net/gnudata/%{name}-%{version}pre4.tar.gz
|
||||
Source0: http://dl.sf.net/gnudata/%{name}-%{version}pre5.tar.gz
|
||||
Source1: gdl.csh
|
||||
Source2: gdl.sh
|
||||
Patch1: gdl-0.9pre3-python25.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: readline-devel, ncurses-devel
|
||||
@ -26,8 +25,7 @@ Systems Inc.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}pre4
|
||||
%patch1 -p1 -b .python25
|
||||
%setup -q -n %{name}-%{version}pre5
|
||||
|
||||
|
||||
%build
|
||||
@ -65,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jul 9 2007 - Orion Poplawski <orion@cora.nwra.com> - 0.9-0.pre5
|
||||
- Update to 0.9pre5
|
||||
|
||||
* Tue May 22 2007 - Orion Poplawski <orion@cora.nwra.com> - 0.9-0.pre4.2
|
||||
- Rebuild for netcdf 3.6.2 with shared libraries
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user