<!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>[132583] trunk/dports/science/geant4</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/132583">132583</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2015-02-05 03:12:16 -0800 (Thu, 05 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>geant4.9.6: upgrade to 4.9.6.p04, patch no longer needed</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegeant4Portfile">trunk/dports/science/geant4/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencegeant4filespatchupstreamsourceinterfacescommonsrcG4Qtcc496diff">trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencegeant4Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/geant4/Portfile (132582 => 132583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/Portfile 2015-02-05 08:23:26 UTC (rev 132582)
+++ trunk/dports/science/geant4/Portfile 2015-02-05 11:12:16 UTC (rev 132583)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> # if we start distributing betas, epoch will have to be added for the transition from version 4.x.y.b01 to 4.x.y
</span><span class="cx"> set geant.versions_info {
</span><span class="cx"> 9.5 2 0 2 4.9.5.p02 33413f6233b75c003254af5888f4af32d17f515d adb04fce9472228bb10d78cbc7f40493bfb37454beee22e7c80d630646cd3777
</span><del>- 9.6 0 0 3 4.9.6.p03 581acefab40a25f5c7123cfa3a93c2a9d3ef2c73 3a7e969039e8992716b3bc33b44cbdbff9c8d5850385f1a02fdd756a4fa6305c
</del><ins>+ 9.6 0 0 4 4.9.6.p04 3dd8f6ac2e79929d26519e83fce113691a670788 997220a5386a43ac8f533fc7d5a8360aa1fd6338244d17deeaa583fb3a0f39fd
</ins><span class="cx"> 10.0 0 0 3 4.10.00.p03 ab464f31c83d37b3346966f414c2488a2086a4ce 497016fb7c7dd543c232a65342b6f59372d247836e07c4b7f7808435dfe76cab
</span><span class="cx"> 10.1 0 0 0 4.10.01 459981c575215d8572e3eb7cd41906e533ad39e5 d37400e96423fedfbf8dbe1f49e2ef0367317c3893ad99f28eed06bf97e1feb7
</span><span class="cx"> }
</span><span class="lines">@@ -213,7 +213,6 @@
</span><span class="cx"> }
</span><span class="cx"> if {${geant.version} == "9.6"} {
</span><span class="cx"> patchfiles patch-upstream-qt.496.diff \
</span><del>- patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff \
</del><span class="cx"> patch-upstream-examples-advanced-xray_fluorescence.diff \
</span><span class="cx"> patch-cmake-Modules-Geant4InterfaceOptions.cmake.496.diff \
</span><span class="cx"> patch-cmake-Modules-Geant4BuildProjectConfig.cmake.496.diff
</span></span></pre></div>
<a id="trunkdportssciencegeant4filespatchupstreamsourceinterfacescommonsrcG4Qtcc496diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff (132582 => 132583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff 2015-02-05 08:23:26 UTC (rev 132582)
+++ trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff 2015-02-05 11:12:16 UTC (rev 132583)
</span><span class="lines">@@ -1,25 +0,0 @@
</span><del>-Upstream patch:
- * http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1487
---- source/interfaces/common/src/G4Qt.cc.orig
-+++ source/interfaces/common/src/G4Qt.cc
-@@ -148,6 +148,20 @@ G4Qt::G4Qt (
- }
- #endif
- // AddDispatcher ((G4DispatchFunction)XtDispatchEvent);
-+
-+/*
-+ * On some non-English locale, comma is used for the decimal separator instead of dot
-+ * bringing to weird behavior of strtod (string to double) function in user application.
-+ * This is "by design" from Qt, see https://bugreports.qt-project.org/browse/QTBUG-10994
-+ *
-+ * $ LC_NUMERIC=fr_FR.UTF-8 ./qtstrtod
-+ * strtod(0.1) = 0
-+ * $ LC_NUMERIC=C ./qtstrtod
-+ * strtod(0.1) = 0.1
-+ *
-+ * Jerome Suhard, jerome@suhard.fr
-+ */
-+ setlocale (LC_NUMERIC, "C");
- }
- /***************************************************************************/
- G4Qt::~G4Qt (
</del></span></pre>
</div>
</div>
</body>
</html>