[Gsrc-commit] /srv/bzr/gsrc/trunk r924: update gama to 1.12 and fix a mountain of build errors

[Brandon Invergo]

------------------------------------------------------------
revno: 924
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Mon 2012-09-03 19:43:29 +0200
message:
  update gama to 1.12 and fix a mountain of build errors
added:
  gnu/gama/files/
  gnu/gama/files/build-fixes.diff
modified:
  gnu/gama/Makefile
  gnu/gama/sha256sums

=== modified file 'gnu/gama/Makefile'
--- a/gnu/gama/Makefile 2011-09-19 16:26:48 +0000
+++ b/gnu/gama/Makefile 2012-09-03 17:43:29 +0000
@@ -1,5 +1,5 @@
 GARNAME = gama
-GARVERSION = 1.11
+GARVERSION = 1.12
 
 MASTER_SITES = $(MASTER_GNU)
 MASTER_SUBDIR = gama/
@@ -7,6 +7,9 @@
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
 
+PATCHFILES = build-fixes.diff
+PATCHOPTS = -p2
+
 # BUILDDEPS = 
 # LIBDEPS = 
 

=== added directory 'gnu/gama/files'
=== added file 'gnu/gama/files/build-fixes.diff'
--- a/gnu/gama/files/build-fixes.diff   1970-01-01 00:00:00 +0000
+++ b/gnu/gama/files/build-fixes.diff   2012-09-03 17:43:29 +0000
@@ -0,0 +1,76 @@
+diff -x config.log -x config.status -ru 
work/gama-1.12/lib/gnu_gama/local/gkf2sql.cpp 
work/gama-1.12/lib/gnu_gama/local/gkf2sql.cpp
+--- work/gama-1.12/lib/gnu_gama/local/gkf2sql.cpp      2012-03-16 
09:00:10.000000000 +0000
++++ work/gama-1.12/lib/gnu_gama/local/gkf2sql.cpp      2012-09-03 
17:39:54.886744796 +0000
+@@ -322,7 +322,6 @@
+                 }
+               else if (const H_Diff*     m = dynamic_cast<const H_Diff*    
>(*b)) 
+                 {
+-                  const H_Diff* m = dynamic_cast<const H_Diff*>(*b);
+                   ostr << "insert into gnu_gama_local_obs "
+                        << "(conf_id, ccluster, indx, tag, from_id, to_id, "
+                        << "val, dist, rejected) values (" << cnfg() << ", " 
<< cluster << ", "
+diff -x config.log -x config.status -ru work/gama-1.12/lib/gnu_gama/obsdata.h 
work/gama-1.12/lib/gnu_gama/obsdata.h
+--- work/gama-1.12/lib/gnu_gama/obsdata.h      2010-08-14 18:18:08.000000000 
+0000
++++ work/gama-1.12/lib/gnu_gama/obsdata.h      2012-09-03 17:37:18.420069460 
+0000
+@@ -20,6 +20,7 @@
+ */
+ 
+ #include <gnu_gama/list.h>
++#include <cmath>
+ 
+ #ifndef GNU_gama__obsdata_h_gnugamaobsdata_observation_data__gnu_gama_obsdata
+ #define GNU_gama__obsdata_h_gnugamaobsdata_observation_data__gnu_gama_obsdata
+diff -x config.log -x config.status -ru 
work/gama-1.12/lib/gnu_gama/sparse/smatrix_graph_connected.h 
work/gama-1.12/lib/gnu_gama/sparse/smatrix_graph_connected.h
+--- work/gama-1.12/lib/gnu_gama/sparse/smatrix_graph_connected.h       
2010-08-15 08:18:31.000000000 +0000
++++ work/gama-1.12/lib/gnu_gama/sparse/smatrix_graph_connected.h       
2012-09-03 17:35:34.290063691 +0000
+@@ -38,7 +38,7 @@
+       Index x = stack.top();           // pop a node
+       stack.pop();
+ 
+-      for (const_iterator b=begin(x), e=end(x); b!=e; ++b)
++      for (const_iterator b=this->begin(x), e=this->end(x); b!=e; ++b)
+         {
+           Index y = *b;                // for all neighbors y of node x
+           if (tag(y) == 0)
+diff -x config.log -x config.status -ru work/gama-1.12/lib/matvec/covmat.h 
work/gama-1.12/lib/matvec/covmat.h
+--- work/gama-1.12/lib/matvec/covmat.h 2010-08-14 18:18:07.000000000 +0000
++++ work/gama-1.12/lib/matvec/covmat.h 2012-09-03 17:34:38.766727280 +0000
+@@ -172,7 +172,7 @@
+     Index  N = dim();
+     Index  W = bandWidth();
+ 
+-    const  Float  Tol = Abs(*B*this->cholTol());
++    const  Float  Tol = this->Abs(*B*this->cholTol());
+     Float *p;
+     Index  row, k, l, n;
+     Float  pivot, q;
+diff -x config.log -x config.status -ru work/gama-1.12/lib/matvec/mat.h 
work/gama-1.12/lib/matvec/mat.h
+--- work/gama-1.12/lib/matvec/mat.h    2010-08-14 18:18:07.000000000 +0000
++++ work/gama-1.12/lib/matvec/mat.h    2012-09-03 17:33:15.646722673 +0000
+@@ -228,7 +228,7 @@
+           for (jj=step; jj<N; jj++)
+             {
+               e = entry(i, indc[jj]);
+-              if (Abs(e) > Abs(pivot))
++              if (this->Abs(e) > this->Abs(pivot))
+                 {
+                   pivot = e; p_row = ii; p_col = jj;
+                 }
+diff -x config.log -x config.status -ru work/gama-1.12/lib/matvec/vec.h 
work/gama-1.12/lib/matvec/vec.h
+--- work/gama-1.12/lib/matvec/vec.h    2010-08-14 18:18:07.000000000 +0000
++++ work/gama-1.12/lib/matvec/vec.h    2012-09-03 17:34:03.460058658 +0000
+@@ -68,12 +68,12 @@
+     Vec t(this->dim()); add(x, t); return t;
+   }
+   Vec operator-(const Vec &x) const {
+-    Vec t(this->dim()); sub(x, t); return t;
++    Vec t(this->dim()); this->sub(x, t); return t;
+   }
+ 
+   Vec& operator*=(Float f)      { mul(f, *this); return *this; }
+   Vec& operator+=(const Vec &x) { add(x, *this); return *this; }
+-  Vec& operator-=(const Vec &x) { sub(x, *this); return *this; }
++  Vec& operator-=(const Vec &x) { this->sub(x, *this); return *this; }
+ 
+   typename MatVecBase<Float, Exc>::ListInitialiser operator=(Float x)
+   {

=== modified file 'gnu/gama/sha256sums'
--- a/gnu/gama/sha256sums       2011-09-19 16:26:48 +0000
+++ b/gnu/gama/sha256sums       2012-09-03 17:43:29 +0000
@@ -1,2 +1,3 @@
-c9fcbe424966ae52531a958b6bdb48bd2f627fc09246360881318f97df68ec25  
download/gama-1.11.tar.gz
-75c80eb688d548d4be59c68568878d4e79f7d16e2a7593918eb69c482dcbd7cc  
download/gama-1.11.tar.gz.sig
+3d5fdd5f64ae433821269401f4f0ee34121cfbbc0c7204e3c0fbfecc600589ec  
download/gama-1.12.tar.gz
+1b644b107ec76b4eef2d6bbb09a5acc766a4fe4aed483f07bde2431339bfe422  
download/build-fixes.diff
+e6fae51ca7dbd0eb79e776e4e4521437c295025e6ff80504d491b1927064b0f5  
download/gama-1.12.tar.gz.sig