<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/18771b648ad21cec8d2de99cc969f0f123694b25">https://github.com/macports/macports-ports/commit/18771b648ad21cec8d2de99cc969f0f123694b25</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 18771b648ad21cec8d2de99cc969f0f123694b25
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Sat Jan 12 22:18:12 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> geant4: switch to Qt5 by default
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The old Geant4 versions will probably be declared obsolete.
</span><span style='display:block; white-space:pre;color:#404040;'> We cut the default at geant4.10.3, but this is not a hard limit.
</span><span style='display:block; white-space:pre;color:#404040;'> Older versions did not have a decent support for Qt5,
</span><span style='display:block; white-space:pre;color:#404040;'> but I'm not sure since when the support became decent enough
</span><span style='display:block; white-space:pre;color:#404040;'> to make it the most reasonable default.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> We should also base the decision on macOS version,
</span><span style='display:block; white-space:pre;color:#404040;'> but I'm not sure which should be the latest OS to have Qt4 as default.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/50424
</span>---
science/geant4/Portfile | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/geant4/Portfile b/science/geant4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bbfd91a..b7a13d8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/geant4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/geant4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -425,8 +425,14 @@ NOTE: Use 'sudo port select geant4 ${subport}'
</span> }
default_variants-append +gdml
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +qt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset qt] && ![variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # almost an arbitrary version of Geant4 (earlier versions had worse support for Qt5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: the default version should also depend on macOS version, but not sure where to cut the line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${geant.version} < "10.3"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +qt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
set geant.version_full_no_patch [join [lrange [split ${geant.version_full} .] 0 2] \\.]
</pre><pre style='margin:0'>
</pre>