Revision: 132583 https://trac.macports.org/changeset/132583 Author: mojca@macports.org Date: 2015-02-05 03:12:16 -0800 (Thu, 05 Feb 2015) Log Message: ----------- geant4.9.6: upgrade to 4.9.6.p04, patch no longer needed Modified Paths: -------------- trunk/dports/science/geant4/Portfile Removed Paths: ------------- trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff Modified: trunk/dports/science/geant4/Portfile =================================================================== --- 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) @@ -33,7 +33,7 @@ # if we start distributing betas, epoch will have to be added for the transition from version 4.x.y.b01 to 4.x.y set geant.versions_info { 9.5 2 0 2 4.9.5.p02 33413f6233b75c003254af5888f4af32d17f515d adb04fce9472228bb10d78cbc7f40493bfb37454beee22e7c80d630646cd3777 - 9.6 0 0 3 4.9.6.p03 581acefab40a25f5c7123cfa3a93c2a9d3ef2c73 3a7e969039e8992716b3bc33b44cbdbff9c8d5850385f1a02fdd756a4fa6305c + 9.6 0 0 4 4.9.6.p04 3dd8f6ac2e79929d26519e83fce113691a670788 997220a5386a43ac8f533fc7d5a8360aa1fd6338244d17deeaa583fb3a0f39fd 10.0 0 0 3 4.10.00.p03 ab464f31c83d37b3346966f414c2488a2086a4ce 497016fb7c7dd543c232a65342b6f59372d247836e07c4b7f7808435dfe76cab 10.1 0 0 0 4.10.01 459981c575215d8572e3eb7cd41906e533ad39e5 d37400e96423fedfbf8dbe1f49e2ef0367317c3893ad99f28eed06bf97e1feb7 } @@ -213,7 +213,6 @@ } if {${geant.version} == "9.6"} { patchfiles patch-upstream-qt.496.diff \ - patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff \ patch-upstream-examples-advanced-xray_fluorescence.diff \ patch-cmake-Modules-Geant4InterfaceOptions.cmake.496.diff \ patch-cmake-Modules-Geant4BuildProjectConfig.cmake.496.diff Deleted: trunk/dports/science/geant4/files/patch-upstream-source-interfaces-common-src-G4Qt.cc.496.diff =================================================================== --- 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) @@ -1,25 +0,0 @@ -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 (