[108602] users/mojca/ports/science/geant

[mojca at macports.org]

Revision: 108602
          https://trac.macports.org/changeset/108602
Author:   mojca at macports.org
Date:     2013-07-27 07:17:37 -0700 (Sat, 27 Jul 2013)
Log Message:
-----------
mojca/geant: patch to allow building examples in 10.0

Modified Paths:
--------------
    users/mojca/ports/science/geant/Portfile

Added Paths:
-----------
    users/mojca/ports/science/geant/files/patch-examples-advanced-xray_fluorescence.4100.diff

Modified: users/mojca/ports/science/geant/Portfile
===================================================================
--- users/mojca/ports/science/geant/Portfile	2013-07-27 13:44:38 UTC (rev 108601)
+++ users/mojca/ports/science/geant/Portfile	2013-07-27 14:17:37 UTC (rev 108602)
@@ -24,11 +24,14 @@
 
 master_sites        http://geant4.cern.ch/support/source/
 
+# meaning of the fields:
 # - version
 # - revision (used internally in MacPorts to force updates)
 # - revision of data files (used internally in MacPorts to force updates)
 # - patchlevel (also used in directory names)
 # - version string (used for fetching the source)
+#
+# 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  0  0  2  4.9.5.p02    33413f6233b75c003254af5888f4af32d17f515d  adb04fce9472228bb10d78cbc7f40493bfb37454beee22e7c80d630646cd3777
      9.6  0  0  2  4.9.6.p02    9ae32c3f8769e303b41df164693f77a74ca6db97  cf5df83b7e2c99e6729449b32d3ecb0727b4692317426b66fc7fd41951c7351f
@@ -171,8 +174,10 @@
         # GEANT4_USE_SYSTEM_CLHEP=OFF
 
         # - patch-source-interfaces-common-src-G4Qt.cc.diff: http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1487
+        # - patch-examples-advanced-xray_fluorescence.4100.diff: http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1501
         if {${geant.version} == "10.0"} {
             patchfiles      patch-source-interfaces-common-src-G4Qt.cc.diff \
+                            patch-examples-advanced-xray_fluorescence.4100.diff \
                             patch-cmake-Modules-Geant4BuildProjectConfig.cmake.4100.diff
         }
         if {${geant.version} == "9.6"} {

Added: users/mojca/ports/science/geant/files/patch-examples-advanced-xray_fluorescence.4100.diff
===================================================================
--- users/mojca/ports/science/geant/files/patch-examples-advanced-xray_fluorescence.4100.diff	                        (rev 0)
+++ users/mojca/ports/science/geant/files/patch-examples-advanced-xray_fluorescence.4100.diff	2013-07-27 14:17:37 UTC (rev 108602)
@@ -0,0 +1,24 @@
+diff --git a/examples/advanced/xray_fluorescence/src/XrayFluoAnalysisManager.cc b/examples/advanced/xray_fluorescence/src/XrayFluoAnalysisManager.cc
+index 050fb78..069834e 100644
+--- a/examples/advanced/xray_fluorescence/src/XrayFluoAnalysisManager.cc
++++ b/examples/advanced/xray_fluorescence/src/XrayFluoAnalysisManager.cc
+@@ -41,6 +41,7 @@
+ // -------------------------------------------------------------------
+ #ifdef G4ANALYSIS_USE
+ 
++#include "G4SystemOfUnits.hh"
+ #include "G4VProcess.hh"
+ #include <fstream>
+ #include "G4ios.hh"
+diff --git a/examples/advanced/xray_fluorescence/src/XrayFluoRunAction.cc b/examples/advanced/xray_fluorescence/src/XrayFluoRunAction.cc
+index d70ef93..b2cc9a8 100644
+--- a/examples/advanced/xray_fluorescence/src/XrayFluoRunAction.cc
++++ b/examples/advanced/xray_fluorescence/src/XrayFluoRunAction.cc
+@@ -35,6 +35,7 @@
+ //
+ // -------------------------------------------------------------------
+ 
++#include "G4SystemOfUnits.hh"
+ #include "XrayFluoRunAction.hh"
+ #include "G4Run.hh"
+ #include "G4UImanager.hh"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130727/da5412bf/attachment.html>