Gentoo Archives: gentoo-commits

From: Guilherme Amadio <amadio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/pythia/files/
Date: Thu, 02 Jun 2022 14:30:37
Message-Id: 1654180214.f0ad7e052bcb1de5e5464ebeb36d4af5920d43f4.amadio@gentoo
1 commit: f0ad7e052bcb1de5e5464ebeb36d4af5920d43f4
2 Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 2 14:27:11 2022 +0000
4 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 2 14:30:14 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ad7e05
7
8 sci-physics/pythia: fix bug 836833
9
10 Closes: https://bugs.gentoo.org/836833
11 Package-Manager: Portage-3.0.30, Repoman-3.0.3
12 Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
13
14 .../pythia/files/pythia-6.4.28-fno-common.patch | 44 +++++++++++-----------
15 1 file changed, 22 insertions(+), 22 deletions(-)
16
17 diff --git a/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch b/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch
18 index 3ee9bc7c0f7a..45cbe3ea57d6 100644
19 --- a/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch
20 +++ b/sci-physics/pythia/files/pythia-6.4.28-fno-common.patch
21 @@ -27,28 +27,28 @@ https://bugs.gentoo.org/766306
22 -int pyssmt[2*4*4+2*2*2+2*2*2+2*4+2*2+2*4*16+2*4*4+2*2*2+2*2*2];
23 -int pyints[2*20];
24 -int pybins[4+1000+2*20000];
25 -+extern int pyjets[2+5*4000+2*2*5*4000];
26 -+extern int pydat1[200+2*200+200+2*200];
27 -+extern int pydat2[4*500+2*4*500+2*2000+2*4*4];
28 -+extern int pydat3[3*500+2*8000+2*8000+5*8000]; /* KNDCAY=8000 */
29 -+extern char pydat4[2*500*16];
30 -+extern int pydatr[6+2*100];
31 -+extern int pysubs[2+500+81*2+2*200];
32 -+extern int pypars[200+2*200+200+2*200];
33 -+extern int pyint1[400+2*400];
34 -+extern int pyint2[500+2*500+2*20*500+2*4*40];
35 -+extern int pyint3[2*81*2+3*1000+2*1000];
36 -+extern int pyint4[500+2*5*500];
37 -+extern int pyint5[1+3*501+2*3*501];
38 -+extern char pyint6[501*28];
39 -+extern int pyint7[2*6*7*7];
40 -+extern int pyint8[2*5*13];
41 -+extern int pyint9[2*4*13];
42 -+extern int pyuppr[1+7*20+1+2*10+2*5*20+2*11]; /* PYUPPR DOES NOT EXIST IN PYTHIA6 AT ALL!!! */
43 -+extern int pymssm[100+2*100];
44 -+extern int pyssmt[2*4*4+2*2*2+2*2*2+2*4+2*2+2*4*16+2*4*4+2*2*2+2*2*2];
45 -+extern int pyints[2*20];
46 -+extern int pybins[4+1000+2*20000];
47 ++static int pyjets[2+5*4000+2*2*5*4000];
48 ++static int pydat1[200+2*200+200+2*200];
49 ++static int pydat2[4*500+2*4*500+2*2000+2*4*4];
50 ++static int pydat3[3*500+2*8000+2*8000+5*8000]; /* KNDCAY=8000 */
51 ++static char pydat4[2*500*16];
52 ++static int pydatr[6+2*100];
53 ++static int pysubs[2+500+81*2+2*200];
54 ++static int pypars[200+2*200+200+2*200];
55 ++static int pyint1[400+2*400];
56 ++static int pyint2[500+2*500+2*20*500+2*4*40];
57 ++static int pyint3[2*81*2+3*1000+2*1000];
58 ++static int pyint4[500+2*5*500];
59 ++static int pyint5[1+3*501+2*3*501];
60 ++static char pyint6[501*28];
61 ++static int pyint7[2*6*7*7];
62 ++static int pyint8[2*5*13];
63 ++static int pyint9[2*4*13];
64 ++static int pyuppr[1+7*20+1+2*10+2*5*20+2*11]; /* PYUPPR DOES NOT EXIST IN PYTHIA6 AT ALL!!! */
65 ++static int pymssm[100+2*100];
66 ++static int pyssmt[2*4*4+2*2*2+2*2*2+2*4+2*2+2*4*16+2*4*4+2*2*2+2*2*2];
67 ++static int pyints[2*20];
68 ++static int pybins[4+1000+2*20000];
69
70 void *pythia6_common_address(const char* name) {
71 if (!strcmp(name,"PYJETS")) return pyjets;