Date: Saturday, February 20, 2016 @ 20:27:27 Author: arojas Revision: 260091
GSL 2.1 rebuild Added: qtiplot/trunk/qtiplot-gsl2.patch Modified: qtiplot/trunk/PKGBUILD --------------------+ PKGBUILD | 14 ++++++++++---- qtiplot-gsl2.patch | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-02-20 18:43:38 UTC (rev 260090) +++ PKGBUILD 2016-02-20 19:27:27 UTC (rev 260091) @@ -5,7 +5,7 @@ pkgname=qtiplot pkgver=0.9.8.9 -pkgrel=7 +pkgrel=8 arch=('i686' 'x86_64') url="http://soft.proindependent.com/qtiplot.html" pkgdesc="Data analysis and scientific plotting - free clone of Origin" @@ -29,7 +29,8 @@ qwtplot3d-libpng15.patch pyqt-4.11.patch qtiplot-0.9.8.9-private.patch - sip-4.15.patch) + sip-4.15.patch + qtiplot-gsl2.patch) sha1sums=('73b17dd9195c3d86750d5f1f5bdd4d5483c5fe30' '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8' '4301cb2a36024a10108b689990d28c4fe5c7416e' @@ -43,7 +44,8 @@ '4a45ee21f028f34da75d83c0d3e1d08c5f928892' 'cef3bca1c15be01ca8a8c0d75d557027d723286c' 'c5e9d075ce6a73c473e52a197d9919116b2cece5' - '55a380bc61819258e0c11ccb42f9057e31d4881e') + '55a380bc61819258e0c11ccb42f9057e31d4881e' + 'bcd28fda51444227e77638af1989a6a40e9f516c') prepare() { cd $pkgname-$pkgver @@ -55,6 +57,7 @@ patch -Np1 -i "$srcdir"/pyqt-4.11.patch patch -Np1 -i "$srcdir"/qtiplot-0.9.8.9-private.patch patch -Np1 -i "$srcdir"/sip-4.15.patch + patch -Np1 -i "$srcdir"/qtiplot-gsl2.patch # build also static qwtplot3d lib echo "unix:CONFIG += staticlib" >> 3rdparty/qwtplot3d/qwtplot3d.pro @@ -65,7 +68,10 @@ # Make qwt sed -i "s:elif:else:g" qtiplot/src/scripting/ScriptEdit.cpp patch -Np1 -i "${srcdir}/qwtplot3d_gcc.patch" - cd ./3rdparty/qwt +} + +build() { + cd ${pkgname}-${pkgver}/3rdparty/qwt qmake-qt4 make Added: qtiplot-gsl2.patch =================================================================== --- qtiplot-gsl2.patch (rev 0) +++ qtiplot-gsl2.patch 2016-02-20 19:27:27 UTC (rev 260091) @@ -0,0 +1,34 @@ +Description: adoptation to gsl2. +Author: Damir Islamov <da...@secretlaboratory.ru> +Last-Update: 2015-12-04 + +--- a/qtiplot/src/analysis/Fit.cpp ++++ b/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; + }