<!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>[143477] trunk/dports/aqua/qtiplot</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/143477">143477</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2015-12-13 05:32:52 -0800 (Sun, 13 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>qtiplot:
* apply Debian patch to allow qtiplot to work with gsl version 2 (#50004)
* generate pyc files prior in destroot so they are part of the installation
* rename qtiplot.app to QtiPlot.app for consistency with other Apps</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqtiplotPortfile">trunk/dports/aqua/qtiplot/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsaquaqtiplotfilespatchgsl2diff">trunk/dports/aqua/qtiplot/files/patch-gsl2.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquaqtiplotPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/qtiplot/Portfile (143476 => 143477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qtiplot/Portfile 2015-12-13 12:12:02 UTC (rev 143476)
+++ trunk/dports/aqua/qtiplot/Portfile 2015-12-13 13:32:52 UTC (rev 143477)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name qtiplot
</span><span class="cx"> version 0.9.8.9
</span><del>-revision 11
</del><ins>+revision 12
</ins><span class="cx"> categories aqua science
</span><span class="cx"> license GPL-2+
</span><span class="cx"> maintainers nicos openmaintainer
</span><span class="lines">@@ -34,10 +34,12 @@
</span><span class="cx"> rmd160 d0ae793b4fbf6eab723f049493d6d954ee8b747e \
</span><span class="cx"> sha256 3d2cc2503c8f3d4e72af904fd6c8a528f3c38dcfe5eeca5dae64324db9f12d38
</span><span class="cx">
</span><ins>+# gsl patch from https://packages.debian.org/sid/math/qtiplot
</ins><span class="cx"> patchfiles patch-ApplicationWindow.diff \
</span><span class="cx"> patch-qti.sip.diff \
</span><span class="cx"> patch-scripting.pri.diff \
</span><span class="cx"> patch-qwt3d_openglhelper.diff \
</span><ins>+ patch-gsl2.diff \
</ins><span class="cx"> patch-sip-4.15.diff
</span><span class="cx">
</span><span class="cx"> pre-configure {
</span><span class="lines">@@ -59,7 +61,7 @@
</span><span class="cx"> puts $confFD "QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a"
</span><span class="cx"> puts $confFD "LIBPNG_LIBS = -lpng"
</span><span class="cx"> # Forcing TamuAnova to nothing
</span><del>- puts $confFD "TAMUANOVA_LIBS = "
</del><ins>+ puts $confFD "TAMUANOVA_LIBS = "
</ins><span class="cx"> if {[variant_isset qtexengine]} {
</span><span class="cx"> puts $confFD "TEX_ENGINE_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/QTeXEngine/src"
</span><span class="cx"> puts $confFD "TEX_ENGINE_LIBS = \$\$QTI_ROOT/3rdparty/QTeXEngine/libQTeXEngine.a"
</span><span class="lines">@@ -79,7 +81,7 @@
</span><span class="cx"> puts $confFD "DEFINES += SCRIPTING_DIALOG"
</span><span class="cx"> puts $confFD "CONFIG += release"
</span><span class="cx"> puts $confFD "\}"
</span><del>- close $confFD
</del><ins>+ close $confFD
</ins><span class="cx">
</span><span class="cx"> # fix a bug in the python init script
</span><span class="cx"> # append the current path *before* import __main__, else __file__ points to math.so after the import if this module
</span><span class="lines">@@ -114,18 +116,16 @@
</span><span class="cx"> destroot {
</span><span class="cx"> # install the application bundle and create a symlink for cli invocation
</span><span class="cx"> xinstall -d ${destroot}${applications_dir}
</span><del>- copy "${worksrcpath}/qtiplot/qtiplot.app" ${destroot}${applications_dir}
- # in this dir python tries to store .pyc files, so it has to be writable
- file attributes ${destroot}${applications_dir}/qtiplot.app/Contents/MacOS -permissions ugo+w
- ln -s ${applications_dir}/qtiplot.app/Contents/MacOS/qtiplot ${destroot}${prefix}/bin/qtiplot
</del><ins>+ copy "${worksrcpath}/qtiplot/qtiplot.app" ${destroot}${applications_dir}/QtiPlot.app
+ ln -s ${applications_dir}/QtiPlot.app/Contents/MacOS/qtiplot ${destroot}${prefix}/bin/qtiplot
</ins><span class="cx"> # install some resources
</span><span class="cx"> xinstall -W ${worksrcpath}/qtiplot/ \
</span><span class="cx"> qti_wordlist.txt \
</span><span class="cx"> qtiUtil.py \
</span><span class="cx"> qtiplotrc.py \
</span><del>- ${destroot}${applications_dir}/qtiplot.app/Contents/MacOS/
</del><ins>+ ${destroot}${applications_dir}/QtiPlot.app/Contents/MacOS/
</ins><span class="cx"> # install the fitting plugins
</span><del>- set plugin_dir ${destroot}${applications_dir}/qtiplot.app/Contents/fitPlugins/
</del><ins>+ set plugin_dir ${destroot}${applications_dir}/QtiPlot.app/Contents/fitPlugins/
</ins><span class="cx"> file mkdir ${plugin_dir}
</span><span class="cx"> xinstall -W ${worksrcpath}/fitPlugins/ \
</span><span class="cx"> libexp_saturation.dylib \
</span><span class="lines">@@ -148,6 +148,17 @@
</span><span class="cx"> variant python26 description "Legacy compatibility variant" requires python27 {}
</span><span class="cx">
</span><span class="cx"> variant python27 description "add support for python27 scripting" {
</span><ins>+
+ post-destroot {
+ system "${prefix}/bin/python2.7 -m compileall ${destroot}${applications_dir}/QtiPlot.app/Contents/MacOS"
+ }
+ # prior to r143477 (2015-12-13), pyc files were generated after installation
+ pre-activate {
+ foreach pyc [glob -directory ${applications_dir}/QtiPlot.app/Contents/MacOS -nocomplain *.pyc] {
+ delete ${pyc}
+ }
+ }
+
</ins><span class="cx"> # Can use either py*-pyqt4 or py*-pyqt4-devel.
</span><span class="cx"> depends_lib-append port:python27 \
</span><span class="cx"> port:py27-sip \
</span></span></pre></div>
<a id="trunkdportsaquaqtiplotfilespatchgsl2diff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/qtiplot/files/patch-gsl2.diff (0 => 143477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/qtiplot/files/patch-gsl2.diff (rev 0)
+++ trunk/dports/aqua/qtiplot/files/patch-gsl2.diff 2015-12-13 13:32:52 UTC (rev 143477)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+Description: adoptation to gsl2.
+Author: Damir Islamov <damir@secretlaboratory.ru>, Anton Gladky <gladk@debian.org>
+Last-Update: 2015-12-04
+
+Index: qtiplot-0.9.8.9/qtiplot/src/analysis/Fit.cpp
+===================================================================
+--- qtiplot/src/analysis/Fit.cpp
++++ qtiplot/src/analysis/Fit.cpp
+@@ -39,6 +39,7 @@
+ #include <gsl/gsl_statistics.h>
+ #include <gsl/gsl_blas.h>
+ #include <gsl/gsl_cdf.h>
++#include <gsl/gsl_version.h>
+
+ #include <QApplication>
+ #include <QMessageBox>
+@@ -126,10 +127,19 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl
+ break;
+ }
+ }
+-
+ if (status){
++ // allocate memory and calculate covariance matrix based on residuals
++#if GSL_MAJOR_VERSION == 2
++ gsl_matrix *J = gsl_matrix_alloc(d_n, d_p);
++ gsl_multifit_fdfsolver_jac(s, J);
++ gsl_multifit_covar (J, 0.0, covar);
++ iterations = 0;
++ // free previousely allocated memory
++ gsl_matrix_free (J);
++#else
+ gsl_multifit_covar (s->J, 0.0, covar);
+ iterations = 0;
++#endif
+ return s;
+ }
+
+@@ -154,10 +164,18 @@ 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);
+-
++#if GSL_MAJOR_VERSION == 2
++ // allocate memory and calculate covariance matrix based on residuals
++ gsl_matrix *J = gsl_matrix_alloc(d_n, d_p);
++ gsl_multifit_fdfsolver_jac(s, J);
++ gsl_multifit_covar (J, 0.0, covar);
++ iterations = iter;
++ // free previousely allocated memory
++ gsl_matrix_free (J);
++#else
+ gsl_multifit_covar (s->J, 0.0, covar);
+-
+ iterations = iter;
++#endif
+ return s;
+ }
+
</ins></span></pre>
</div>
</div>
</body>
</html>