backport upstream SetNavigatorForTracking inline function fix, credits Oliver Freyermuth for reporting bug 496678

Package-Manager: portage-2.2.7/cvs/Linux x86_64

4 files changed, 75 insertions, 7 deletions

diff --git a/sci-physics/geant/ChangeLog b/sci-physics/geant/ChangeLog
index 0457303f8142..4f6cc11e91e7 100644
--- a/sci-physics/geant/ChangeLog
+++ b/sci-physics/geant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-physics/geant
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.77 2013/12/20 06:07:41 heroxbd Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/ChangeLog,v 1.78 2014/01/06 02:12:06 heroxbd Exp $
+
+  06 Jan 2014; Benda Xu <heroxbd@gentoo.org>
+  +files/geant-4.10.0-TrackingNavigator.patch, geant-4.10.00.ebuild:
+  backport upstream SetNavigatorForTracking inline function fix, credits Oliver
+  Freyermuth for reporting bug 496678
 
 *geant-4.10.00 (20 Dec 2013)
 
diff --git a/sci-physics/geant/Manifest b/sci-physics/geant/Manifest
index 150f32002169..8e91a371c0fc 100644
--- a/sci-physics/geant/Manifest
+++ b/sci-physics/geant/Manifest
@@ -1,3 +1,4 @@
+AUX geant-4.10.0-TrackingNavigator.patch 2684 SHA256 dfcc663be808072f9b1a141d7f20f8979aa53d4249dd657db42f83e54b2bd34f SHA512 cc7f9ccc17ae83bec9aba945f01e2f6243264a19a6dd2226cc03bb09856a40521b6d1ded3acf2732f5fa3ca7f9822522ed695dbcbd157aadb29e7f6701f84146 WHIRLPOOL 1fe99eb065506f0bbe12c81213efef33b5a6140a638b054432647a3ec74eca917968ccecd08c16467702aaf90f934f07b3622462797c57f5f92c732d9a943650
 AUX geant-4.10.0-no-examples.patch 692 SHA256 3f2151ae9df66ee7b7bb36e0f519da1ea796de9bc6e6b31bf5047cb925164ed3 SHA512 852f2bba645a3a223efabef184bbcc37cf75dc1e2c301bfde634b479503c39d7df0b938156a09e151fb8a287f7bd26bc87816014ca3b56c59ee72937f8ac063c WHIRLPOOL 7794d2363486382ed59f5ede2702df02c3922b0a028a948919587c68786ed61ed6542aaccda737ba61679250858b74f9316107999ef927acf9658b54536675de
 AUX geant-4.9.4-datadir.patch 2203 SHA256 3c97d883732299ecb008d6c114d92556a937b93966ec21fb612809b03d0a95f8 SHA512 d0f9cd8da02f7820917f2b9b0ae61412a457dca387d0bf8e0ea216b4e0648f3d1aa2a6ae45134b8870a7fd9bd2c763684a465ee648ed6bdfa7fc8c12ae603899 WHIRLPOOL d18d3b0dd0c00ef9943d937b4679566df2bc7893f06bc2c93b9cd3b09f4d21b112a7270e1f57b150b6dd36945b243d0251897e6258c4eaca40e5b266d2dccb8d
 AUX geant-4.9.4-libdir.patch 1328 SHA256 36f43915868ea87f2b80c9ea360b24726389a8839ef06323e58a08fdf5833338 SHA512 816f995504c2a98e3d8c89da5baa0a416b7342d4b3297ac2643a2b74fb8456dc28c01bbf61ca6558efdf87d81c742e27a039a31b6b9c091c66c5c8b3dcc61558 WHIRLPOOL 21887a59415c682046e8a7eb296169f6517c2096f01d54956923aecf5de9ec480f07683b099da3898774bb72f483c08f3e5c75f60fbcc80e933e422f9ad3365f
@@ -21,8 +22,8 @@ DIST geant4.9.4.p03.tar.gz 25241424 SHA256 5090ca5b506238f16ba2ae2176221a18b6fde
 DIST geant4.9.6.p02.tar.gz 25480383 SHA256 cf5df83b7e2c99e6729449b32d3ecb0727b4692317426b66fc7fd41951c7351f SHA512 dab5f31568074869adecbbfb8855be0c0a2e92e5ba3119dbeb9cd414878721df3052198a05e5e3c19d0e2942a22602c6618dc0628b05134d3403a50c2bc2032c WHIRLPOOL 8c66d8aa1605a42e6b6f054c32eb49df0bb2afcdf54360ff630908ce7cfc8a7a37b62cdb2a1612af05f1f70a5575c6516aad1f6737a67692449b01e1137b2865
 EBUILD geant-3.21.14-r2.ebuild 1863 SHA256 280320afafaed437cb867022573df8db82440fe432ad65da970fb960efcd0b9a SHA512 49d0dbe37041d311f2e7f4180ae22c44855504ad93750abc442be931d916bcdae756c4de144610802bc166dd415bb032fc81aeeacab4f1b6f36b10c72392ca14 WHIRLPOOL a67420977142aa5572b9807b31ad739346b30fc8f45eedf2a69eb54b07d13845e66d1eb02f84b91bccb5c0a4e5280d8152298f705f08e5ac85f1ba54d026aaed
 EBUILD geant-3.21.14-r3.ebuild 1719 SHA256 53205b50b0d88302d5be5de4858ed392333a774dd47784f4c9f16a66855cfb6b SHA512 3b89b08be9e4659ac992d6d20cdde8d4a4d6fce84f272b2a29955c683de48300d5b702026daee964a484704a18b11606e8a72c4dcb37edd72f28d29fc6611a62 WHIRLPOOL 0898d71760e2b6e22680d7943f94382a23de3effdbd25b6e00fb883a708fda0be78d80fbdfb6f683ce4dfe8910fcea5a4418136effcad0baf99df4fc0015787b
