diff options
| author |   Oliver Freyermuth <o.freyermuth@googlemail.com> | 2022-03-13 03:48:45 +0100 |
|---|---|---|
| committer |   Guilherme Amadio <amadio@gentoo.org> | 2022-03-18 10:41:06 +0100 |
| commit | 94f8696115e2f4f6f1b6d46b37dc52f1f1ea86d7 (patch) | |
| tree | b49911211bf1b9720a7d8b52d7d7965a20e19b07 /sci-physics/geant4_vmc | |
| parent | dev-python/python-systemd: Stabilize 234-r2 arm, #835271 (diff) | |
| download | gentoo-94f8696115e2f4f6f1b6d46b37dc52f1f1ea86d7.tar.gz gentoo-94f8696115e2f4f6f1b6d46b37dc52f1f1ea86d7.tar.bz2 gentoo-94f8696115e2f4f6f1b6d46b37dc52f1f1ea86d7.zip | |
sci-physics/geant4_vmc: Fix FTBFS with =sci-physics/geant-4.11.0.1
Backports a fix from upstream to fix compilation with
=sci-physics/geant-4.11.0.1
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Oliver Freyermuth <o.freyermuth@googlemail.com>
Signed-off-by: Guilherme Amadio <amadio@gentoo.org>
Diffstat (limited to 'sci-physics/geant4_vmc')
| -rw-r--r-- | sci-physics/geant4_vmc/files/geant4_vmc-6.0-geant-4.11.0.1-fix.patch | 33 | ||||
| -rw-r--r-- | sci-physics/geant4_vmc/geant4_vmc-6.0-r1.ebuild | 2 |
2 files changed, 34 insertions, 1 deletions
diff --git a/sci-physics/geant4_vmc/files/geant4_vmc-6.0-geant-4.11.0.1-fix.patch b/sci-physics/geant4_vmc/files/geant4_vmc-6.0-geant-4.11.0.1-fix.patch new file mode 100644 index 000000000000..64e55fccc186 --- /dev/null +++ b/sci-physics/geant4_vmc/files/geant4_vmc-6.0-geant-4.11.0.1-fix.patch @@ -0,0 +1,33 @@ +From fad0699c25b864e1ce2466c3c683007af5c350ad Mon Sep 17 00:00:00 2001 +From: Ivana Hrivnacova <Ivana.Hrivnacova@cern.ch> +Date: Wed, 9 Mar 2022 18:03:18 +0100 +Subject: [PATCH] Fix compilation with Geant4 11.0.p1: (#30) + +Added missing test for G4VERSION_NUMBER in TG4RunManager.cxx +--- + source/run/src/TG4RunManager.cxx | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/source/run/src/TG4RunManager.cxx b/source/run/src/TG4RunManager.cxx +index 64a45f0e0..5190172b0 100644 +--- a/source/run/src/TG4RunManager.cxx ++++ b/source/run/src/TG4RunManager.cxx +@@ -47,6 +47,7 @@ + #include <G4UIExecutive.hh> + #include <G4UImanager.hh> + #include <G4UIsession.hh> ++#include <G4Version.hh> + #include <Randomize.hh> + + #ifdef USE_G4ROOT +@@ -405,8 +406,10 @@ void TG4RunManager::Initialize() + // create G4RunManager + // ConfigureRunManager(); + ++#if G4VERSION_NUMBER == 1100 + // Temporary work-around for bug in Cerenkov in Geant4 11.0 + TG4PhysicsManager::Instance()->StoreCerenkovMaxBetaChangeValue(); ++#endif + + // initialize Geant4 + fRunManager->Initialize(); diff --git a/sci-physics/geant4_vmc/geant4_vmc-6.0-r1.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.0-r1.ebuild index 3b9a8dd1cb99..f6a72736a67e 100644 --- a/sci-physics/geant4_vmc/geant4_vmc-6.0-r1.ebuild +++ b/sci-physics/geant4_vmc/geant4_vmc-6.0-r1.ebuild @@ -40,8 +40,8 @@ RESTRICT=" DOCS=(history README.md) PATCHES=( - # https://github.com/vmc-project/geant4_vmc/pull/28 "${FILESDIR}"/${PN}-6.0-cmake-g4root-tests.patch + "${FILESDIR}"/${PN}-6.0-geant-4.11.0.1-fix.patch ) src_configure() { |