From 59f650ac4f79e74dc89e03b9381f83409cef44e2 Mon Sep 17 00:00:00 2001 From: Markus Seidel Date: Mon, 15 Jan 2024 13:38:04 +0000 Subject: [PATCH] Pythia 8.310 --- pythia8.spec | 4 +--- pythia8_309-289.patch | 31 ------------------------------- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 pythia8_309-289.patch diff --git a/pythia8.spec b/pythia8.spec index c6500fc95f4..0774ca01587 100644 --- a/pythia8.spec +++ b/pythia8.spec @@ -1,14 +1,12 @@ -### RPM external pythia8 309 +### RPM external pythia8 310 Source: https://pythia.org/download/pythia83/%{n}%{realversion}.tgz # https://gitlab.com/Pythia8/releases/-/issues/289: fix compilation of C++20 code with pythia8 -Patch0: pythia8_309-289 Requires: hepmc hepmc3 lhapdf %prep %setup -q -n %{n}%{realversion} -%patch0 -p1 ./configure --prefix=%i --enable-shared --with-hepmc2=${HEPMC_ROOT} --with-hepmc3=${HEPMC3_ROOT} --with-lhapdf6=${LHAPDF_ROOT} --enable-mg5mes diff --git a/pythia8_309-289.patch b/pythia8_309-289.patch deleted file mode 100644 index ec5ba6655bc..00000000000 --- a/pythia8_309-289.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/include/Pythia8/SusyLesHouches.h b/include/Pythia8/SusyLesHouches.h -index 43d6d621..5a57a968 100644 ---- a/include/Pythia8/SusyLesHouches.h -+++ b/include/Pythia8/SusyLesHouches.h -@@ -28,7 +28,7 @@ namespace Pythia8 { - public: - - //Constructor. -- LHblock() : idnow(0), qDRbar(), i(), val() {} ; -+ LHblock() : idnow(0), qDRbar(), i(), val() {} ; - - //Does block exist? - bool exists() { return int(entry.size()) == 0 ? false : true ; }; -@@ -129,7 +129,7 @@ namespace Pythia8 { - template class LHmatrixBlock { - public: - //Constructor. Set uninitialized and explicitly zero. -- LHmatrixBlock() : entry(), qDRbar(), val() { -+ LHmatrixBlock() : entry(), qDRbar(), val() { - initialized=false; - for (i=1;i<=size;i++) { - for (j=1;j<=size;j++) { -@@ -208,7 +208,7 @@ namespace Pythia8 { - template class LHtensor3Block { - public: - //Constructor. Set uninitialized and explicitly zero. -- LHtensor3Block() : entry(), qDRbar(), val() { -+ LHtensor3Block() : entry(), qDRbar(), val() { - initialized=false; - for (i=1;i<=size;i++) { - for (j=1;j<=size;j++) {