<!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>[147477] trunk/dports/science/root5</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/147477">147477</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2016-04-05 04:51:35 -0700 (Tue, 05 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>root5: upgrade to 5.34.36 (maintainer, closes #50998, #51057)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceroot5Portfile">trunk/dports/science/root5/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsscienceroot5filespatchmathmathmoresrcGSLMultiFithdiff">trunk/dports/science/root5/files/patch-math-mathmore-src-GSLMultiFit.h.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceroot5Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/root5/Portfile (147476 => 147477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/root5/Portfile 2016-04-05 09:47:33 UTC (rev 147476)
+++ trunk/dports/science/root5/Portfile 2016-04-05 11:51:35 UTC (rev 147477)
</span><span class="lines">@@ -8,14 +8,13 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx">
</span><del>-github.setup root-mirror root 5-34-34 v
-version 5.34.34
-revision 3
</del><ins>+github.setup root-mirror root 5-34-36 v
+version 5.34.36
</ins><span class="cx">
</span><span class="cx"> set version_major [lindex [split ${version} .] 0]
</span><span class="cx">
</span><del>-checksums rmd160 027526f9b553be61b28d82716e5bedeb9a9fbad9 \
- sha256 0baaf2ff06edcfe79936917f35edea1bf3033d07b2d328aa1433e84ccc48c684
</del><ins>+checksums rmd160 bd19fe36d42928fe2e6b6df6f055f5cc0e6bece5 \
+ sha256 8482b84a90928ef7eb44b9172f961b8b9607969959ab175eeff812cd91dd4893
</ins><span class="cx">
</span><span class="cx"> name root${version_major}
</span><span class="cx"> categories science
</span><span class="lines">@@ -50,8 +49,6 @@
</span><span class="cx"> select.group root
</span><span class="cx"> select.file ${filespath}/${name}
</span><span class="cx">
</span><del>-patchfiles-append patch-math-mathmore-src-GSLMultiFit.h.diff
-
</del><span class="cx"> post-patch {
</span><span class="cx"> # reinplace "s|-lfreetype| \`freetype-config --libs\`|g" ${worksrcpath}/config/root-config.in
</span><span class="cx"> reinplace "s|\"/usr/include\"|\"${prefix}/include /usr/include\"|g" ${worksrcpath}/configure
</span></span></pre></div>
<a id="trunkdportsscienceroot5filespatchmathmathmoresrcGSLMultiFithdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/root5/files/patch-math-mathmore-src-GSLMultiFit.h.diff (147476 => 147477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/root5/files/patch-math-mathmore-src-GSLMultiFit.h.diff 2016-04-05 09:47:33 UTC (rev 147476)
+++ trunk/dports/science/root5/files/patch-math-mathmore-src-GSLMultiFit.h.diff 2016-04-05 11:51:35 UTC (rev 147477)
</span><span class="lines">@@ -1,77 +0,0 @@
</span><del>-From 850a56cad37733694a6858314e30e3dafbacc220 Mon Sep 17 00:00:00 2001
-From: Pere Mato <pere.mato@cern.ch>
-Date: Tue, 15 Dec 2015 11:58:24 +0100
-Subject: [PATCH] Fix for ROOT-7776 - Integrate GSL 2.0 in ROOT.
-
----
- math/mathmore/src/GSLMultiFit.h | 40 ++++++++++++++++++++++++++--------------
- 1 file changed, 26 insertions(+), 14 deletions(-)
-
-diff --git a/math/mathmore/src/GSLMultiFit.h b/math/mathmore/src/GSLMultiFit.h
-index a1cb348..e2570a0 100644
---- math/mathmore/src/GSLMultiFit.h
-+++ math/mathmore/src/GSLMultiFit.h
-@@ -31,6 +31,7 @@
- #include "gsl/gsl_matrix.h"
- #include "gsl/gsl_multifit_nlin.h"
- #include "gsl/gsl_blas.h"
-+#include "gsl/gsl_version.h"
- #include "GSLMultiFitFunctionWrapper.h"
-
- #include "Math/IFunction.h"
-@@ -127,20 +128,24 @@ class GSLMultiFit {
- int Iterate() {
- if (fSolver == 0) return -1;
- return gsl_multifit_fdfsolver_iterate(fSolver);
-- }
--
-- /// parameter values at the minimum
-- const double * X() const {
-- if (fSolver == 0) return 0;
-- gsl_vector * x = gsl_multifit_fdfsolver_position(fSolver);
-- return x->data;
- }
-
-- /// gradient value at the minimum
-- const double * Gradient() const {
-- if (fSolver == 0) return 0;
-- gsl_multifit_gradient(fSolver->J, fSolver->f,fVec);
-- return fVec->data;
-+ /// parameter values at the minimum
-+ const double * X() const {
-+ if (fSolver == 0) return 0;
-+ gsl_vector * x = gsl_multifit_fdfsolver_position(fSolver);
-+ return x->data;
-+ }
-+
-+ /// gradient value at the minimum
-+ const double * Gradient() const {
-+ if (fSolver == 0) return 0;
-+#if GSL_MAJOR_VERSION > 1
-+ fType->gradient(fSolver->state, fVec);
-+#else
-+ gsl_multifit_gradient(fSolver->J, fSolver->f,fVec);
-+#endif
-+ return fVec->data;
- }
-
- /// return covariance matrix of the parameters
-@@ -150,9 +155,16 @@ class GSLMultiFit {
- unsigned int npar = fSolver->fdf->p;
- fCov = gsl_matrix_alloc( npar, npar );
- static double kEpsrel = 0.0001;
-+#if GSL_MAJOR_VERSION > 1
-+ gsl_matrix* J = gsl_matrix_alloc(npar,npar);
-+ gsl_multifit_fdfsolver_jac (fSolver, J);
-+ int ret = gsl_multifit_covar(J, kEpsrel, fCov);
-+ gsl_matrix_free(J);
-+#else
- int ret = gsl_multifit_covar(fSolver->J, kEpsrel, fCov);
-- if (ret != GSL_SUCCESS) return 0;
-- return fCov->data;
-+#endif
-+ if (ret != GSL_SUCCESS) return 0;
-+ return fCov->data;
- }
-
- /// test gradient (ask from solver gradient vector)
</del></span></pre>
</div>
</div>
</body>
</html>