diff options
| author | Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com> | 2024-08-31 21:13:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-31 13:13:42 -0600 |
| commit | b38ab5402829041258457325379a49783eefc87a (patch) | |
| tree | 11dc14b990b62e1575477c4f92e0297575637b01 | |
| parent | 412f22b76acb1760e6db70b31c994c712f18c8b4 (diff) | |
| download | spack-b38ab5402829041258457325379a49783eefc87a.tar.gz spack-b38ab5402829041258457325379a49783eefc87a.tar.bz2 spack-b38ab5402829041258457325379a49783eefc87a.tar.xz spack-b38ab5402829041258457325379a49783eefc87a.zip | |
whizard: add a patch when using hepmc3 3.3.0 or newer (#45862)
* whizard: add a patch when using hepmc3 3.3.0 or newer
* whizard: comment with patch origin
---------
Co-authored-by: jmcarcell <jmcarcell@users.noreply.github.com>
Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/whizard/hepmc3.3.0.patch | 25 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/whizard/package.py | 3 |
2 files changed, 28 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/whizard/hepmc3.3.0.patch b/var/spack/repos/builtin/packages/whizard/hepmc3.3.0.patch new file mode 100644 index 0000000000..80cacea69f --- /dev/null +++ b/var/spack/repos/builtin/packages/whizard/hepmc3.3.0.patch @@ -0,0 +1,25 @@ +--- a/src/hepmc/HepMC3Wrap.cpp 2024-08-21 20:16:15.770305323 +0200 ++++ b/src/hepmc/HepMC3Wrap.cpp 2024-08-21 20:16:28.463638884 +0200 +@@ -161,7 +162,7 @@ + } + + extern "C" void gen_event_add_vertex( GenEvent* evt, GenVertex* v ) { +- evt->add_vertex( v ); ++ evt->add_vertex( GenVertexPtr(v) ); + } + + extern "C" void gen_event_set_signal_process_vertex +@@ -237,11 +238,11 @@ + } + + extern "C" void gen_vertex_add_particle_in( GenVertex* v, GenParticle* p ) { +- v->add_particle_in( p ); ++ v->add_particle_in( GenParticlePtr(p) ); + } + + extern "C" void gen_vertex_add_particle_out( GenVertex* v, GenParticle* p ) { +- v->add_particle_out( p ); ++ v->add_particle_out( GenParticlePtr(p) ); + } + + extern "C" bool gen_vertex_is_valid( GenVertex* v ) {
\ No newline at end of file diff --git a/var/spack/repos/builtin/packages/whizard/package.py b/var/spack/repos/builtin/packages/whizard/package.py index 5a3b0c86de..03f8da5306 100644 --- a/var/spack/repos/builtin/packages/whizard/package.py +++ b/var/spack/repos/builtin/packages/whizard/package.py @@ -92,6 +92,9 @@ class Whizard(AutotoolsPackage): # that happens, this needs to be adapted with a when clause patch("parallel_build_fix.patch", when="@3:3.1.3") patch("parallel_build_fix_2.8.patch", when="@2.8") + + # Subset of https://gitlab.tp.nt.uni-siegen.de/whizard/public/-/commit/f6048e4 + patch("hepmc3.3.0.patch", when="@3:3.1.4^hepmc3@3.3.0:") # Make sure that the patch actually has an effect by running autoreconf force_autoreconf = True # Which then requires the following build dependencies |