[med-svn] r20515 - trunk/packages/amide/trunk/debian/patches

[Gert Wollny]

Author: gert-guest
Date: 2015-11-22 13:23:16 +0000 (Sun, 22 Nov 2015)
New Revision: 20515

Added:
   trunk/packages/amide/trunk/debian/patches/gsl_2x.patch
Modified:
   trunk/packages/amide/trunk/debian/patches/series
Log:
Add patch to compile against libgsl >= 2.0

Added: trunk/packages/amide/trunk/debian/patches/gsl_2x.patch
===================================================================
--- trunk/packages/amide/trunk/debian/patches/gsl_2x.patch	                        (rev 0)
+++ trunk/packages/amide/trunk/debian/patches/gsl_2x.patch	2015-11-22 13:23:16 UTC (rev 20515)
@@ -0,0 +1,41 @@
+Description: Fix compilation against GSL >= 2.0 
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Last-Update: Sun, 22 Nov 2015 14:21:00 +0000
+Bug-Debian: http://bugs.debian.org/805748
+
+--- amide-1.0.5.old/src/tb_profile.c	2015-11-22 14:00:16.361526795 +0100
++++ amide-1.0.5/src/tb_profile.c	2015-11-22 14:14:58.993881660 +0100
+@@ -32,6 +32,7 @@
+ #include "ui_common.h"
+ #ifdef AMIDE_LIBGSL_SUPPORT
+ #include <gsl/gsl_multifit_nlin.h>
++#include <gsl/gsl_version.h>
+ #endif
+ 
+ 
+@@ -605,6 +606,7 @@
+   result_t * result;
+   gsl_multifit_fdfsolver * solver;
+   gsl_matrix *covar;
++  gsl_matrix *J; 
+   gsl_multifit_function_fdf fdf;
+   gsl_vector * init_p;
+   gint iter;
+@@ -668,8 +670,16 @@
+     }
+     while ((status == GSL_CONTINUE) && (iter < 100));
+ 
++#if GSL_MAJOR_VERSION > 1     
++    {
++      gsl_matrix *J = gsl_matrix_alloc (result->line->len, num_p);;  
++      gsl_multifit_fdfsolver_jac(solver, J);
++      gsl_multifit_covar (J, 0.0, covar);
++      gsl_matrix_free(J);
++    }
++#else
+     gsl_multifit_covar (solver->J, 0.0, covar);
+-
++#endif 
+     j=0;
+     result->s_fit = gsl_vector_get(solver->x, j++);
+     result->p_fit = gsl_vector_get(solver->x, j++);

Modified: trunk/packages/amide/trunk/debian/patches/series
===================================================================
--- trunk/packages/amide/trunk/debian/patches/series	2015-11-21 13:00:00 UTC (rev 20514)
+++ trunk/packages/amide/trunk/debian/patches/series	2015-11-22 13:23:16 UTC (rev 20515)
@@ -3,3 +3,4 @@
 10_desktop.in.patch
 libav10.patch
 ffmpeg_2.9.patch
+gsl_2x.patch