Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant/, sci-physics/geant/files/
Date: Thu, 05 May 2016 21:11:19
Message-Id: 1462482663.43524c9b7983800ae991b5d295d2588e3db50c2e.soap@gentoo
1 commit: 43524c9b7983800ae991b5d295d2588e3db50c2e
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 5 20:38:39 2016 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Thu May 5 21:11:03 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43524c9b
7
8 sci-physics/geant: Add std:: qualifier to isnan for C++11
9
10 Gentoo-Bug: 581322
11
12 Package-Manager: portage-2.2.28
13
14 sci-physics/geant/files/geant-4.10.02-std-isnan.patch | 17 +++++++++++++++++
15 sci-physics/geant/geant-4.10.02.ebuild | 1 +
16 2 files changed, 18 insertions(+)
17
18 diff --git a/sci-physics/geant/files/geant-4.10.02-std-isnan.patch b/sci-physics/geant/files/geant-4.10.02-std-isnan.patch
19 new file mode 100644
20 index 0000000..6d26a6c
21 --- /dev/null
22 +++ b/sci-physics/geant/files/geant-4.10.02-std-isnan.patch
23 @@ -0,0 +1,17 @@
24 +Fully qualify isnan:
25 +* /var/tmp/portage/sci-physics/geant-4.10.02/work/geant4.10.02/source/processes/hadronic/models/lend/src/nf_utilities.cc:61:22: error: ‘isnan’ was not declared in this scope
26 +* return( isnan( d ) );
27 +See also:
28 +https://bugs.gentoo.org/show_bug.cgi?id=581322
29 +
30 +--- geant4.10.02/source/processes/hadronic/models/lend/src/nf_utilities.cc
31 ++++ geant4.10.02/source/processes/hadronic/models/lend/src/nf_utilities.cc
32 +@@ -58,7 +58,7 @@
33 + */
34 + int nfu_isNAN( double d ) {
35 +
36 +- return( isnan( d ) );
37 ++ return( std::isnan( d ) );
38 + }
39 + /*
40 + ************************************************************
41
42 diff --git a/sci-physics/geant/geant-4.10.02.ebuild b/sci-physics/geant/geant-4.10.02.ebuild
43 index 5dd41ee..89b1e12 100644
44 --- a/sci-physics/geant/geant-4.10.02.ebuild
45 +++ b/sci-physics/geant/geant-4.10.02.ebuild
46 @@ -41,6 +41,7 @@ PDEPEND="
47 S="${WORKDIR}/${MYP}"
48
49 src_prepare() {
50 + epatch -p1 "${FILESDIR}/${P}-std-isnan.patch"
51 use examples || epatch "${FILESDIR}"/${PN}-${PV1}.${PV2}.${SPV3}-no-examples.patch
52 }