geant4: patch typo in wroot (#47955)

* bug fix

* not just 10.4, all versions

* geant4: comment; close patch when range

---------

Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>
This commit is contained in:
Xuefeng Ding 2024-12-11 04:36:01 +08:00 committed by GitHub
parent accd3ca860
commit c23ffbbd7a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 0 deletions

View File

@ -0,0 +1,13 @@
diff --git a/source/externals/g4tools/include/tools/wroot/columns.icc b/source/externals/g4tools/include/tools/wroot/columns.icc
index 0df2c16620..af9b15e0ab 100644
--- a/source/externals/g4tools/include/tools/wroot/columns.icc
+++ b/source/externals/g4tools/include/tools/wroot/columns.icc
@@ -399,7 +399,7 @@
protected:
std_vector_column_ref(const std_vector_column_ref& a_from)
:icol(a_from)
- ,m_branch(a_from.m_barnch)
+ ,m_branch(a_from.m_branch)
,m_ref(a_from.m_ref)
,m_leaf(0)
,m_leaf_count(0)

View File

@ -207,6 +207,9 @@ def std_when(values):
# As released, 10.0.4 has inconsistently capitalised filenames
# in the cmake files; this patch also enables cxxstd 14
patch("geant4-10.0.4.patch", when="@10.0.4")
# Fix member field typo in g4tools wroot
# See https://bugzilla-geant4.kek.jp/show_bug.cgi?id=2640
patch("columns.patch", when="@10.4:11.2.2")
# As released, 10.03.03 has issues with respect to using external
# CLHEP.
patch("CLHEP-10.03.03.patch", level=1, when="@10.3")