diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-08-26 20:07:50 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-08-26 20:23:49 +0200 |
| commit | e1b28544fe15ec757bae3c1708660bb94a4432a0 (patch) | |
| tree | 16f65a059daf4d87ca871d428a747f410e8b82d7 /sci-visualization | |
| parent | sci-visualization/kst: Fix build with Qt 5.11 (diff) | |
| download | gentoo-e1b28544fe15ec757bae3c1708660bb94a4432a0.tar.gz gentoo-e1b28544fe15ec757bae3c1708660bb94a4432a0.tar.bz2 gentoo-e1b28544fe15ec757bae3c1708660bb94a4432a0.zip | |
sci-visualization/kst: Fix build with sci-libs/gsl-2
Closes: https://bugs.gentoo.org/574746
Package-Manager: Portage-2.3.48, Repoman-2.3.10
Diffstat (limited to 'sci-visualization')
| -rw-r--r-- | sci-visualization/kst/files/kst-2.0.8-gsl-2.0.patch | 30 | ||||
| -rw-r--r-- | sci-visualization/kst/kst-2.0.8.ebuild | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/sci-visualization/kst/files/kst-2.0.8-gsl-2.0.patch b/sci-visualization/kst/files/kst-2.0.8-gsl-2.0.patch new file mode 100644 index 000000000000..c49ba2e20bca --- /dev/null +++ b/sci-visualization/kst/files/kst-2.0.8-gsl-2.0.patch @@ -0,0 +1,30 @@ +Patch kindly borrowed from Debian. +Gentoo-bug: https://bugs.gentoo.org/574746 +KDE-bug: https://bugs.kde.org/show_bug.cgi?id=355324 + +--- a/src/plugins/fits/non_linear.h ++++ b/src/plugins/fits/non_linear.h +@@ -177,7 +177,9 @@ bool kstfit_nonlinear( + } + iIterations++; + } while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS ); +- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance ); ++ gsl_matrix *J = gsl_matrix_alloc (pSolver->fdf->n, pSolver->fdf->p); ++ gsl_multifit_fdfsolver_jac (pSolver, J); ++ gsl_multifit_covar (J, 0.0, pMatrixCovariance); + + // + // determine the fitted values... +--- a/src/plugins/fits/non_linear_weighted.h ++++ b/src/plugins/fits/non_linear_weighted.h +@@ -193,7 +193,9 @@ bool kstfit_nonlinear_weighted( + } + while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS ); + +- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance ); ++ gsl_matrix *J = gsl_matrix_alloc (pSolver->fdf->n, pSolver->fdf->p); ++ gsl_multifit_fdfsolver_jac (pSolver, J); ++ gsl_multifit_covar (J, 0.0, pMatrixCovariance); + + // + // determine the fitted values... diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8.ebuild index d8c58992ca3b..6b0ac253117b 100644 --- a/sci-visualization/kst/kst-2.0.8.ebuild +++ b/sci-visualization/kst/kst-2.0.8.ebuild @@ -44,6 +44,7 @@ DOCS=( AUTHORS README.kstScript ) PATCHES=( "${FILESDIR}/${P}-includes.patch" "${FILESDIR}/${P}-qt-5.11.patch" + "${FILESDIR}/${P}-gsl-2.0.patch" ) src_configure() { |