* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant4_vmc/files/, sci-physics/geant4_vmc/
@ 2022-03-18 9:41 Guilherme Amadio
0 siblings, 0 replies; 2+ messages in thread
From: Guilherme Amadio @ 2022-03-18 9:41 UTC (permalink / raw
To: gentoo-commits
commit: 94f8696115e2f4f6f1b6d46b37dc52f1f1ea86d7
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun Mar 13 02:48:45 2022 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 09:41:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94f86961
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 <AT> googlemail.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
.../files/geant4_vmc-6.0-geant-4.11.0.1-fix.patch | 33 ++++++++++++++++++++++
sci-physics/geant4_vmc/geant4_vmc-6.0-r1.ebuild | 2 +-
2 files changed, 34 insertions(+), 1 deletion(-)
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() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant4_vmc/files/, sci-physics/geant4_vmc/
@ 2024-03-21 14:18 Guilherme Amadio
0 siblings, 0 replies; 2+ messages in thread
From: Guilherme Amadio @ 2024-03-21 14:18 UTC (permalink / raw
To: gentoo-commits
commit: f615ddfb50c6928c8f59de48b441cfa641e8c351
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Thu Mar 14 21:57:55 2024 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 13:39:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f615ddfb
sci-physics/geant4_vmc: add 6.6_p1
Closes: https://github.com/gentoo/gentoo/pull/35759
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
sci-physics/geant4_vmc/Manifest | 1 +
.../geant4_vmc-6.6-fix-preinstall-tests.patch | 20 ++++++
sci-physics/geant4_vmc/geant4_vmc-6.6_p1.ebuild | 84 ++++++++++++++++++++++
3 files changed, 105 insertions(+)
diff --git a/sci-physics/geant4_vmc/Manifest b/sci-physics/geant4_vmc/Manifest
index 016a9ebfc268..a380cd40c1ea 100644
--- a/sci-physics/geant4_vmc/Manifest
+++ b/sci-physics/geant4_vmc/Manifest
@@ -1,2 +1,3 @@
DIST geant4_vmc-6.3_p2.tar.gz 5737615 BLAKE2B db6b27e2ff81d37f61c75f39b4bdc775fa2eeded4916b82de7a6e717b206f9648eb295058547d0eaf8bc30bb8f28dddd1b00dea334aeccf6c2cb53da25cee90a SHA512 d9994a291fd195737b94101cafeadbb18aa14a71046cf8c637ea42c8560f290edd7fa524056c472b164fbff8f07afe01b4f5c6b86eeecfa1cfd564e55839052f
DIST geant4_vmc-6.5.tar.gz 5933744 BLAKE2B 8d797eb770a0627f11860c0c6f7544b2bbfd93de1d6cb1b7ad8ca0888e81ec01a8f07067f810d45a86546f08c08136221c425e4b82039b8e74d24ea01da558a7 SHA512 d81b38eab84fa8d6bcf66b9a755970e4aa79b8c212e528a1e91f4d8692a89180f9f16cefcd049ffc63894a29b258d04dfcd217f0b82cfbe7e5e911ce16b2184f
+DIST geant4_vmc-6.6_p1.tar.gz 5936947 BLAKE2B 7a44077314951bd33cc19615247b48a88df13f911603e631d818e97029a8de272cecd2ad6efe8aef2b622bd000385f25940e5cb744356b1e72f5312c6af616cd SHA512 244287a0412d00219a2838ae30f325a5f4b90b594973b4f61c5189e8e78a3585c8b4898c9bae574de871a8e0aaf4b7f25163a830489898279d7c4498422df29e
diff --git a/sci-physics/geant4_vmc/files/geant4_vmc-6.6-fix-preinstall-tests.patch b/sci-physics/geant4_vmc/files/geant4_vmc-6.6-fix-preinstall-tests.patch
new file mode 100644
index 000000000000..b9f7b7708c81
--- /dev/null
+++ b/sci-physics/geant4_vmc/files/geant4_vmc-6.6-fix-preinstall-tests.patch
@@ -0,0 +1,20 @@
+test-suite: set ROOT_INCLUDE_PATH if builddir is passed
+
+Bug: https://github.com/vmc-project/geant4_vmc/pull/60
+
+--- a/examples/test_suite.sh
++++ b/examples/test_suite.sh
+@@ -193,8 +193,12 @@ fi
+
+ # Set path to shared libraries if --builddir is provided via the option
+ if [ "x${BUILDDIR}" != "x" ]; then
+- LIBS_FROM_BUILDDIR=$(find ${BUILDDIR} -iname "*.so" -exec dirname {} \; | tr '\r\n' ':')
++ LIBS_FROM_BUILDDIR=$(find ${BUILDDIR} -iname "*.so" -exec dirname {} \; | uniq | tr '\r\n' ':')
+ export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${LIBS_FROM_BUILDDIR}
++ # In that case, also use headers from matching source dirs.
++ SOURCEDIR=$(readlink -f ../source/)
++ HEADERS_FROM_SOURCEDIR=$(find ${SOURCEDIR} -iname "*.h" -exec dirname {} \; | uniq | tr '\r\n' ':')
++ export ROOT_INCLUDE_PATH=${ROOT_INCLUDE_PATH}:${HEADERS_FROM_SOURCEDIR}
+ fi
+
+ # Create tmp dir from scratch
diff --git a/sci-physics/geant4_vmc/geant4_vmc-6.6_p1.ebuild b/sci-physics/geant4_vmc/geant4_vmc-6.6_p1.ebuild
new file mode 100644
index 000000000000..bd0afea138b9
--- /dev/null
+++ b/sci-physics/geant4_vmc/geant4_vmc-6.6_p1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake virtualx
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/vmc-project/${PN}.git"
+else
+ MY_PV=$(ver_rs 1-2 -)
+ SRC_URI="https://github.com/vmc-project/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}-${MY_PV}"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Virtual Monte Carlo Geant4 implementation"
+HOMEPAGE="https://github.com/vmc-project/geant4_vmc"
+
+LICENSE="GPL-3"
+SLOT="4"
+IUSE="doc examples geant3 +g4root vgm test"
+
+RDEPEND="
+ sci-physics/clhep:=
+ >=sci-physics/geant-4.11.1:=[opengl,geant3?]
+ sci-physics/root:=
+ >=sci-physics/vmc-2.0:=
+ vgm? ( >=sci-physics/vgm-5.1:= )"
+DEPEND="${RDEPEND}
+ test? ( >=sci-physics/geant-4.11.1:=[gdml] )"
+BDEPEND="doc? ( app-text/doxygen[dot] )"
+RESTRICT="
+ !examples? ( test )
+ !geant3? ( test )
+ !g4root? ( test )
+ !test? ( test )
+ !vgm? ( test )"
+
+DOCS=(history README.md)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.6-fix-preinstall-tests.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DGeant4VMC_USE_VGM="$(usex vgm)"
+ -DGeant4VMC_USE_GEANT4_G3TOG4="$(usex geant3)"
+ -DGeant4VMC_USE_G4Root="$(usex g4root)"
+ -DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
+ -DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
+ -DGeant4VMC_BUILD_G4Root_TEST="$(usex test)"
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ if use doc ; then
+ local dirs=(
+ source
+ $(usev g4root)
+ $(usev examples)
+ )
+ local d
+ for d in "${dirs[@]}"; do
+ doxygen "${d}"/Doxyfile || die
+ done
+ fi
+}
+
+src_test() {
+ cd examples || die
+ virtx ./test_suite.sh --debug --g3=off --garfield=off --builddir="${BUILD_DIR}" || die
+ virtx ./test_suite_exe.sh --g3=off --garfield=off --garfield=off --builddir="${BUILD_DIR}" || die
+}
+
+src_install() {
+ cmake_src_install
+ use doc && local HTML_DOCS=(doc/.)
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-03-21 14:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-21 14:18 [gentoo-commits] repo/gentoo:master commit in: sci-physics/geant4_vmc/files/, sci-physics/geant4_vmc/ Guilherme Amadio
-- strict thread matches above, loose matches on Subject: below --
2022-03-18 9:41 Guilherme Amadio
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox