Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-chemistry/molden/files: molden-4.8-ldflags.patch molden-4.7-ldflags.patch molden-4.7-glibc-2.11.patch molden-4.7-implicit-dec.patch
Date: Thu, 24 Jun 2010 16:13:02
Message-Id: 20100624160306.B0AA22CF60@corvid.gentoo.org
1 jlec 10/06/24 16:03:06
2
3 Modified: molden-4.8-ldflags.patch
4 Added: molden-4.7-ldflags.patch
5 molden-4.7-glibc-2.11.patch
6 molden-4.7-implicit-dec.patch
7 Log:
8 Fix for glibc-2.11, fix for bug 315595
9 (Portage version: 2.2_rc67/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.2 sci-chemistry/molden/files/molden-4.8-ldflags.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molden/files/molden-4.8-ldflags.patch?rev=1.2&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molden/files/molden-4.8-ldflags.patch?rev=1.2&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molden/files/molden-4.8-ldflags.patch?r1=1.1&r2=1.2
17
18 Index: molden-4.8-ldflags.patch
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/molden/files/molden-4.8-ldflags.patch,v
21 retrieving revision 1.1
22 retrieving revision 1.2
23 diff -u -r1.1 -r1.2
24 --- molden-4.8-ldflags.patch 26 Feb 2010 05:33:33 -0000 1.1
25 +++ molden-4.8-ldflags.patch 24 Jun 2010 16:03:06 -0000 1.2
26 @@ -1,7 +1,8 @@
27 -diff -Naur molden4.8.old/makefile molden4.8/makefile
28 ---- molden4.8.old/makefile 2009-09-21 12:01:33.000000000 -0400
29 -+++ molden4.8/makefile 2010-02-26 00:11:28.000000000 -0500
30 -@@ -224,7 +224,7 @@
31 +diff --git a/makefile b/makefile
32 +index 81147a3..9e2353e 100644
33 +--- a/makefile
34 ++++ b/makefile
35 +@@ -224,10 +224,10 @@ all: molden gmolden ambfor/ambfor ambfor/ambmd surf/surf
36
37
38 molden: $(OBJS) mpdum.o xwin.o
39 @@ -9,8 +10,12 @@
40 + $(LDR) $(LDFLAGS) -o molden $(OBJS) mpdum.o xwin.o $(LIBS)
41
42 gmolden: $(OBJS) mpdum.o xwingl.o
43 - $(LDR) -o gmolden $(OBJS) mpdum.o xwingl.o $(LIBSG)
44 -@@ -269,7 +269,7 @@
45 +- $(LDR) -o gmolden $(OBJS) mpdum.o xwingl.o $(LIBSG)
46 ++ $(LDR) $(LDFLAGS) -o gmolden $(OBJS) mpdum.o xwingl.o $(LIBSG)
47 +
48 + ambfor/ambfor: ambfor/*.f ambfor/*.c
49 + $(MAKE) -C ambfor FC=${FC} FFLAGS="${FFLAGS}" LDR="${LDR}" CFLAGS="${CFLAGS}"
50 +@@ -269,7 +269,7 @@ short_wrl: short_wrl.o
51 # Moldens OpenGL helper program
52
53 moldenogl: oglmol.o silly.o
54
55
56
57 1.1 sci-chemistry/molden/files/molden-4.7-ldflags.patch
58
59 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molden/files/molden-4.7-ldflags.patch?rev=1.1&view=markup
60 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molden/files/molden-4.7-ldflags.patch?rev=1.1&content-type=text/plain
61
62 Index: molden-4.7-ldflags.patch
63 ===================================================================
64 diff --git a/makefile b/makefile
65 index 410ca25..30dd5e1 100644
66 --- a/makefile
67 +++ b/makefile
68 @@ -265,7 +265,7 @@ short_wrl: short_wrl.o
69 # Moldens OpenGL helper program
70
71 moldenogl: oglmol.o silly.o
72 - $(CC) -o moldenogl oglmol.o silly.o $(LIBSOGL)
73 + $(CC) $(LDFLAGS) -o moldenogl oglmol.o silly.o $(LIBSOGL)
74
75 # conversion of CADPAC output to molden format
76
77
78
79
80 1.1 sci-chemistry/molden/files/molden-4.7-glibc-2.11.patch
81
82 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molden/files/molden-4.7-glibc-2.11.patch?rev=1.1&view=markup
83 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molden/files/molden-4.7-glibc-2.11.patch?rev=1.1&content-type=text/plain
84
85 Index: molden-4.7-glibc-2.11.patch
86 ===================================================================
87 diff --git a/xwin.c b/xwin.c
88 index d38f87c..d328ee6 100644
89 --- a/xwin.c
90 +++ b/xwin.c
91 @@ -3776,7 +3776,7 @@ static int imoptm = 0;
92 static int ibopth = 0;
93 static int iboptl = 0;
94 static int iboptm = 0;
95 -static int linkat = 0;
96 +static int lnkat = 0;
97
98 static QBOXSTRU IANZboxes[MAXAT];
99 static QBOXSTRU IZboxes[MAXAT][4];
100 @@ -19234,7 +19234,7 @@ int i;
101 if (ioniom == 1) {
102 int ism, isl;
103
104 - linkat = 0;
105 + lnkat = 0;
106
107 /* Counting the number of Link atoms between H and lower
108 levels*/
109 @@ -19247,10 +19247,10 @@ int i;
110 if (ionij != 0) continue;
111 nconn = xyzp->iconn[j*(MXCON+1)];
112 for (k=1;k<=nconn;k++) {
113 - if (xyzp->ityp[xyzp->iconn[j*(MXCON+1)+k]-1]/10000 > 0) linkat++;
114 + if (xyzp->ityp[xyzp->iconn[j*(MXCON+1)+k]-1]/10000 > 0) lnkat++;
115 }
116 }
117 - linkat += 20000;
118 + lnkat += 20000;
119 jobcom->itotc = jobcom->icopth;
120 jobcom->imult = jobcom->ispopth;
121 if (CheckChargeMult()) {
122 @@ -19271,7 +19271,7 @@ int i;
123
124 } else if (ioniom == 2) {
125
126 - linkat = 0;
127 + lnkat = 0;
128
129 /* Counting the number of Link atoms between H and
130 lower levels*/
131 @@ -19281,10 +19281,10 @@ int i;
132 if(ionij != 0) continue;
133 nconn = xyzp->iconn[j*(MXCON+1)];
134 for (k=1;k<=nconn;k++) {
135 - if (xyzp->ityp[xyzp->iconn[j*(MXCON+1)+k]-1]/10000 > 0) linkat++;
136 + if (xyzp->ityp[xyzp->iconn[j*(MXCON+1)+k]-1]/10000 > 0) lnkat++;
137 }
138 }
139 - linkat += 20000;
140 + lnkat += 20000;
141 jobcom->itotc = jobcom->icopth;
142 jobcom->imult = jobcom->ispopth;
143 if (CheckChargeMult()) {
144 @@ -19296,7 +19296,7 @@ int i;
145 break;
146 */
147 }
148 - linkat = 0;
149 + lnkat = 0;
150
151 /* Counting the number of Link atoms between H+M and
152 lower levels*/
153 @@ -19306,10 +19306,10 @@ int i;
154 if (ionij == 2) continue;
155 nconn = xyzp->iconn[j*(MXCON+1)];
156 for (k=1;k<=nconn;k++) {
157 - if (xyzp->ityp[xyzp->iconn[j*(MXCON+1)+k]-1]/10000 == 2) linkat++;
158 + if (xyzp->ityp[xyzp->iconn[j*(MXCON+1)+k]-1]/10000 == 2) lnkat++;
159 }
160 }
161 - linkat += 20000;
162 + lnkat += 20000;
163 jobcom->itotc = jobcom->icoptm;
164 jobcom->imult = jobcom->ispoptm;
165 if (CheckChargeMult()) {
166 @@ -19324,7 +19324,7 @@ int i;
167 icopt = jobcom->icoptl+3;
168 ispopt = jobcom->ispoptl-1;
169 }
170 - linkat = 0;
171 + lnkat = 0;
172 jobcom->itotc = icopt - 3;
173 jobcom->imult = ispopt + 1;
174 jobcom->ito = itopt[jmode] + 1;
175 @@ -19576,10 +19576,10 @@ int CheckChargeMult()
176 ionil = 0;
177
178 if (ioniom) {
179 - ionil = 3 - (linkat / 10000);
180 - linkat -= (linkat / 10000) * 10000;
181 + ionil = 3 - (lnkat / 10000);
182 + lnkat -= (lnkat / 10000) * 10000;
183 } else {
184 - linkat = 0;
185 + lnkat = 0;
186 }
187
188 if (*zmptrp->ihaszm) {
189 @@ -19602,10 +19602,10 @@ int CheckChargeMult()
190 }
191 }
192 /*
193 - fprintf(stderr,"ionil %d ne %d itotc %d linkat %d mult %d\n",
194 - ionil,ne,jobcom->itotc,linkat,jobcom->imult);
195 + fprintf(stderr,"ionil %d ne %d itotc %d lnkat %d mult %d\n",
196 + ionil,ne,jobcom->itotc,lnkat,jobcom->imult);
197 */
198 - ne = ne - jobcom->itotc + linkat;
199 + ne = ne - jobcom->itotc + lnkat;
200 if (ne % 2 == jobcom->imult % 2) return(1);
201 return(0);
202 }
203
204
205
206 1.1 sci-chemistry/molden/files/molden-4.7-implicit-dec.patch
207
208 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molden/files/molden-4.7-implicit-dec.patch?rev=1.1&view=markup
209 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molden/files/molden-4.7-implicit-dec.patch?rev=1.1&content-type=text/plain
210
211 Index: molden-4.7-implicit-dec.patch
212 ===================================================================
213 diff --git a/silly.c b/silly.c
214 index 57d07e8..102156a 100644
215 --- a/silly.c
216 +++ b/silly.c
217 @@ -13,6 +13,7 @@
218 #include <stdio.h>
219 #include <stdlib.h>
220 #include <math.h>
221 +#include <string.h>
222
223 #ifndef WIN32
224 #include <GL/gl.h>
Report Message
Find on MARC Find on Google Groups