Hello community, here is the log from the commit of package SHERPA-MC for openSUSE:Factory checked in at 2018-04-27 16:08:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SHERPA-MC (Old) and /work/SRC/openSUSE:Factory/.SHERPA-MC.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "SHERPA-MC" Fri Apr 27 16:08:40 2018 rev:9 rq:601537 version:2.2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC.changes 2017-09-15 21:03:40.507978692 +0200 +++ /work/SRC/openSUSE:Factory/.SHERPA-MC.new/SHERPA-MC.changes 2018-04-27 16:08:42.595638438 +0200 @@ -1,0 +2,55 @@ +Wed Apr 25 07:02:18 UTC 2018 - guillaume.gardet@opensuse.org + +- Update to 2.2.5: + * Interface changes + - Add preliminary support for HepMC3 (this interface is still + being tested) + * New features + - Improve decay showering off top quarks + - Improve single-top support and add examples and documentation + for its production channels + - Improve hadronisation and hadron decays for heavy flavour + production + - Introduce a user hook framework which allows users to easily + implement + event generation afterburners, see Examples/Userhook + - Add settings to output ME-only on-the-fly variations (along with + the full ones): + HEPMC_INCLUDE_ME_ONLY_VARIATIONS=1 (HepMC interface) + - New cut-off for parton-shower reweighting: + CSS_REWEIGHT_SCALE_CUTOFF=<pt_min>, default: 5 GeV2 + this is more generally applicable than using a cut-off on the + number of reweighted emissions + - Improve support for on-the-fly variations of clustering steps + (reweight each step locally instead of doing it globally) + * Bugfixes + - Fix issue with the overweight treatment for negative weights + - Add missing shower weight in some event outputs, e.g. when using + `OUTPUT HepMC...[]` + - Fix issue with the overweight threshold for on-the-fly variations + - Fix issue with non-trivial beam spectra handling + - Fix possible issues with electron-"PDF" initialization + - Fix issue with the ISR-channel threshold for leptonic collider + - Fix X/Y functions in METOOLS (this is relevant for hadron decays) + - Fix crash in decay-channel sorting + - Fix crash when using EVENT_TYPE=HadronDecay + - Fix issue with CSS strong coupling values when using non-trivial + scale factors + - Fix issue with QSF variations for real emission calculations with + COMIX + - Fix crash when doing on-the-fly variations and invalid dipole + kinematics occur + - Fix issue in the interplay of the flux and the BIWeight for 1 -> n + processes + - Fix issue when using vertices with a vanishing coupling + - Fix rare "invalid amplitude" crashes + - Fix issues when adding limits for the number of t-channel propagators + in matrix elements + - Fix issue with checking PDF availability when enforcing jet vetoes + - Fix several compilation issues +- Add patch to fix ARM (and PPC) builds: + * SHERPA-MC-fix_arm_build.patch +- Refresh partially upstreamed patch: + * SHERPA-MC-no-return-in-non-void-function.patch + +------------------------------------------------------------------- Old: ---- SHERPA-MC-2.2.4.tar.gz New: ---- SHERPA-MC-2.2.5.tar.gz SHERPA-MC-fix_arm_build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SHERPA-MC.spec ++++++ --- /var/tmp/diff_new_pack.0HVN2L/_old 2018-04-27 16:08:43.499605282 +0200 +++ /var/tmp/diff_new_pack.0HVN2L/_new 2018-04-27 16:08:43.499605282 +0200 @@ -1,7 +1,7 @@ # # spec file for package SHERPA-MC # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,15 +19,17 @@ %define soname lib%{name}0 Name: SHERPA-MC -Version: 2.2.4 +Version: 2.2.5 Release: 0 Summary: MC event generator for Simulation of High-Energy Reactions of PArticles -License: GPL-2.0+ and GPL-3.0 +License: GPL-2.0-or-later AND GPL-3.0-only Group: Development/Libraries/C and C++ Url: https://sherpa.hepforge.org/ Source: http://www.hepforge.org/archive/sherpa/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM SHERPA-MC-no-return-in-non-void-function.patch badshah400@gmail.com -- Fix a non-void (bool) function that was not returning any data to return "true" Patch0: SHERPA-MC-no-return-in-non-void-function.patch +# PATCH-FIX-UPSTREAM SHERPA-MC-fix_arm_build.patch guillaume@opensuse.org -- char are not signed on ARM, so explicitly declare them signed +Patch1: SHERPA-MC-fix_arm_build.patch BuildRequires: HepMC2-devel BuildRequires: LHAPDF-devel BuildRequires: Rivet-devel @@ -137,6 +139,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p0 %build %configure \ ++++++ SHERPA-MC-2.2.4.tar.gz -> SHERPA-MC-2.2.5.tar.gz ++++++ /work/SRC/openSUSE:Factory/SHERPA-MC/SHERPA-MC-2.2.4.tar.gz /work/SRC/openSUSE:Factory/.SHERPA-MC.new/SHERPA-MC-2.2.5.tar.gz differ: char 5, line 1 ++++++ SHERPA-MC-fix_arm_build.patch ++++++ --- AMEGIC++/Amplitude/Vertex.C.orig 2018-04-25 08:59:22.886261336 +0200 +++ AMEGIC++/Amplitude/Vertex.C 2018-04-25 08:59:45.676379120 +0200 @@ -422,9 +422,9 @@ void Vertex::ColorExchange(MODEL::Color_ { //T[0,1,2] -> T[new0,new1,new2] int partarg[3] ={-1,-1,-1}; - char strarg[3] ={-1,-1,-1}; + signed char strarg[3] ={-1,-1,-1}; int partargn[3] ={-1,-1,-1}; - char strargn[3] ={-1,-1,-1}; + signed char strargn[3] ={-1,-1,-1}; for (short int i=0;i<3;i++) { if (colfunc->Type()==MODEL::cf::D && i==2) break; ++++++ SHERPA-MC-no-return-in-non-void-function.patch ++++++ --- /var/tmp/diff_new_pack.0HVN2L/_old 2018-04-27 16:08:43.559603082 +0200 +++ /var/tmp/diff_new_pack.0HVN2L/_new 2018-04-27 16:08:43.559603082 +0200 @@ -1,15 +1,3 @@ -Index: SHERPA-MC-2.2.4/SHERPA/Tools/HepMC2_Interface.C -=================================================================== ---- SHERPA-MC-2.2.4.orig/SHERPA/Tools/HepMC2_Interface.C -+++ SHERPA-MC-2.2.4/SHERPA/Tools/HepMC2_Interface.C -@@ -647,6 +647,7 @@ bool HepMC2_Interface::AddCrossSection(H - #else - msg_Info()<<METHOD<<"(): Cannot add XS info to GenEvent."<<std::endl; - #endif -+ return true; - } - - void HepMC2_Interface::DeleteGenSubEventList() Index: SHERPA-MC-2.2.4/MCATNLO/Showers/Splitting_Function_Base.C =================================================================== --- SHERPA-MC-2.2.4.orig/MCATNLO/Showers/Splitting_Function_Base.C @@ -22,3 +10,15 @@ } void Splitting_Function_Base::ClearSpecs() +diff --git SHERPA-MC-2.2.5.orig/SHERPA/Tools/Variations.C SHERPA-MC-2.2.5/SHERPA/Tools/Variations.C +index 3924ca5..276f9bc 100644 +--- SHERPA-MC-2.2.5.orig/SHERPA/Tools/Variations.C ++++ SHERPA-MC-2.2.5/SHERPA/Tools/Variations.C +@@ -564,6 +564,7 @@ namespace SHERPA { + case Variations_Type::sudakov: + return s << "Sudakov"; + } ++ return s << ""; + } + + std::ostream& operator<<(std::ostream& s, const Variation_Weights& weights)