<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[146292] trunk/dports/science/kst</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/146292">146292</a></dd>
<dt>Author</dt> <dd>nicos@macports.org</dd>
<dt>Date</dt> <dd>2016-03-03 08:15:19 -0800 (Thu, 03 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>kst: fix compilation with gsl2 (ticket #50764)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencekstPortfile">trunk/dports/science/kst/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssciencekstfilespatchgsl2diff">trunk/dports/science/kst/files/patch-gsl2.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencekstPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/kst/Portfile (146291 => 146292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/kst/Portfile 2016-03-03 14:09:54 UTC (rev 146291)
+++ trunk/dports/science/kst/Portfile 2016-03-03 16:15:19 UTC (rev 146292)
</span><span class="lines">@@ -26,7 +26,10 @@
</span><span class="cx"> cmake.out_of_source yes
</span><span class="cx">
</span><span class="cx"> #Not using fixup_bundle from cmake
</span><del>-patchfiles patch-CMakeLists.diff
</del><ins>+#Also fixing compilation with GSL2. Reported at
+#https://bugs.kde.org/show_bug.cgi?id=355324
+patchfiles patch-CMakeLists.diff \
+ patch-gsl2.diff
</ins><span class="cx">
</span><span class="cx"> depends_lib port:gsl \
</span><span class="cx"> port:cfitsio \
</span></span></pre></div>
<a id="trunkdportssciencekstfilespatchgsl2diff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/kst/files/patch-gsl2.diff (0 => 146292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/kst/files/patch-gsl2.diff (rev 0)
+++ trunk/dports/science/kst/files/patch-gsl2.diff 2016-03-03 16:15:19 UTC (rev 146292)
</span><span class="lines">@@ -0,0 +1,158 @@
</span><ins>+Only in ../Kst-2.0.8-orig: build
+Only in .: patch-gsl2.diff
+diff -ur ../Kst-2.0.8-orig/src/plugins/fits/non_linear.h ./src/plugins/fits/non_linear.h
+--- ../Kst-2.0.8-orig/src/plugins/fits/non_linear.h 2014-02-13 18:41:44.000000000 +0900
++++ ./src/plugins/fits/non_linear.h 2016-03-04 00:34:31.000000000 +0900
+@@ -177,37 +177,45 @@
+ }
+ iIterations++;
+ } while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS );
+- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance );
+-
+- //
+- // determine the fitted values...
+- //
+- for( i=0; i<NUM_PARAMS; i++ ) {
+- dXInitial[i] = gsl_vector_get( pSolver->x, i );
+- }
+-
+- for( i=0; i<iLength; i++ ) {
+- vectorOutYFitted->value()[i] = function_calculate( pInputX[i], dXInitial );
+- vectorOutYResiduals->value()[i] = pInputY[i] - vectorOutYFitted->value()[i];
++
++
++ gsl_matrix *J = gsl_matrix_alloc(pSolver->fdf->n, pSolver->fdf->p);
++ if (J != NULL) {
++ gsl_multifit_fdfsolver_jac(pSolver, J);
++
++ gsl_multifit_covar( J, 0.0, pMatrixCovariance );
++
++ //
++ // determine the fitted values...
++ //
++ for( i=0; i<NUM_PARAMS; i++ ) {
++ dXInitial[i] = gsl_vector_get( pSolver->x, i );
++ }
++
++ for( i=0; i<iLength; i++ ) {
++ vectorOutYFitted->value()[i] = function_calculate( pInputX[i], dXInitial );
++ vectorOutYResiduals->value()[i] = pInputY[i] - vectorOutYFitted->value()[i];
++ }
++
++ //
++ // fill in the parameter values and covariance matrix...
++ //
++ for( i=0; i<NUM_PARAMS; i++ ) {
++ vectorOutYParameters->value()[i] = gsl_vector_get( pSolver->x, i );
++ for( j=0; j<NUM_PARAMS; j++ ) {
++ vectorOutYCovariance->value()[(i*NUM_PARAMS)+j] = gsl_matrix_get( pMatrixCovariance, i, j );
++ }
++ }
++
++ //
++ // determine the value of chi^2/nu
++ //
++ scalarOutChi->setValue(gsl_blas_dnrm2( pSolver->f ));
++
++ bReturn = true;
++
++ gsl_matrix_free( J );
+ }
+-
+- //
+- // fill in the parameter values and covariance matrix...
+- //
+- for( i=0; i<NUM_PARAMS; i++ ) {
+- vectorOutYParameters->value()[i] = gsl_vector_get( pSolver->x, i );
+- for( j=0; j<NUM_PARAMS; j++ ) {
+- vectorOutYCovariance->value()[(i*NUM_PARAMS)+j] = gsl_matrix_get( pMatrixCovariance, i, j );
+- }
+- }
+-
+- //
+- // determine the value of chi^2/nu
+- //
+- scalarOutChi->setValue(gsl_blas_dnrm2( pSolver->f ));
+-
+- bReturn = true;
+-
+ gsl_matrix_free( pMatrixCovariance );
+ }
+ gsl_multifit_fdfsolver_free( pSolver );
+diff -ur ../Kst-2.0.8-orig/src/plugins/fits/non_linear_weighted.h ./src/plugins/fits/non_linear_weighted.h
+--- ../Kst-2.0.8-orig/src/plugins/fits/non_linear_weighted.h 2014-02-13 18:41:44.000000000 +0900
++++ ./src/plugins/fits/non_linear_weighted.h 2016-03-04 00:37:41.000000000 +0900
+@@ -193,37 +193,43 @@
+ }
+ while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS );
+
+- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance );
+-
+- //
+- // determine the fitted values...
+- //
+- for( i=0; i<NUM_PARAMS; i++ ) {
+- dXInitial[i] = gsl_vector_get( pSolver->x, i );
+- }
+-
+- for( i=0; i<iLength; i++ ) {
+- vectorOutYFitted->value()[i] = function_calculate( pInputs[XVALUES][i], dXInitial );
+- vectorOutYResiduals->value()[i] = pInputs[YVALUES][i] - vectorOutYFitted->value()[i];
+- }
+-
+- //
+- // fill in the parameter values and covariance matrix...
+- //
+- for( i=0; i<NUM_PARAMS; i++ ) {
+- vectorOutYParameters->value()[i] = gsl_vector_get( pSolver->x, i );
+- for( j=0; j<NUM_PARAMS; j++ ) {
+- vectorOutYCovariance->value()[(i*NUM_PARAMS)+j] = gsl_matrix_get( pMatrixCovariance, i, j );
+- }
++ gsl_matrix *J = gsl_matrix_alloc(pSolver->fdf->n, pSolver->fdf->p);
++ if (J != NULL) {
++ gsl_multifit_fdfsolver_jac(pSolver, J);
++
++ gsl_multifit_covar( J, 0.0, pMatrixCovariance );
++
++ //
++ // determine the fitted values...
++ //
++ for( i=0; i<NUM_PARAMS; i++ ) {
++ dXInitial[i] = gsl_vector_get( pSolver->x, i );
++ }
++
++ for( i=0; i<iLength; i++ ) {
++ vectorOutYFitted->value()[i] = function_calculate( pInputs[XVALUES][i], dXInitial );
++ vectorOutYResiduals->value()[i] = pInputs[YVALUES][i] - vectorOutYFitted->value()[i];
++ }
++
++ //
++ // fill in the parameter values and covariance matrix...
++ //
++ for( i=0; i<NUM_PARAMS; i++ ) {
++ vectorOutYParameters->value()[i] = gsl_vector_get( pSolver->x, i );
++ for( j=0; j<NUM_PARAMS; j++ ) {
++ vectorOutYCovariance->value()[(i*NUM_PARAMS)+j] = gsl_matrix_get( pMatrixCovariance, i, j );
++ }
++ }
++
++ //
++ // determine the value of chi^2/nu
++ //
++ scalarOutChi->setValue(gsl_blas_dnrm2( pSolver->f ));
++
++ bReturn = true;
++
++ gsl_matrix_free( J );
+ }
+-
+- //
+- // determine the value of chi^2/nu
+- //
+- scalarOutChi->setValue(gsl_blas_dnrm2( pSolver->f ));
+-
+- bReturn = true;
+-
+ gsl_matrix_free( pMatrixCovariance );
+ }
+ gsl_multifit_fdfsolver_free( pSolver );
</ins></span></pre>
</div>
</div>
</body>
</html>