-EBUILD geant-4.10.00.ebuild 2846 SHA256 961a58e57aecb37366cddb1988f7aad25d22bdf1243dff3a676f46bf2d15333d SHA512 b839387e6e4428974fda1c497a14efd87624045ab2b2d0da4f0b59a67b32cdfc8803976c32f48e0b6fbae6e3fc5d598359d0893acc7af8c99e665fce4cf3e53a WHIRLPOOL 141f20d5f2b401a23327816bc8743b44566e8051aeb698e7dc40cc83b9377332a2143d0260130fa156f43bdae87a95bdfcac22f03bd98a229eda341308bd12aa
+EBUILD geant-4.10.00.ebuild 2910 SHA256 bb436998e57b82a44718b3e1b05f155d8e3a370010df0fc8cddcc1cf9520c8a0 SHA512 f273520457b97ecd6cb6e3e9c44516a9d540cd32dac15de76de2d4929d4caeaca1430b0da22b0bb82461cae89e6dd20f263e8a636b95acf44cbfb8dbd1d19bfa WHIRLPOOL 11a6da191533b27a9f92f4051a9cfadde681e0619ed8f31c97fec256dda931e2619c3bf9aa9305266d763b96d3923ad306df9c0d8aa5321fb7f4a9f3e48055cb
 EBUILD geant-4.9.4_p03.ebuild 2375 SHA256 30f9299cd3e4497ef9a9e5dd67c77d48705ceef8dfb514f9a0a17b8e2bbf5da9 SHA512 e474e165bfec3de1841dfdba6770c9516327e9cfb9b69235db4b00014ffcdb070cbefac6335977c225b3a20b874bcf411ad666e782bd966692bfe734b677ed09 WHIRLPOOL 618b2f5b4ea75c5997c9b925e357003a30e2d2ee7ea1db0702f5dcf92d5d84e49602d7fe2acaecc77560443a827aa5c26b722688a00367cce88d4e6aaa05d2a5
 EBUILD geant-4.9.6_p02-r1.ebuild 2815 SHA256 6729485afb79e3f52b97e4d473711c68fbc0029618743cfc51fee7ac9e112275 SHA512 4e54c57b4640358a7194f7e4bf2fb3b18766fab869ec8f945a871800b146500dfeaa375474c54e79a6dfe95c1d698449c5f107e954438957004bba4614b32dd2 WHIRLPOOL 181302f11ab55be36b2e5e23a7e0adec4c47a9c3022eedb43e8bf549897dd74c698fe047a2f65cc28b8d19d81092ccb835833bbd8c0da969d128e437c74cf1f8
-MISC ChangeLog 15230 SHA256 862a5891c2ce06483bbe14b655caf7bddf801be994cd8de95f0d56af9042fe2a SHA512 d9f12f59383f5039659bca28aa2e06be81714899efb2cf6d2b931cf772e78746b058acfbf75bbda5938bdc9fdb3a7a6fb76cc4e79554346fd747a51fe33ff75c WHIRLPOOL 990f48faf7f20ff14ec77ad0c3ce6a74e4e348305279974d0323e89cce22f2aa21a9445d98bca079404a5da74e950d12309fb10a3e758d8fee5e9737a7bd85b2
+MISC ChangeLog 15463 SHA256 245e8b4566b3eff6c5ab0d89e399d7517e3c02a5c3d5eedef61120befade6c4f SHA512 c60ec41388bdba9bc632119f2f0eef3cd75c794b55f6cea0191e37c9669f93ae38b86dfe3b6c16fcaf125d33ffa8936a305facc07352529eb1637b0917a449c0 WHIRLPOOL 1b96fe1f54a665bc49c4e267515719fdc48b499de2672ef801cdced41cdf5e719a8ba6daf359e39c4ff4782bf52bea2ed83b21b7844475ee96f09289a48635e8
 MISC metadata.xml 1266 SHA256 c32b3d9e648ae1987a289075bd7d231ee78496dcaf4fdb6dc05631785a08d38a SHA512 4d167658d616bfd2946440a0d22a5c4a5b19f7884b6279b7aa1f18a452ae982cd566d546eab734dfd6d4ac156cb5fb592d6cad9bc84b3ee80b6d748afdbd54e1 WHIRLPOOL ffc18105c436dd2508b36e0fb14638fb0bebf7c31ff9bfa873f1a78377d4df205694ec1931e99d794b6d8ad37e503802de52e6c6b7458a3c2093f39ef0ffdd65
