zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

whizard: add a patch when using hepmc3 3.3.0 or newer (#45862)

Browse Source 
* 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>
This commit is contained in:
Juan Miguel Carceller 2024-08-31 21:13:42 +02:00 committed by GitHub
parent 412f22b76a
commit b38ab54028
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
var/spack/repos/builtin/packages/whizard/hepmc3.3.0.patch Normal file
View File

@ -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 ) {

3
var/spack/repos/builtin/packages/whizard/package.py
View File

@ -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