git: 3f947d3a1d86 - main - science/geant4: Fix build error
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 19 Nov 2024 08:28:28 UTC
The branch main has been updated by eduardo:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3f947d3a1d86212efcac3e1f4a53363ad4875f5f
commit 3f947d3a1d86212efcac3e1f4a53363ad4875f5f
Author: Erik Jensen <erik@tenku.dk>
AuthorDate: 2024-11-19 08:14:16 +0000
Commit: Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-11-19 08:27:12 +0000
science/geant4: Fix build error
Apply patch to fix typo in code builded in some systems that leads to build errors.
This patch unbreaks build on main amd64, i386 and armv7.
See also: https://portsfallout.com/port/33546/
PR: 282761
MFH: 2024Q4
---
science/geant4/Makefile | 2 +-
...h-source_externals_g4tools_include_tools_wroot_columns.icc | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/science/geant4/Makefile b/science/geant4/Makefile
index 612d95dafc2c..e2f95a5deaa8 100644
--- a/science/geant4/Makefile
+++ b/science/geant4/Makefile
@@ -1,7 +1,7 @@
PORTNAME= geant4
DISTVERSIONPREFIX= v
DISTVERSION= 11.2.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= science parallel devel cad
MASTER_SITES= https://cern.ch/geant4-data/releases/ \
https://cern.ch/geant4-data/datasets/:data
diff --git a/science/geant4/files/patch-source_externals_g4tools_include_tools_wroot_columns.icc b/science/geant4/files/patch-source_externals_g4tools_include_tools_wroot_columns.icc
new file mode 100644
index 000000000000..744b361baf36
--- /dev/null
+++ b/science/geant4/files/patch-source_externals_g4tools_include_tools_wroot_columns.icc
@@ -0,0 +1,11 @@
+--- source/externals/g4tools/include/tools/wroot/columns.icc.orig 2024-06-28 09:15:16 UTC
++++ 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)