diff --git a/sci-physics/geant/files/geant-4.10.0-TrackingNavigator.patch b/sci-physics/geant/files/geant-4.10.0-TrackingNavigator.patch
new file mode 100644
index 000000000000..e3cc8d6594a5
--- /dev/null
+++ b/sci-physics/geant/files/geant-4.10.0-TrackingNavigator.patch
@@ -0,0 +1,60 @@
+accepted upstream. to be removed in the next minor release.
+
+https://bugs.gentoo.org/show_bug.cgi?id=496678
+http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1537
+
+diff -Naur geant4.10.00/source/geometry/navigation/include/G4TransportationManager.hh geant4.10.00-mod/source/geometry/navigation/include/G4TransportationManager.hh
+--- geant4.10.00/source/geometry/navigation/include/G4TransportationManager.hh	2013-12-05 10:28:54.000000000 +0100
++++ geant4.10.00-mod/source/geometry/navigation/include/G4TransportationManager.hh	2013-12-12 01:40:12.341428809 +0100
+@@ -68,7 +68,7 @@
+        // Accessors for field handling
+ 
+      inline G4Navigator* GetNavigatorForTracking() const;
+-     inline void SetNavigatorForTracking( G4Navigator* newNavigator );
++     void SetNavigatorForTracking( G4Navigator* newNavigator );
+        // Accessors for the navigator for tracking
+ 
+      inline void SetWorldForTracking(G4VPhysicalVolume* theWorld);
+diff -Naur geant4.10.00/source/geometry/navigation/include/G4TransportationManager.icc geant4.10.00-mod/source/geometry/navigation/include/G4TransportationManager.icc
+--- geant4.10.00/source/geometry/navigation/include/G4TransportationManager.icc	2013-12-05 10:28:54.000000000 +0100
++++ geant4.10.00-mod/source/geometry/navigation/include/G4TransportationManager.icc	2013-12-12 01:40:12.341428809 +0100
+@@ -59,6 +59,7 @@
+    fNavigators[0]->SetWorldVolume(theWorld);
+ }
+ 
++/*
+ // ----------------------------------------------------------------------------
+ // SetNavigatorForTracking()
+ //
+@@ -70,6 +71,7 @@
+ {
+    fNavigators[0] = newNavigator;
+ }
++*/
+ 
+ // ----------------------------------------------------------------------------
+ // GetPropagatorInField()
+diff -Naur geant4.10.00/source/geometry/navigation/src/G4TransportationManager.cc geant4.10.00-mod/source/geometry/navigation/src/G4TransportationManager.cc
+--- geant4.10.00/source/geometry/navigation/src/G4TransportationManager.cc	2013-12-05 10:28:56.000000000 +0100
++++ geant4.10.00-mod/source/geometry/navigation/src/G4TransportationManager.cc	2013-12-12 01:40:12.345428679 +0100
+@@ -124,6 +124,20 @@
+    }
+ }
+ 
++
++// ----------------------------------------------------------------------------
++// SetNavigatorForTracking()
++//
++// Set the active navigator for tracking, always
++// the first in the collection of registered navigators.
++//
++void G4TransportationManager::SetNavigatorForTracking(G4Navigator* newNavigator)
++{
++   fNavigators[0] = newNavigator;
++   fActiveNavigators[0] = newNavigator;
++   fPropagatorInField->SetNavigatorForPropagating(newNavigator);
++}
++
+ // ----------------------------------------------------------------------------
+ // ClearNavigators()
+ //
diff --git a/sci-physics/geant/geant-4.10.00.ebuild b/sci-physics/geant/geant-4.10.00.ebuild
index a6001415687b..227daa95f8ba 100644
--- a/sci-physics/geant/geant-4.10.00.ebuild
+++ b/sci-physics/geant/geant-4.10.00.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.10.00.ebuild,v 1.1 2013/12/20 06:07:41 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/geant/geant-4.10.00.ebuild,v 1.2 2014/01/06 02:12:06 heroxbd Exp $
 
 EAPI=5
 
@@ -40,7 +40,9 @@ PDEPEND="
 
 S="${WORKDIR}/${MYP}"
 
-PATCHES=( "${FILESDIR}"/${PN}-4.10.0-no-examples.patch )
+PATCHES=( "${FILESDIR}"/${PN}-4.10.0-no-examples.patch
+	  "${FILESDIR}"/${PN}-4.10.0-TrackingNavigator.patch # 496678
+	)
 
 src_configure() {
 	local mycmakeargs=(