GSL2 compatibility

3 files changed, 63 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cc48ce4269d2..26a698cac961 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Fri Apr  1 17:45:10 UTC 2016
 pkgbase = qtiplot-opj
 	pkgdesc = Data analysis and scientific plotting - free clone of Origin, with Origin import enabled
 	pkgver = 0.9.8.9
-	pkgrel = 13
+	pkgrel = 14
 	url = http://soft.proindependent.com/qtiplot.html
 	install = qtiplot-opj.install
 	arch = i686
@@ -39,6 +41,7 @@ pkgbase = qtiplot-opj
 	source = qtiplot-opj.install
 	source = build.conf
 	source = pyqt4.patch
+	source = gsl2.patch
 	md5sums = 652096a365851da3b5f6fefdcbe2aaec
 	md5sums = d1b234623770ec6209b14d1b5137f2f1
 	md5sums = 8a6bdb368ab264e36a5210d8ce0f5439
@@ -53,6 +56,7 @@ pkgbase = qtiplot-opj
 	md5sums = 58b7f423e59db7764f53988cdbd7308e
 	md5sums = b5e7832b05c991c80b83964670d00af8
 	md5sums = d71623b74a9264225a438553f230cc40
+	md5sums = 011b1e8cb040112e5a1e83b5e0a947ad
 
 pkgname = qtiplot-opj
 
diff --git a/PKGBUILD b/PKGBUILD
index 4c7eadf8e5f5..c3b24d3e70e0 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=qtiplot-opj
 pkgver=0.9.8.9
-pkgrel=13
+pkgrel=14
 pkgdesc="Data analysis and scientific plotting - free clone of Origin, with Origin import enabled"
 # more info in: http://www.staff.science.uu.nl/~zeven101/qtiplot.html
 arch=('i686' 'x86_64')
@@ -32,6 +32,7 @@ source=("http://downloads.sourceforge.net/project/qtiplot.berlios/qtiplot-${pkgv
 "qtiplot-opj.install"
 "build.conf"
 "pyqt4.patch"
+"gsl2.patch"
 )
 
 noextract=("opj.tar.bz2"
@@ -39,22 +40,23 @@ noextract=("opj.tar.bz2"
 )
 
 md5sums=('652096a365851da3b5f6fefdcbe2aaec'
-'d1b234623770ec6209b14d1b5137f2f1'
-'8a6bdb368ab264e36a5210d8ce0f5439'
-'c84feb6ed8836ed5868b3fe5887dc1c3'
-'a0a9a28722d8c58c6e3f5bea816eed09'
-'23c4758e557c30c791c332ece6f63f0d'
-'66ab87e227dc1436d8a08adaef657d74'
-'354648b6702d7b7fb71d7d230b6a9bbf'
-'a433c4c2187a0a988ed849e486349297'
-'20e01401a57befbef8b98721d6920fd1'
-'a7c3c43ff10ba117d3e79ad305ba13f0'
-'58b7f423e59db7764f53988cdbd7308e'
-'b5e7832b05c991c80b83964670d00af8'
-'d71623b74a9264225a438553f230cc40'
-)
+         'd1b234623770ec6209b14d1b5137f2f1'
+         '8a6bdb368ab264e36a5210d8ce0f5439'
+         'c84feb6ed8836ed5868b3fe5887dc1c3'
+         'a0a9a28722d8c58c6e3f5bea816eed09'
+         '23c4758e557c30c791c332ece6f63f0d'
+         '66ab87e227dc1436d8a08adaef657d74'
+         '354648b6702d7b7fb71d7d230b6a9bbf'
+         'a433c4c2187a0a988ed849e486349297'
+         '20e01401a57befbef8b98721d6920fd1'
+         'a7c3c43ff10ba117d3e79ad305ba13f0'
+         '58b7f423e59db7764f53988cdbd7308e'
+         'b5e7832b05c991c80b83964670d00af8'
+         'd71623b74a9264225a438553f230cc40'
+         '011b1e8cb040112e5a1e83b5e0a947ad')
 
-build() {
+
+prepare() {
 cd "$srcdir"
 
 tar xf qtiplot-${pkgver}.tar.bz2
@@ -68,8 +70,14 @@ patch -p0 < qtiplot-0.9.8.9-FFTcpp.patch
 patch -p0 < qtiplot-0.9.8.9-dialog.patch
 patch -p0 < qtiplot.patch
 patch -p0 < pyqt4.patch
+patch -p0 < gsl2.patch
 cp build.conf qtiplot-${pkgver}/
-cd "qtiplot-${pkgver}"
+
+}
+
+build() {
+
+cd "$srcdir/qtiplot-${pkgver}"
 lrelease-qt4 qtiplot/translations/*
 qmake-qt4 qtiplot.pro
 make
diff --git a/gsl2.patch b/gsl2.patch
new file mode 100644
index 000000000000..9970970ad3dc
--- /dev/null
+++ b/gsl2.patch
@@ -0,0 +1,33 @@
+Description: adoptation to gsl2.
+Author: Damir Islamov <damir@secretlaboratory.ru>
+Last-Update: 2015-12-04
+
++++ qtiplot-0.9.8.9/qtiplot/src/analysis/Fit.cpp
+@@ -126,10 +126,12 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl
+ 			break;
+ 		}
+ 	}
+-
++	gsl_matrix *J = gsl_matrix_alloc(d_n, d_p);
+ 	if (status){
+-	    gsl_multifit_covar (s->J, 0.0, covar);
++	    gsl_multifit_fdfsolver_jac(s, J);
++	    gsl_multifit_covar (J, 0.0, covar);
+ 	    iterations = 0;
++	    gsl_matrix_free (J);
+ 	    return s;
+ 	}
+ 
+@@ -154,9 +156,9 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl
+ 
+ 		status = gsl_multifit_test_delta (s->dx, s->x, d_tolerance, d_tolerance);
+ 	} while (inRange && status == GSL_CONTINUE && (int)iter < d_max_iterations);
+-
+-	gsl_multifit_covar (s->J, 0.0, covar);
+-
++	gsl_multifit_fdfsolver_jac(s, J);
++	gsl_multifit_covar (J, 0.0, covar);
++	gsl_matrix_free (J);
+ 	iterations = iter;
+ 	return s;
+ }
\ No newline at end of file