rpms/gdl/FC-6 gdl-0.9pre3-const.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 gdl.spec, 1.18, 1.19 sources, 1.5, 1.6 gdl-0.9pre2-specialization.patch, 1.1, NONE

Orion Poplawski (orion) fedora-extras-commits at redhat.com
Wed Nov 22 18:31:41 UTC 2006


Author: orion

Update of /cvs/extras/rpms/gdl/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29090

Modified Files:
	.cvsignore gdl.spec sources 
Added Files:
	gdl-0.9pre3-const.patch 
Removed Files:
	gdl-0.9pre2-specialization.patch 
Log Message:
Update to 0.9pre3


gdl-0.9pre3-const.patch:

--- NEW FILE gdl-0.9pre3-const.patch ---
--- 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)
 	      {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdl/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Jun 2006 22:22:18 -0000	1.5
+++ .cvsignore	22 Nov 2006 18:31:11 -0000	1.6
@@ -1 +1 @@
-gdl-0.9pre2.tar.gz
+gdl-0.9pre3.tar.gz


Index: gdl.spec
===================================================================
RCS file: /cvs/extras/rpms/gdl/FC-6/gdl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gdl.spec	3 Oct 2006 22:21:24 -0000	1.18
+++ gdl.spec	22 Nov 2006 18:31:11 -0000	1.19
@@ -1,13 +1,13 @@
 Name:           gdl
 Version:        0.9
-Release:        0.pre3.1%{?dist}
+Release:        0.pre3.2%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://gnudatalanguage.sourceforge.net/
-Source0:        http://dl.sf.net/gnudata/%{name}-%{version}pre2.tar.gz
-Patch0:         gdl-0.9pre2-specialization.patch
+Source0:        http://dl.sf.net/gnudata/%{name}-%{version}pre3.tar.gz
+Patch0:         gdl-0.9pre3-const.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  readline-devel, ncurses-devel
@@ -24,8 +24,8 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}pre2
-%patch -p1
+%setup -q -n %{name}-%{version}pre3
+%patch -p1 -b .const
 
 
 %build
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.pre3.2
+- Update to 0.9pre3
+
 * Wed Oct  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.pre3.1
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdl/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Jun 2006 22:22:18 -0000	1.5
+++ sources	22 Nov 2006 18:31:11 -0000	1.6
@@ -1 +1 @@
-41a3a2184dad0292affe090e146308ca  gdl-0.9pre2.tar.gz
+0bf35ded3b585507c021f8292ad6f611  gdl-0.9pre3.tar.gz


--- gdl-0.9pre2-specialization.patch DELETED ---




More information about the fedora-extras-commits mailing list