Update checksums. Fix patch not applying due to whitespace? and missing parens in linalg.h

3 files changed, 38 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c604bd079e3..ecf7f1d32232 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Feb 18 20:51:17 UTC 2016
+# Sun Apr 24 13:37:28 UTC 2016
 pkgbase = python-spams-svn
 	pkgdesc = Optimization toolbox for solving various sparse estimation problems with Python interface
-	pkgver = 20160218
+	pkgver = 20160424
 	pkgrel = 1
 	url = http://spams-devel.gforge.inria.fr/
 	arch = i686
@@ -12,7 +12,7 @@ pkgbase = python-spams-svn
 	depends = python-scipy
 	source = python-spams.patch
 	source = svn+svn://scm.gforge.inria.fr/svnroot/spams-devel/trunk
-	md5sums = 200c0aa5cdd0af5a265e799e58ddd115
+	md5sums = 4d3ea03f84ff1878d8c19d79e7149fb7
 	md5sums = SKIP
 
 pkgname = python-spams-svn
diff --git a/PKGBUILD b/PKGBUILD
index 0d448184da42..ac86b56181cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Chad Voegele
 
 pkgname=python-spams-svn
-pkgver=20160218
+pkgver=20160424
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -14,7 +14,7 @@ makedepends=('swig')
 source=("python-spams.patch"
         "svn+svn://scm.gforge.inria.fr/svnroot/spams-devel/trunk")
 
-md5sums=('200c0aa5cdd0af5a265e799e58ddd115'
+md5sums=('4d3ea03f84ff1878d8c19d79e7149fb7'
          'SKIP')
 
 build() {
diff --git a/python-spams.patch b/python-spams.patch
index dfeb6578cdb4..dd7c7fa45ace 100644
--- a/python-spams.patch
+++ b/python-spams.patch
@@ -1,6 +1,18 @@
+diff -Naur trunka/linalg/linalg.h trunk/linalg/linalg.h
+--- trunka/linalg/linalg.h	2016-04-24 08:33:27.339077788 -0500
++++ trunk/linalg/linalg.h	2016-04-24 08:34:03.125869367 -0500
+@@ -1679,7 +1679,7 @@
+          up.copy(u);
+       }
+       lambda+=theta*norm;
+-      if isnan(lambda) {
++      if (isnan(lambda)) {
+          std::cerr << "eigLargestSymApprox failed" << std::endl;
+          exit(1);
+       }
 diff -Naur trunka/swig/python/mkpy trunk/swig/python/mkpy
---- trunka/swig/python/mkpy	2016-02-18 14:39:43.250176140 -0600
-+++ trunk/swig/python/mkpy	2016-02-18 14:39:56.713436537 -0600
+--- trunka/swig/python/mkpy	2016-04-24 08:33:27.339077788 -0500
++++ trunk/swig/python/mkpy	2016-04-24 08:34:03.125869367 -0500
 @@ -10,8 +10,8 @@
      exec /cygdrive/c/MinGW/msys/1.0/bin/bash $0 $optx $*
  fi
@@ -22,8 +34,8 @@ diff -Naur trunka/swig/python/mkpy trunk/swig/python/mkpy
      }
      if [ -e $nom.cpp ]; then
 diff -Naur trunka/swig/python/numpy.i trunk/swig/python/numpy.i
---- trunka/swig/python/numpy.i	2016-02-18 14:39:43.250176140 -0600
-+++ trunk/swig/python/numpy.i	2016-02-18 14:39:56.713436537 -0600
+--- trunka/swig/python/numpy.i	2016-04-24 08:33:27.342411134 -0500
++++ trunk/swig/python/numpy.i	2016-04-24 08:34:03.125869367 -0500
 @@ -107,9 +107,11 @@
      if (PyDict_Check(    py_obj)) return "dict"        ;
      if (PyList_Check(    py_obj)) return "list"        ;
@@ -37,47 +49,47 @@ diff -Naur trunka/swig/python/numpy.i trunk/swig/python/numpy.i
      return "unkown type";
    }
 diff -Naur trunka/swig/python/py_typemaps.i trunk/swig/python/py_typemaps.i
---- trunka/swig/python/py_typemaps.i	2016-02-18 14:39:43.253509455 -0600
-+++ trunk/swig/python/py_typemaps.i	2016-02-18 14:40:13.583345144 -0600
+--- trunka/swig/python/py_typemaps.i	2016-04-24 08:33:27.342411134 -0500
++++ trunk/swig/python/py_typemaps.i	2016-04-24 08:34:24.975945317 -0500
 @@ -64,13 +64,11 @@
  %typemap(in,numinputs=0,fragment="NumPy_Fragments") (Vector<DATA_TYPE> **ARGOUT_VECTOR)
  (Vector<DATA_TYPE>  *data_temp)
  {
 -	# argout in
-	$1 = &data_temp;
+ 	$1 = &data_temp;	
  }
-
- %typemap(argout) (Vector<DATA_TYPE> **ARGOUT_VECTOR )
+ 
+ %typemap(argout) (Vector<DATA_TYPE> **ARGOUT_VECTOR ) 
  {
 -	  # test argout
-	  if(data_temp$argnum != NULL) {
-	    npy_intp n = data_temp$argnum->n();
-	    npy_intp dims[1] = {n};
+ 	  if(data_temp$argnum != NULL) {
+ 	    npy_intp n = data_temp$argnum->n();
+ 	    npy_intp dims[1] = {n};
 @@ -142,13 +140,11 @@
  %typemap(in,numinputs=0,fragment="NumPy_Fragments") (Matrix<DATA_TYPE> **ARGOUT_MATRIX)
  (Matrix<DATA_TYPE>  *data_temp)
  {
 -	# argout in
-	$1 = &data_temp;
+ 	$1 = &data_temp;	
  }
-
- %typemap(argout) (Matrix<DATA_TYPE> **ARGOUT_MATRIX )
+ 
+ %typemap(argout) (Matrix<DATA_TYPE> **ARGOUT_MATRIX ) 
  {
 -	  # test argout
-	  if(data_temp$argnum != NULL) {
-	    npy_intp m = data_temp$argnum->m();
-	    npy_intp n = data_temp$argnum->n();
+ 	  if(data_temp$argnum != NULL) {
+ 	    npy_intp m = data_temp$argnum->m();
+ 	    npy_intp n = data_temp$argnum->n();
 @@ -328,7 +324,6 @@
  }
- %typemap(argout) (SpMatrix<DATA_TYPE> **ARGOUT_SPMATRIX )
+ %typemap(argout) (SpMatrix<DATA_TYPE> **ARGOUT_SPMATRIX ) 
  {
 -# test argout
    if(data_temp$argnum != NULL) {
      npy_intp m = data_temp$argnum->m();
      npy_intp n = data_temp$argnum->n();
 diff -Naur trunka/swig/python/setup.py.in trunk/swig/python/setup.py.in
---- trunka/swig/python/setup.py.in	2016-02-18 14:39:43.253509455 -0600
-+++ trunk/swig/python/setup.py.in	2016-02-18 14:39:56.713436537 -0600
+--- trunka/swig/python/setup.py.in	2016-04-24 08:33:27.342411134 -0500
++++ trunk/swig/python/setup.py.in	2016-04-24 08:34:03.125869367 -0500
 @@ -7,7 +7,7 @@
  # includes numpy : package numpy.distutils , numpy.get_include()
  # python setup.py build --inplace