| 1 |
commit: e1b28544fe15ec757bae3c1708660bb94a4432a0 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 26 18:07:50 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 26 18:23:49 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b28544 |
| 7 |
|
| 8 |
sci-visualization/kst: Fix build with sci-libs/gsl-2 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/574746 |
| 11 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
| 12 |
|
| 13 |
.../kst/files/kst-2.0.8-gsl-2.0.patch | 30 ++++++++++++++++++++++ |
| 14 |
sci-visualization/kst/kst-2.0.8.ebuild | 1 + |
| 15 |
2 files changed, 31 insertions(+) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..c49ba2e20bc |
| 20 |
--- /dev/null |
| 21 |
+++ b/sci-visualization/kst/files/kst-2.0.8-gsl-2.0.patch |
| 22 |
@@ -0,0 +1,30 @@ |
| 23 |
+Patch kindly borrowed from Debian. |
| 24 |
+Gentoo-bug: https://bugs.gentoo.org/574746 |
| 25 |
+KDE-bug: https://bugs.kde.org/show_bug.cgi?id=355324 |
| 26 |
+ |
| 27 |
+--- a/src/plugins/fits/non_linear.h |
| 28 |
++++ b/src/plugins/fits/non_linear.h |
| 29 |
+@@ -177,7 +177,9 @@ bool kstfit_nonlinear( |
| 30 |
+ } |
| 31 |
+ iIterations++; |
| 32 |
+ } while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS ); |
| 33 |
+- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance ); |
| 34 |
++ gsl_matrix *J = gsl_matrix_alloc (pSolver->fdf->n, pSolver->fdf->p); |
| 35 |
++ gsl_multifit_fdfsolver_jac (pSolver, J); |
| 36 |
++ gsl_multifit_covar (J, 0.0, pMatrixCovariance); |
| 37 |
+ |
| 38 |
+ // |
| 39 |
+ // determine the fitted values... |
| 40 |
+--- a/src/plugins/fits/non_linear_weighted.h |
| 41 |
++++ b/src/plugins/fits/non_linear_weighted.h |
| 42 |
+@@ -193,7 +193,9 @@ bool kstfit_nonlinear_weighted( |
| 43 |
+ } |
| 44 |
+ while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS ); |
| 45 |
+ |
| 46 |
+- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance ); |
| 47 |
++ gsl_matrix *J = gsl_matrix_alloc (pSolver->fdf->n, pSolver->fdf->p); |
| 48 |
++ gsl_multifit_fdfsolver_jac (pSolver, J); |
| 49 |
++ gsl_multifit_covar (J, 0.0, pMatrixCovariance); |
| 50 |
+ |
| 51 |
+ // |
| 52 |
+ // determine the fitted values... |
| 53 |
|
| 54 |
diff --git a/sci-visualization/kst/kst-2.0.8.ebuild b/sci-visualization/kst/kst-2.0.8.ebuild |
| 55 |
index d8c58992ca3..6b0ac253117 100644 |
| 56 |
--- a/sci-visualization/kst/kst-2.0.8.ebuild |
| 57 |
+++ b/sci-visualization/kst/kst-2.0.8.ebuild |
| 58 |
@@ -44,6 +44,7 @@ DOCS=( AUTHORS README.kstScript ) |
| 59 |
PATCHES=( |
| 60 |
"${FILESDIR}/${P}-includes.patch" |
| 61 |
"${FILESDIR}/${P}-qt-5.11.patch" |
| 62 |
+ "${FILESDIR}/${P}-gsl-2.0.patch" |
| 63 |
) |
| 64 |
|
| 65 |
src_configure() { |
Archives