<!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>[117889] 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/117889">117889</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-03-16 05:28:29 -0700 (Sun, 16 Mar 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>geant4: upgrade to geant4.10.0.p01, revbump 9.5 &amp; 9.6 after clhep upgrade</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegeant4Portfile">trunk/dports/science/geant4/Portfile</a></li>
<li><a href="#trunkdportssciencegeant4filespatchcmakeModulesGeant4InterfaceOptionscmake4100diff">trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssciencegeant4filespatchupstreamexamplesadvancedxray_fluorescencediff">trunk/dports/science/geant4/files/patch-upstream-examples-advanced-xray_fluorescence.diff</a></li>
<li><a href="#trunkdportssciencegeant4filespatchupstreamsourceinterfacescommonsrcG4Qtcc495diff">trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.495.diff</a></li>
<li><a href="#trunkdportssciencegeant4filespatchupstreamsourceinterfacescommonsrcG4Qtcc496diff">trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencegeant4filespatchexamplesadvancedxray_fluorescencediff">trunk/dports/science/geant4/files/patch-examples-advanced-xray_fluorescence.diff</a></li>
<li><a href="#trunkdportssciencegeant4filespatchsourceinterfacescommonsrcG4Qtcc495diff">trunk/dports/science/geant4/files/patch-source-interfaces-common-src-G4Qt.cc.495.diff</a></li>
<li><a href="#trunkdportssciencegeant4filespatchsourceinterfacescommonsrcG4Qtccdiff">trunk/dports/science/geant4/files/patch-source-interfaces-common-src-G4Qt.cc.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 (117888 => 117889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/Portfile        2014-03-16 11:46:15 UTC (rev 117888)
+++ trunk/dports/science/geant4/Portfile        2014-03-16 12:28:29 UTC (rev 117889)
</span><span class="lines">@@ -32,9 +32,9 @@
</span><span class="cx"> #
</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><del>-     9.5  0  0  2  4.9.5.p02    33413f6233b75c003254af5888f4af32d17f515d  adb04fce9472228bb10d78cbc7f40493bfb37454beee22e7c80d630646cd3777
-     9.6  0  0  2  4.9.6.p02    9ae32c3f8769e303b41df164693f77a74ca6db97  cf5df83b7e2c99e6729449b32d3ecb0727b4692317426b66fc7fd41951c7351f
-    10.0  1  0  0  4.10.00      cd8bb26e251f07ce8d6fa6e91062a1b70206b9ef  ffec1714b03748b6d691eb0b91906f4c74422c1ad1f8afa918e03be421af8a17
</del><ins>+     9.5  1  0  2  4.9.5.p02    33413f6233b75c003254af5888f4af32d17f515d  adb04fce9472228bb10d78cbc7f40493bfb37454beee22e7c80d630646cd3777
+     9.6  1  0  2  4.9.6.p02    9ae32c3f8769e303b41df164693f77a74ca6db97  cf5df83b7e2c99e6729449b32d3ecb0727b4692317426b66fc7fd41951c7351f
+    10.0  0  0  1  4.10.00.p01  f1f70d381cef712781a1d0f13ffa4cb8fb4fa6a9  09c431ff3ef81034282c46501cea01046d4a20438c2ea2a7339576e1ecf26ba0
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> set geant.data_versions_10.0 {
</span><span class="lines">@@ -185,30 +185,28 @@
</span><span class="cx"> 
</span><span class="cx">         # GEANT4_USE_SYSTEM_CLHEP=OFF
</span><span class="cx"> 
</span><del>-        # - patch-source-interfaces-common-src-G4Qt.cc:
</del><ins>+        # - patch-upstream-source-interfaces-common-src-G4Qt.cc:
</ins><span class="cx">         #       http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1487
</span><del>-        # - patch-examples-advanced-xray_fluorescence:
-        #       http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1501 (fixed on 2013-12-13)
</del><ins>+        # - patch-upstream-examples-advanced-xray_fluorescence:
+        #       http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1501
</ins><span class="cx">         # - patch-cmake-Modules-Geant4InterfaceOptions.cmake:
</span><span class="cx">         #       prevents linking against X11 in /usr (maybe less aggressive patch would also work)
</span><span class="cx">         # - patch-cmake-Modules-Geant4BuildProjectConfig.cmake:
</span><span class="cx">         #       allows placing *.cmake files to a different location than LIBDIR
</span><span class="cx">         if {${geant.version} == &quot;10.0&quot;} {
</span><del>-            patchfiles      patch-source-interfaces-common-src-G4Qt.cc.diff \
-                            patch-examples-advanced-xray_fluorescence.diff \
-                            patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff \
</del><ins>+            patchfiles      patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff \
</ins><span class="cx">                             patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4100.diff
</span><span class="cx">         }
</span><span class="cx">         if {${geant.version} == &quot;9.6&quot;} {
</span><span class="cx">             patchfiles      patch-upstream-qt.496.diff \
</span><del>-                            patch-source-interfaces-common-src-G4Qt.cc.diff \
-                            patch-examples-advanced-xray_fluorescence.diff \
</del><ins>+                            patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff \
+                            patch-upstream-examples-advanced-xray_fluorescence.diff \
</ins><span class="cx">                             patch-cmake-Modules-Geant4InterfaceOptions.cmake.496.diff \
</span><span class="cx">                             patch-cmake-Modules-Geant4BuildProjectConfig.cmake.496.diff
</span><span class="cx">         }
</span><span class="cx">         if {${geant.version} == &quot;9.5&quot;} {
</span><del>-            patchfiles      patch-source-interfaces-common-src-G4Qt.cc.495.diff \
-                            patch-examples-advanced-xray_fluorescence.diff \
</del><ins>+            patchfiles      patch-upstream-source-interfaces-common-src-G4Qt.cc.495.diff \
+                            patch-upstream-examples-advanced-xray_fluorescence.diff \
</ins><span class="cx">                             patch-cmake-Modules-Geant4InterfaceOptions.cmake.495.diff \
</span><span class="cx">                             patch-cmake-Modules-Geant4BuildProjectConfig.cmake.495.diff
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkdportssciencegeant4filespatchcmakeModulesGeant4InterfaceOptionscmake4100diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff (117888 => 117889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff        2014-03-16 11:46:15 UTC (rev 117888)
+++ trunk/dports/science/geant4/files/patch-cmake-Modules-Geant4InterfaceOptions.cmake.4100.diff        2014-03-16 12:28:29 UTC (rev 117889)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- cmake/Modules/Geant4InterfaceOptions.cmake.orig
</span><span class="cx"> +++ cmake/Modules/Geant4InterfaceOptions.cmake
</span><del>-@@ -196,20 +196,11 @@ if(UNIX)
</del><ins>+@@ -196,22 +196,11 @@ if(UNIX)
</ins><span class="cx">      set(CMAKE_FIND_FRAMEWORK NEVER)
</span><span class="cx">  
</span><span class="cx">      set(X11_INC_SEARCH_PATH
</span><span class="lines">@@ -11,6 +11,7 @@
</span><span class="cx"> -        /usr/openwin/include
</span><span class="cx"> -        /usr/openwin/share/include
</span><span class="cx"> -        /opt/graphics/OpenGL/include
</span><ins>+-        /opt/X11/include
</ins><span class="cx"> +        @PREFIX@/include
</span><span class="cx">          )
</span><span class="cx">  
</span><span class="lines">@@ -19,27 +20,28 @@
</span><span class="cx"> -        /usr/X11R6/lib
</span><span class="cx"> -        /usr/X11R7/lib
</span><span class="cx"> -        /usr/openwin/lib
</span><ins>+-        /opt/X11/lib
</ins><span class="cx"> +        @PREFIX@/lib
</span><span class="cx">          )
</span><span class="cx">  
</span><span class="cx">      find_path(X11_Xmu_INCLUDE_PATH X11/Xmu/Xmu.h ${X11_INC_SEARCH_PATH})
</span><del>-@@ -252,17 +243,17 @@ if(UNIX)
</del><ins>+@@ -254,17 +243,17 @@ if(UNIX)
</ins><span class="cx">        set(CMAKE_FIND_FRAMEWORK NEVER)
</span><span class="cx">  
</span><span class="cx">        find_path(OPENGL_X11_INCLUDE_DIR GL/gl.h
</span><del>--        PATHS /usr/X11R6/include
</del><ins>+-        PATHS /usr/X11R6/include /opt/X11/include
</ins><span class="cx"> +        PATHS @PREFIX@/include
</span><span class="cx">          NO_DEFAULT_PATH
</span><span class="cx">          )
</span><span class="cx">  
</span><span class="cx">        find_library(OPENGL_X11_gl_LIBRARY GL
</span><del>--        PATHS /usr/X11R6/lib
</del><ins>+-        PATHS /usr/X11R6/lib /opt/X11/lib
</ins><span class="cx"> +        PATHS @PREFIX@/lib
</span><span class="cx">          NO_DEFAULT_PATH
</span><span class="cx">          )
</span><span class="cx">  
</span><span class="cx">        find_library(OPENGL_X11_glu_LIBRARY GLU
</span><del>--        PATHS /usr/X11R6/lib
</del><ins>+-        PATHS /usr/X11R6/lib /opt/X11/lib
</ins><span class="cx"> +        PATHS @PREFIX@/lib
</span><span class="cx">          NO_DEFAULT_PATH
</span><span class="cx">          )
</span></span></pre></div>
<a id="trunkdportssciencegeant4filespatchexamplesadvancedxray_fluorescencediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/geant4/files/patch-examples-advanced-xray_fluorescence.diff (117888 => 117889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/patch-examples-advanced-xray_fluorescence.diff        2014-03-16 11:46:15 UTC (rev 117888)
+++ trunk/dports/science/geant4/files/patch-examples-advanced-xray_fluorescence.diff        2014-03-16 12:28:29 UTC (rev 117889)
</span><span class="lines">@@ -1,20 +0,0 @@
</span><del>---- examples/advanced/xray_fluorescence/src/XrayFluoAnalysisManager.cc.orig
-+++ examples/advanced/xray_fluorescence/src/XrayFluoAnalysisManager.cc
-@@ -41,6 +41,7 @@
- // -------------------------------------------------------------------
- #ifdef G4ANALYSIS_USE

-+#include &quot;G4SystemOfUnits.hh&quot;
- #include &quot;G4VProcess.hh&quot;
- #include &lt;fstream&gt;
- #include &quot;G4ios.hh&quot;
---- examples/advanced/xray_fluorescence/src/XrayFluoRunAction.cc
-+++ examples/advanced/xray_fluorescence/src/XrayFluoRunAction.cc
-@@ -35,6 +35,7 @@
- //
- // -------------------------------------------------------------------

-+#include &quot;G4SystemOfUnits.hh&quot;
- #include &quot;XrayFluoRunAction.hh&quot;
- #include &quot;G4Run.hh&quot;
- #include &quot;G4UImanager.hh&quot;
</del></span></pre></div>
<a id="trunkdportssciencegeant4filespatchsourceinterfacescommonsrcG4Qtcc495diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/geant4/files/patch-source-interfaces-common-src-G4Qt.cc.495.diff (117888 => 117889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/patch-source-interfaces-common-src-G4Qt.cc.495.diff        2014-03-16 11:46:15 UTC (rev 117888)
+++ trunk/dports/science/geant4/files/patch-source-interfaces-common-src-G4Qt.cc.495.diff        2014-03-16 12:28:29 UTC (rev 117889)
</span><span class="lines">@@ -1,23 +0,0 @@
</span><del>---- source/interfaces/common/src/G4Qt.cc.orig
-+++ source/interfaces/common/src/G4Qt.cc
-@@ -149,6 +149,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 &quot;by design&quot; 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, &quot;C&quot;);
- }
- /***************************************************************************/
- G4Qt::~G4Qt (
</del></span></pre></div>
<a id="trunkdportssciencegeant4filespatchsourceinterfacescommonsrcG4Qtccdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/geant4/files/patch-source-interfaces-common-src-G4Qt.cc.diff (117888 => 117889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/patch-source-interfaces-common-src-G4Qt.cc.diff        2014-03-16 11:46:15 UTC (rev 117888)
+++ trunk/dports/science/geant4/files/patch-source-interfaces-common-src-G4Qt.cc.diff        2014-03-16 12:28:29 UTC (rev 117889)
</span><span class="lines">@@ -1,23 +0,0 @@
</span><del>---- source/interfaces/common/src/G4Qt.cc.orig
-+++ source/interfaces/common/src/G4Qt.cc
-@@ -153,6 +153,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 &quot;by design&quot; 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, &quot;C&quot;);
- }
- /***************************************************************************/
- G4Qt::~G4Qt (
</del></span></pre></div>
<a id="trunkdportssciencegeant4filespatchupstreamexamplesadvancedxray_fluorescencedifffromrev117767trunkdportssciencegeant4filespatchexamplesadvancedxray_fluorescencediff"></a>
<div class="copfile"><h4>Copied: trunk/dports/science/geant4/files/patch-upstream-examples-advanced-xray_fluorescence.diff (from rev 117767, trunk/dports/science/geant4/files/patch-examples-advanced-xray_fluorescence.diff) (0 => 117889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/patch-upstream-examples-advanced-xray_fluorescence.diff                                (rev 0)
+++ trunk/dports/science/geant4/files/patch-upstream-examples-advanced-xray_fluorescence.diff        2014-03-16 12:28:29 UTC (rev 117889)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+Upstream patch:
+ * http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1501
+--- examples/advanced/xray_fluorescence/src/XrayFluoAnalysisManager.cc.orig
++++ examples/advanced/xray_fluorescence/src/XrayFluoAnalysisManager.cc
+@@ -41,6 +41,7 @@
+ // -------------------------------------------------------------------
+ #ifdef G4ANALYSIS_USE

++#include &quot;G4SystemOfUnits.hh&quot;
+ #include &quot;G4VProcess.hh&quot;
+ #include &lt;fstream&gt;
+ #include &quot;G4ios.hh&quot;
+--- examples/advanced/xray_fluorescence/src/XrayFluoRunAction.cc
++++ examples/advanced/xray_fluorescence/src/XrayFluoRunAction.cc
+@@ -35,6 +35,7 @@
+ //
+ // -------------------------------------------------------------------

++#include &quot;G4SystemOfUnits.hh&quot;
+ #include &quot;XrayFluoRunAction.hh&quot;
+ #include &quot;G4Run.hh&quot;
+ #include &quot;G4UImanager.hh&quot;
</ins></span></pre></div>
<a id="trunkdportssciencegeant4filespatchupstreamsourceinterfacescommonsrcG4Qtcc495difffromrev117767trunkdportssciencegeant4filespatchsourceinterfacescommonsrcG4Qtcc495diff"></a>
<div class="copfile"><h4>Copied: trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.495.diff (from rev 117767, trunk/dports/science/geant4/files/patch-source-interfaces-common-src-G4Qt.cc.495.diff) (0 => 117889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.495.diff                                (rev 0)
+++ trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.495.diff        2014-03-16 12:28:29 UTC (rev 117889)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+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
+@@ -149,6 +149,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 &quot;by design&quot; 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, &quot;C&quot;);
+ }
+ /***************************************************************************/
+ G4Qt::~G4Qt (
</ins></span></pre></div>
<a id="trunkdportssciencegeant4filespatchupstreamsourceinterfacescommonsrcG4Qtcc496difffromrev117767trunkdportssciencegeant4filespatchsourceinterfacescommonsrcG4Qtccdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff (from rev 117767, trunk/dports/science/geant4/files/patch-source-interfaces-common-src-G4Qt.cc.diff) (0 => 117889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff                                (rev 0)
+++ trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff        2014-03-16 12:28:29 UTC (rev 117889)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+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
+@@ -153,6 +153,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 &quot;by design&quot; 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, &quot;C&quot;);
+ }
+ /***************************************************************************/
+ G4Qt::~G4Qt (
</ins></span></pre>
</div>
</div>

</body>
</html>