1 |
jlec 12/06/30 13:41:44 |
2 |
|
3 |
Added: xbase-2.0.0-x86_64.patch xbase-3.1.2-gcc47.patch |
4 |
xbase-2.0.0-fixconfig.patch |
5 |
xbase-3.1.2-fixconfig.patch xbase-2.0.0-gcc47.patch |
6 |
xbase-3.1.2-gcc44.patch |
7 |
xbase-3.1.2-gcc-version.patch |
8 |
xbase-3.1.2-lesserg.patch |
9 |
xbase-2.0.0-fixheader.patch xbase-2.0.0-ppc.patch |
10 |
xbase-3.1.2-xbnode.patch |
11 |
xbase-3.1.2-outofsource.patch |
12 |
Log: |
13 |
dev-db/xbase: Version BUmp, add all fixes from fedora including gcc-4.7 compatibility |
14 |
|
15 |
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64) |
16 |
|
17 |
Revision Changes Path |
18 |
1.1 dev-db/xbase/files/xbase-2.0.0-x86_64.patch |
19 |
|
20 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-2.0.0-x86_64.patch?rev=1.1&view=markup |
21 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-2.0.0-x86_64.patch?rev=1.1&content-type=text/plain |
22 |
|
23 |
Index: xbase-2.0.0-x86_64.patch |
24 |
=================================================================== |
25 |
diff -up xbase-2.0.0/config.sub.BAD xbase-2.0.0/config.sub |
26 |
--- xbase-2.0.0/config.sub.BAD 2008-06-05 15:47:20.000000000 -0400 |
27 |
+++ xbase-2.0.0/config.sub 2008-06-05 15:49:10.000000000 -0400 |
28 |
@@ -182,7 +182,7 @@ case $basic_machine in |
29 |
| sparc64-* | mips64-* | mipsel-* \ |
30 |
| mips64el-* | mips64orion-* | mips64orionel-* \ |
31 |
| mipstx39-* | mipstx39el-* \ |
32 |
- | f301-*) |
33 |
+ | f301-* | x86_64-* | ppc64-*) |
34 |
;; |
35 |
# Recognize the various machine names and aliases which stand |
36 |
# for a CPU type and a company and sometimes even an OS. |
37 |
|
38 |
|
39 |
|
40 |
1.1 dev-db/xbase/files/xbase-3.1.2-gcc47.patch |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-3.1.2-gcc47.patch?rev=1.1&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-3.1.2-gcc47.patch?rev=1.1&content-type=text/plain |
44 |
|
45 |
Index: xbase-3.1.2-gcc47.patch |
46 |
=================================================================== |
47 |
diff -up xbase64-3.1.2/bin/dumprecs.cpp.gcc47 xbase64-3.1.2/bin/dumprecs.cpp |
48 |
--- xbase64-3.1.2/bin/dumprecs.cpp.gcc47 2012-01-05 15:36:00.377536998 -0500 |
49 |
+++ xbase64-3.1.2/bin/dumprecs.cpp 2012-01-05 15:36:15.198399295 -0500 |
50 |
@@ -70,7 +70,7 @@ int main(int ac,char** av) |
51 |
return 1; |
52 |
} |
53 |
|
54 |
- for(int i=1; i<ac; ++i){ |
55 |
+ for(int i=1; i<ac; ++i){{ |
56 |
char* filename = av[i]; |
57 |
|
58 |
xbDbf MyFile( &x ); |
59 |
@@ -91,7 +91,7 @@ int main(int ac,char** av) |
60 |
x.DisplayError( rc ); |
61 |
} |
62 |
MyFile.CloseDatabase(); /* close database */ |
63 |
- } |
64 |
+ }} |
65 |
return 0; |
66 |
} |
67 |
|
68 |
|
69 |
|
70 |
|
71 |
1.1 dev-db/xbase/files/xbase-2.0.0-fixconfig.patch |
72 |
|
73 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-2.0.0-fixconfig.patch?rev=1.1&view=markup |
74 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-2.0.0-fixconfig.patch?rev=1.1&content-type=text/plain |
75 |
|
76 |
Index: xbase-2.0.0-fixconfig.patch |
77 |
=================================================================== |
78 |
--- xbase-2.0.0/xbase-config.in.BAD 2005-07-10 08:38:03.000000000 -0500 |
79 |
+++ xbase-2.0.0/xbase-config.in 2005-07-10 08:37:25.000000000 -0500 |
80 |
@@ -5,7 +5,7 @@ |
81 |
exec_prefix_set=no |
82 |
CC="@CC@" |
83 |
CXX="@CXX@" |
84 |
-LD="@SHARED_LD@" |
85 |
+LD="@LD@" |
86 |
|
87 |
usage="\ |
88 |
Usage: xbase-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]" |
89 |
|
90 |
|
91 |
|
92 |
1.1 dev-db/xbase/files/xbase-3.1.2-fixconfig.patch |
93 |
|
94 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-3.1.2-fixconfig.patch?rev=1.1&view=markup |
95 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-3.1.2-fixconfig.patch?rev=1.1&content-type=text/plain |
96 |
|
97 |
Index: xbase-3.1.2-fixconfig.patch |
98 |
=================================================================== |
99 |
diff -up xbase64-3.1.2/xbase64-config.in.BAD xbase64-3.1.2/xbase64-config.in |
100 |
--- xbase64-3.1.2/xbase64-config.in.BAD 2009-08-19 22:58:42.081087534 -0400 |
101 |
+++ xbase64-3.1.2/xbase64-config.in 2009-08-19 22:58:45.604090002 -0400 |
102 |
@@ -5,7 +5,7 @@ exec_prefix=@exec_prefix@ |
103 |
exec_prefix_set=no |
104 |
CC="@CC@" |
105 |
CXX="@CXX@" |
106 |
-LD="@SHARED_LD@" |
107 |
+LD="@LD@" |
108 |
|
109 |
usage="\ |
110 |
Usage: xbase-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]" |
111 |
|
112 |
|
113 |
|
114 |
1.1 dev-db/xbase/files/xbase-2.0.0-gcc47.patch |
115 |
|
116 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-2.0.0-gcc47.patch?rev=1.1&view=markup |
117 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-2.0.0-gcc47.patch?rev=1.1&content-type=text/plain |
118 |
|
119 |
Index: xbase-2.0.0-gcc47.patch |
120 |
=================================================================== |
121 |
bin/dumprecs.cpp | 6 +++--- |
122 |
1 files changed, 3 insertions(+), 3 deletions(-) |
123 |
|
124 |
diff --git a/bin/dumprecs.cpp b/bin/dumprecs.cpp |
125 |
index 94baab0..b7eaa57 100644 |
126 |
--- a/bin/dumprecs.cpp |
127 |
+++ b/bin/dumprecs.cpp |
128 |
@@ -80,10 +80,10 @@ int main(int ac,char** av) |
129 |
} |
130 |
|
131 |
cout << "\nLoop through forwards...\n"; |
132 |
- int i = 0; |
133 |
+ int j = 0; |
134 |
while(i<MyFile.NoOfRecords()) { |
135 |
- MyFile.DumpRecord(i+1); |
136 |
- i++; |
137 |
+ MyFile.DumpRecord(j+1); |
138 |
+ j++; |
139 |
} |
140 |
|
141 |
MyFile.CloseDatabase(); /* close database */ |
142 |
|
143 |
|
144 |
|
145 |
1.1 dev-db/xbase/files/xbase-3.1.2-gcc44.patch |
146 |
|
147 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-3.1.2-gcc44.patch?rev=1.1&view=markup |
148 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-3.1.2-gcc44.patch?rev=1.1&content-type=text/plain |
149 |
|
150 |
Index: xbase-3.1.2-gcc44.patch |
151 |
=================================================================== |
152 |
diff -up xbase64-3.1.2/xbase64/xbase64.cpp.gcc44 xbase64-3.1.2/xbase64/xbase64.cpp |
153 |
--- xbase64-3.1.2/xbase64/xbase64.cpp.gcc44 2006-07-17 12:54:42.000000000 -0400 |
154 |
+++ xbase64-3.1.2/xbase64/xbase64.cpp 2009-08-19 23:08:14.724079392 -0400 |
155 |
@@ -66,6 +66,8 @@ |
156 |
#include <dos.h> |
157 |
#endif |
158 |
|
159 |
+#include <cerrno> |
160 |
+ |
161 |
|
162 |
/*! \file xbase64.cpp |
163 |
*/ |
164 |
diff -up xbase64-3.1.2/xbase64/xblock.cpp.gcc44 xbase64-3.1.2/xbase64/xblock.cpp |
165 |
--- xbase64-3.1.2/xbase64/xblock.cpp.gcc44 2009-08-19 23:08:59.408186578 -0400 |
166 |
+++ xbase64-3.1.2/xbase64/xblock.cpp 2009-08-19 23:09:11.416184844 -0400 |
167 |
@@ -65,6 +65,8 @@ |
168 |
//#include <stdio.h> |
169 |
//#include <stdlib.h> |
170 |
|
171 |
+#include <cerrno> |
172 |
+ |
173 |
/*! \file xblock.cpp |
174 |
*/ |
175 |
#ifdef XB_LOCKING_ON |
176 |
|
177 |
|
178 |
|
179 |
1.1 dev-db/xbase/files/xbase-3.1.2-gcc-version.patch |
180 |
|
181 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-3.1.2-gcc-version.patch?rev=1.1&view=markup |
182 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-3.1.2-gcc-version.patch?rev=1.1&content-type=text/plain |
183 |
|
184 |
Index: xbase-3.1.2-gcc-version.patch |
185 |
=================================================================== |
186 |
configure.in | 2 +- |
187 |
1 files changed, 1 insertions(+), 1 deletions(-) |
188 |
|
189 |
diff --git a/configure.in b/configure.in |
190 |
index 3110c70..5850231 100755 |
191 |
--- a/configure.in |
192 |
+++ b/configure.in |
193 |
@@ -74,7 +74,7 @@ AC_SUBST(RHREL) |
194 |
|
195 |
# get G++ version |
196 |
if test "$GXX" = "yes"; then |
197 |
- GXXVER=`${CXX} -v 2>&1 | grep version | cut -d " " -f 3 -` |
198 |
+ GXXVER=`${CXX} -v 2>&1 | grep " version " | cut -d " " -f 3 -` |
199 |
GXXVER="gcc${GXXVER}" |
200 |
else |
201 |
GXXVER="" |
202 |
|
203 |
|
204 |
|
205 |
1.1 dev-db/xbase/files/xbase-3.1.2-lesserg.patch |
206 |
|
207 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-3.1.2-lesserg.patch?rev=1.1&view=markup |
208 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-3.1.2-lesserg.patch?rev=1.1&content-type=text/plain |
209 |
|
210 |
Index: xbase-3.1.2-lesserg.patch |
211 |
=================================================================== |
212 |
diff -up xbase64-3.1.2/xbase64/xbase64.cpp.lesserg xbase64-3.1.2/xbase64/xbase64.cpp |
213 |
--- xbase64-3.1.2/xbase64/xbase64.cpp.lesserg 2012-01-05 15:31:01.695312436 -0500 |
214 |
+++ xbase64-3.1.2/xbase64/xbase64.cpp 2012-01-05 15:31:01.717312232 -0500 |
215 |
@@ -38,7 +38,7 @@ |
216 |
|
217 |
*/ |
218 |
|
219 |
-#ifdef __GNU LesserG__ |
220 |
+#ifdef __GNU_LesserG__ |
221 |
#pragma implementation "xbase64.h" |
222 |
#endif |
223 |
|
224 |
diff -up xbase64-3.1.2/xbase64/xbase64.h.lesserg xbase64-3.1.2/xbase64/xbase64.h |
225 |
--- xbase64-3.1.2/xbase64/xbase64.h.lesserg 2006-07-17 12:54:50.000000000 -0400 |
226 |
+++ xbase64-3.1.2/xbase64/xbase64.h 2012-01-05 15:31:01.718312223 -0500 |
227 |
@@ -42,7 +42,7 @@ |
228 |
#ifndef __XB_XBASE_H__ |
229 |
#define __XB_XBASE_H__ |
230 |
|
231 |
-#ifdef __GNU LesserG__ |
232 |
+#ifdef __GNU_LesserG__ |
233 |
#pragma interface |
234 |
#endif |
235 |
|
236 |
@@ -60,7 +60,7 @@ |
237 |
// ripped from wxWindows |
238 |
|
239 |
// _declspec works in BC++ 5 and later, as well as VC++ |
240 |
-#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__GNU LesserC__) |
241 |
+#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__GNU_LesserC__) |
242 |
# ifdef XBMAKINGDLL |
243 |
# define XBDLLEXPORT __declspec( dllexport ) |
244 |
# define XBDLLEXPORT_DATA(type) __declspec( dllexport ) type |
245 |
diff -up xbase64-3.1.2/xbase64/xbcdx.h.lesserg xbase64-3.1.2/xbase64/xbcdx.h |
246 |
--- xbase64-3.1.2/xbase64/xbcdx.h.lesserg 2012-01-05 15:32:17.398608985 -0500 |
247 |
+++ xbase64-3.1.2/xbase64/xbcdx.h 2012-01-05 15:32:43.051370614 -0500 |
248 |
@@ -50,7 +50,7 @@ struct CdxInnerNode: public CdxNode |
249 |
{ |
250 |
char keys[500]; |
251 |
} |
252 |
-#ifdef __GNU LesserC__ |
253 |
+#ifdef __GNU_LesserC__ |
254 |
__attribute__((packed)) |
255 |
#endif |
256 |
; |
257 |
@@ -67,7 +67,7 @@ struct CdxLeafNode: public CdxNode |
258 |
char byteCount; |
259 |
char keys[488]; |
260 |
} |
261 |
-#ifdef __GNU LesserC__ |
262 |
+#ifdef __GNU_LesserC__ |
263 |
__attribute__((packed)) |
264 |
#endif |
265 |
; |
266 |
diff -up xbase64-3.1.2/xbase64/xbdate.cpp.lesserg xbase64-3.1.2/xbase64/xbdate.cpp |
267 |
--- xbase64-3.1.2/xbase64/xbdate.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 |
268 |
+++ xbase64-3.1.2/xbase64/xbdate.cpp 2012-01-05 15:31:01.719312213 -0500 |
269 |
@@ -40,7 +40,7 @@ |
270 |
|
271 |
*/ |
272 |
|
273 |
-#ifdef __GNU LesserG__ |
274 |
+#ifdef __GNU_LesserG__ |
275 |
#pragma implementation "xbdate.h" |
276 |
#endif |
277 |
|
278 |
diff -up xbase64-3.1.2/xbase64/xbdate.h.lesserg xbase64-3.1.2/xbase64/xbdate.h |
279 |
--- xbase64-3.1.2/xbase64/xbdate.h.lesserg 2006-07-17 12:54:50.000000000 -0400 |
280 |
+++ xbase64-3.1.2/xbase64/xbdate.h 2012-01-05 15:31:01.721312195 -0500 |
281 |
@@ -45,7 +45,7 @@ |
282 |
#ifndef __XB_XBDATE_H__ |
283 |
#define __XB_XBDATE_H__ |
284 |
|
285 |
-#ifdef __GNU LesserG__ |
286 |
+#ifdef __GNU_LesserG__ |
287 |
#pragma interface |
288 |
#endif |
289 |
|
290 |
diff -up xbase64-3.1.2/xbase64/xbdbf.cpp.lesserg xbase64-3.1.2/xbase64/xbdbf.cpp |
291 |
--- xbase64-3.1.2/xbase64/xbdbf.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 |
292 |
+++ xbase64-3.1.2/xbase64/xbdbf.cpp 2012-01-05 15:31:01.722312185 -0500 |
293 |
@@ -39,7 +39,7 @@ |
294 |
|
295 |
*/ |
296 |
|
297 |
-#ifdef __GNU LesserG__ |
298 |
+#ifdef __GNU_LesserG__ |
299 |
#pragma implementation "xbdbf.h" |
300 |
#endif |
301 |
|
302 |
diff -up xbase64-3.1.2/xbase64/xbdbf.h.lesserg xbase64-3.1.2/xbase64/xbdbf.h |
303 |
--- xbase64-3.1.2/xbase64/xbdbf.h.lesserg 2006-07-17 12:54:50.000000000 -0400 |
304 |
+++ xbase64-3.1.2/xbase64/xbdbf.h 2012-01-05 15:31:01.723312175 -0500 |
305 |
@@ -41,7 +41,7 @@ |
306 |
#ifndef __XB_DBF_H__ |
307 |
#define __XB_DBF_H__ |
308 |
|
309 |
-#ifdef __GNU LesserG__ |
310 |
+#ifdef __GNU_LesserG__ |
311 |
#pragma interface |
312 |
#endif |
313 |
|
314 |
diff -up xbase64-3.1.2/xbase64/xbexp.cpp.lesserg xbase64-3.1.2/xbase64/xbexp.cpp |
315 |
--- xbase64-3.1.2/xbase64/xbexp.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 |
316 |
+++ xbase64-3.1.2/xbase64/xbexp.cpp 2012-01-05 15:31:01.725312157 -0500 |
317 |
@@ -38,7 +38,7 @@ |
318 |
|
319 |
*/ |
320 |
|
321 |
-#ifdef __GNU LesserG__ |
322 |
+#ifdef __GNU_LesserG__ |
323 |
#pragma implementation "xbexp.h" |
324 |
#endif |
325 |
|
326 |
diff -up xbase64-3.1.2/xbase64/xbexp.h.lesserg xbase64-3.1.2/xbase64/xbexp.h |
327 |
--- xbase64-3.1.2/xbase64/xbexp.h.lesserg 2006-07-17 12:54:50.000000000 -0400 |
328 |
+++ xbase64-3.1.2/xbase64/xbexp.h 2012-01-05 15:31:01.726312148 -0500 |
329 |
@@ -42,7 +42,7 @@ |
330 |
#ifndef __XB_EXP_H__ |
331 |
#define __XB_EXP_H__ |
332 |
|
333 |
-#ifdef __GNU LesserG__ |
334 |
+#ifdef __GNU_LesserG__ |
335 |
#pragma interface |
336 |
#endif |
337 |
|
338 |
diff -up xbase64-3.1.2/xbase64/xbfile.cpp.lesserg xbase64-3.1.2/xbase64/xbfile.cpp |
339 |
--- xbase64-3.1.2/xbase64/xbfile.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 |
340 |
+++ xbase64-3.1.2/xbase64/xbfile.cpp 2012-01-05 15:31:01.727312139 -0500 |
341 |
@@ -39,7 +39,7 @@ |
342 |
|
343 |
*/ |
344 |
|
345 |
-#ifdef __GNU LesserG__ |
346 |
+#ifdef __GNU_LesserG__ |
347 |
#pragma implementation "xbfile.h" |
348 |
#endif |
349 |
|
350 |
diff -up xbase64-3.1.2/xbase64/xbfile.h.lesserg xbase64-3.1.2/xbase64/xbfile.h |
351 |
--- xbase64-3.1.2/xbase64/xbfile.h.lesserg 2006-07-17 12:54:50.000000000 -0400 |
352 |
+++ xbase64-3.1.2/xbase64/xbfile.h 2012-01-05 15:31:01.728312130 -0500 |
353 |
@@ -45,7 +45,7 @@ |
354 |
#ifndef __XB_FILE_H__ |
355 |
#define __XB_FILE_H__ |
356 |
|
357 |
-#ifdef __GNU LesserG__ |
358 |
+#ifdef __GNU_LesserG__ |
359 |
#pragma interface |
360 |
#endif |
361 |
|
362 |
diff -up xbase64-3.1.2/xbase64/xbfilter.cpp.lesserg xbase64-3.1.2/xbase64/xbfilter.cpp |
363 |
--- xbase64-3.1.2/xbase64/xbfilter.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 |
364 |
+++ xbase64-3.1.2/xbase64/xbfilter.cpp 2012-01-05 15:31:01.729312120 -0500 |
365 |
@@ -38,7 +38,7 @@ |
366 |
|
367 |
*/ |
368 |
|
369 |
-#ifdef __GNU LesserG__ |
370 |
+#ifdef __GNU_LesserG__ |
371 |
#pragma implementation "xbfilter.h" |
372 |
#endif |
373 |
|
374 |
diff -up xbase64-3.1.2/xbase64/xbfilter.h.lesserg xbase64-3.1.2/xbase64/xbfilter.h |
375 |
--- xbase64-3.1.2/xbase64/xbfilter.h.lesserg 2006-07-17 12:54:50.000000000 -0400 |
376 |
+++ xbase64-3.1.2/xbase64/xbfilter.h 2012-01-05 15:31:01.731312101 -0500 |
377 |
@@ -44,7 +44,7 @@ |
378 |
#ifndef __XB_FILTER_H__ |
379 |
#define __XB_FILTER_H__ |
380 |
|
381 |
-#ifdef __GNU LesserG__ |
382 |
+#ifdef __GNU_LesserG__ |
383 |
#pragma interface |
384 |
#endif |
385 |
|
386 |
diff -up xbase64-3.1.2/xbase64/xbindex.cpp.lesserg xbase64-3.1.2/xbase64/xbindex.cpp |
387 |
--- xbase64-3.1.2/xbase64/xbindex.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 |
388 |
+++ xbase64-3.1.2/xbase64/xbindex.cpp 2012-01-05 15:31:01.732312092 -0500 |
389 |
@@ -37,7 +37,7 @@ |
390 |
USA |
391 |
*/ |
392 |
|
393 |
-#ifdef __GNU LesserG__ |
394 |
+#ifdef __GNU_LesserG__ |
395 |
#pragma implementation "xbindex.h" |
396 |
#endif |
397 |
|
398 |
diff -up xbase64-3.1.2/xbase64/xbindex.h.lesserg xbase64-3.1.2/xbase64/xbindex.h |
399 |
--- xbase64-3.1.2/xbase64/xbindex.h.lesserg 2006-07-17 12:54:50.000000000 -0400 |
400 |
+++ xbase64-3.1.2/xbase64/xbindex.h 2012-01-05 15:31:01.733312083 -0500 |
401 |
@@ -43,7 +43,7 @@ |
402 |
#ifndef __XB_INDEX_H__ |
403 |
#define __XB_INDEX_H__ |
404 |
|
405 |
-#ifdef __GNU LesserG__ |
406 |
+#ifdef __GNU_LesserG__ |
407 |
#pragma interface |
408 |
#endif |
409 |
|
410 |
diff -up xbase64-3.1.2/xbase64/xblock.cpp.lesserg xbase64-3.1.2/xbase64/xblock.cpp |
411 |
--- xbase64-3.1.2/xbase64/xblock.cpp.lesserg 2012-01-05 15:31:01.696312427 -0500 |
412 |
+++ xbase64-3.1.2/xbase64/xblock.cpp 2012-01-05 15:31:01.734312074 -0500 |
413 |
@@ -42,7 +42,7 @@ |
414 |
USA |
415 |
*/ |
416 |
|
417 |
-#ifdef __GNU LesserG__ |
418 |
+#ifdef __GNU_LesserG__ |
419 |
#pragma implementation "xblock.h" |
420 |
#endif |
421 |
|
422 |
diff -up xbase64-3.1.2/xbase64/xblock.h.lesserg xbase64-3.1.2/xbase64/xblock.h |
423 |
--- xbase64-3.1.2/xbase64/xblock.h.lesserg 2006-07-17 12:54:50.000000000 -0400 |
424 |
+++ xbase64-3.1.2/xbase64/xblock.h 2012-01-05 15:31:01.735312065 -0500 |
425 |
@@ -44,7 +44,7 @@ |
426 |
#ifndef __XB_XBLOCK_H__ |
427 |
#define __XB_XBLOCK_H__ |
428 |
|
429 |
-#ifdef __GNU LesserG__ |
430 |
+#ifdef __GNU_LesserG__ |
431 |
#pragma interface |
432 |
#endif |
433 |
|
434 |
diff -up xbase64-3.1.2/xbase64/xbndx.cpp.lesserg xbase64-3.1.2/xbase64/xbndx.cpp |
435 |
--- xbase64-3.1.2/xbase64/xbndx.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 |
436 |
+++ xbase64-3.1.2/xbase64/xbndx.cpp 2012-01-05 15:31:01.737312045 -0500 |
437 |
@@ -36,7 +36,7 @@ |
438 |
|
439 |
*/ |
440 |
|
441 |
-#ifdef __GNU LesserG__ |
442 |
+#ifdef __GNU_LesserG__ |
443 |
#pragma implementation "xbndx.h" |
444 |
#endif |
445 |
|
446 |
diff -up xbase64-3.1.2/xbase64/xbndx.h.lesserg xbase64-3.1.2/xbase64/xbndx.h |
447 |
--- xbase64-3.1.2/xbase64/xbndx.h.lesserg 2006-07-17 12:54:50.000000000 -0400 |
448 |
+++ xbase64-3.1.2/xbase64/xbndx.h 2012-01-05 15:31:01.738312036 -0500 |
449 |
@@ -41,7 +41,7 @@ |
450 |
#ifndef __XB_NDX_H__ |
451 |
#define __XB_NDX_H__ |
452 |
|
453 |
-#ifdef __GNU LesserG__ |
454 |
+#ifdef __GNU_LesserG__ |
455 |
#pragma interface |
456 |
#endif |
457 |
|
458 |
diff -up xbase64-3.1.2/xbase64/xbntx.cpp.lesserg xbase64-3.1.2/xbase64/xbntx.cpp |
459 |
--- xbase64-3.1.2/xbase64/xbntx.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 |
460 |
+++ xbase64-3.1.2/xbase64/xbntx.cpp 2012-01-05 15:31:01.740312018 -0500 |
461 |
@@ -40,7 +40,7 @@ |
462 |
USA |
463 |
*/ |
464 |
|
465 |
-#ifdef __GNU LesserG__ |
466 |
+#ifdef __GNU_LesserG__ |
467 |
#pragma implementation "xbntx.h" |
468 |
#endif |
469 |
|
470 |
diff -up xbase64-3.1.2/xbase64/xbntx.h.lesserg xbase64-3.1.2/xbase64/xbntx.h |
471 |
--- xbase64-3.1.2/xbase64/xbntx.h.lesserg 2006-07-17 12:54:50.000000000 -0400 |
472 |
+++ xbase64-3.1.2/xbase64/xbntx.h 2012-01-05 15:31:01.741312009 -0500 |
473 |
@@ -42,7 +42,7 @@ |
474 |
#ifndef __XB_NTX_H__ |
475 |
#define __XB_NTX_H__ |
476 |
|
477 |
-#ifdef __GNU LesserG__ |
478 |
+#ifdef __GNU_LesserG__ |
479 |
#pragma interface |
480 |
#endif |
481 |
|
482 |
diff -up xbase64-3.1.2/xbase64/xbstring.cpp.lesserg xbase64-3.1.2/xbase64/xbstring.cpp |
483 |
--- xbase64-3.1.2/xbase64/xbstring.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 |
484 |
+++ xbase64-3.1.2/xbase64/xbstring.cpp 2012-01-05 15:31:01.742312000 -0500 |
485 |
@@ -38,7 +38,7 @@ |
486 |
|
487 |
*/ |
488 |
|
489 |
-#ifdef __GNU LesserG__ |
490 |
+#ifdef __GNU_LesserG__ |
491 |
#pragma implementation "xbstring.h" |
492 |
#endif |
493 |
|
494 |
diff -up xbase64-3.1.2/xbase64/xbstring.h.lesserg xbase64-3.1.2/xbase64/xbstring.h |
495 |
--- xbase64-3.1.2/xbase64/xbstring.h.lesserg 2006-07-17 12:54:50.000000000 -0400 |
496 |
+++ xbase64-3.1.2/xbase64/xbstring.h 2012-01-05 15:31:01.743311990 -0500 |
497 |
@@ -41,7 +41,7 @@ |
498 |
#ifndef __XBSTRING_H__ |
499 |
#define __XBSTRING_H__ |
500 |
|
501 |
-#ifdef __GNU LesserG__ |
502 |
+#ifdef __GNU_LesserG__ |
503 |
#pragma interface |
504 |
#endif |
505 |
|
506 |
|
507 |
|
508 |
|
509 |
1.1 dev-db/xbase/files/xbase-2.0.0-fixheader.patch |
510 |
|
511 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-2.0.0-fixheader.patch?rev=1.1&view=markup |
512 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-2.0.0-fixheader.patch?rev=1.1&content-type=text/plain |
513 |
|
514 |
Index: xbase-2.0.0-fixheader.patch |
515 |
=================================================================== |
516 |
--- xbase-2.0.0/xbase/ntx.h.BAD 2006-06-04 08:36:08.000000000 -0500 |
517 |
+++ xbase-2.0.0/xbase/ntx.h 2006-06-04 08:36:13.000000000 -0500 |
518 |
@@ -218,7 +218,7 @@ |
519 |
xbShort KeyExists( char * Key ) { return FindKey( Key, strlen( Key ), 0 ); } |
520 |
xbShort KeyExists( xbDouble ); |
521 |
|
522 |
- xbShort xbNtx::AllocKeyBufs(void); |
523 |
+ xbShort AllocKeyBufs(void); |
524 |
|
525 |
virtual void GetExpression(char *buf, int len); |
526 |
}; |
527 |
|
528 |
|
529 |
|
530 |
1.1 dev-db/xbase/files/xbase-2.0.0-ppc.patch |
531 |
|
532 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-2.0.0-ppc.patch?rev=1.1&view=markup |
533 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-2.0.0-ppc.patch?rev=1.1&content-type=text/plain |
534 |
|
535 |
Index: xbase-2.0.0-ppc.patch |
536 |
=================================================================== |
537 |
--- xbase-2.0.0/ltconfig.foo 2007-05-04 18:14:42.000000000 -0400 |
538 |
+++ xbase-2.0.0/ltconfig 2007-05-04 18:15:39.000000000 -0400 |
539 |
@@ -1664,16 +1664,7 @@ linux-gnu*) |
540 |
shlibpath_var=LD_LIBRARY_PATH |
541 |
check_shared_deplibs_method='file_magic ELF 32-bit LSB shared object' |
542 |
sys_lib_search_path="/lib /usr/lib /usr/local/lib `echo $LD_LIBRARY_PATH | sed -e 's/:/ /g'`" |
543 |
- |
544 |
- if test -f /lib/ld.so.1; then |
545 |
- dynamic_linker='GNU ld.so' |
546 |
- else |
547 |
- # Only the GNU ld.so supports shared libraries on MkLinux. |
548 |
- case "$host_cpu" in |
549 |
- powerpc*) dynamic_linker=no ;; |
550 |
- *) dynamic_linker='Linux ld.so' ;; |
551 |
- esac |
552 |
- fi |
553 |
+ dynamic_linker='GNU ld.so' |
554 |
;; |
555 |
|
556 |
netbsd* | openbsd*) |
557 |
|
558 |
|
559 |
|
560 |
1.1 dev-db/xbase/files/xbase-3.1.2-xbnode.patch |
561 |
|
562 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-3.1.2-xbnode.patch?rev=1.1&view=markup |
563 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-3.1.2-xbnode.patch?rev=1.1&content-type=text/plain |
564 |
|
565 |
Index: xbase-3.1.2-xbnode.patch |
566 |
=================================================================== |
567 |
diff -up xbase64-3.1.2/xbase64/xbnode.cpp.BAD xbase64-3.1.2/xbase64/xbnode.cpp |
568 |
--- xbase64-3.1.2/xbase64/xbnode.cpp.BAD 2009-08-19 23:10:38.444059289 -0400 |
569 |
+++ xbase64-3.1.2/xbase64/xbnode.cpp 2009-08-19 23:10:47.348202984 -0400 |
570 |
@@ -1,4 +1,4 @@ |
571 |
-#include "xbNode.h" |
572 |
+#include "xbnode.h" |
573 |
|
574 |
void xbNodeLink::AddNode(xbNodeLink* node) |
575 |
{ |
576 |
|
577 |
|
578 |
|
579 |
1.1 dev-db/xbase/files/xbase-3.1.2-outofsource.patch |
580 |
|
581 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-3.1.2-outofsource.patch?rev=1.1&view=markup |
582 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/xbase/files/xbase-3.1.2-outofsource.patch?rev=1.1&content-type=text/plain |
583 |
|
584 |
Index: xbase-3.1.2-outofsource.patch |
585 |
=================================================================== |
586 |
bin/Makefile.am | 2 +- |
587 |
examples/Makefile.am | 2 +- |
588 |
libtest/Makefile.am | 2 +- |
589 |
xbase64/Makefile.am | 2 +- |
590 |
4 files changed, 4 insertions(+), 4 deletions(-) |
591 |
|
592 |
diff --git a/bin/Makefile.am b/bin/Makefile.am |
593 |
index 43c8333..ca49ca1 100755 |
594 |
--- a/bin/Makefile.am |
595 |
+++ b/bin/Makefile.am |
596 |
@@ -1,5 +1,5 @@ |
597 |
|
598 |
-INCLUDES= -I$(topdir) |
599 |
+INCLUDES= -I$(top_srcdir) |
600 |
LDADD = -L$(topdir)/xbase64 -lxbase64 |
601 |
|
602 |
INSTALL_PROGRAM = @INSTALL@ |
603 |
diff --git a/examples/Makefile.am b/examples/Makefile.am |
604 |
index 248b1ec..85adbf3 100755 |
605 |
--- a/examples/Makefile.am |
606 |
+++ b/examples/Makefile.am |
607 |
@@ -1,5 +1,5 @@ |
608 |
|
609 |
-INCLUDES= -I$(topdir) $(all_includes) |
610 |
+INCLUDES= -I$(top_srcdir) $(all_includes) |
611 |
LDADD = -L$(topdir)/xbase64 -lxbase64 |
612 |
|
613 |
# for shadow passwords override the value |
614 |
diff --git a/libtest/Makefile.am b/libtest/Makefile.am |
615 |
index 9e84830..1b73af1 100755 |
616 |
--- a/libtest/Makefile.am |
617 |
+++ b/libtest/Makefile.am |
618 |
@@ -1,5 +1,5 @@ |
619 |
|
620 |
-INCLUDES= -I$(topdir) |
621 |
+INCLUDES= -I$(top_srcdir) |
622 |
LDADD = -L$(topdir)/xbase64 -lxbase64 |
623 |
|
624 |
INSTALL_PROGRAM = @INSTALL@ |
625 |
diff --git a/xbase64/Makefile.am b/xbase64/Makefile.am |
626 |
index b0dff24..857aa82 100755 |
627 |
--- a/xbase64/Makefile.am |
628 |
+++ b/xbase64/Makefile.am |
629 |
@@ -25,7 +25,7 @@ |
630 |
# |
631 |
# |
632 |
|
633 |
-INCLUDES = -I$(topdir) |
634 |
+INCLUDES = -I$(top_srcdir) |
635 |
|
636 |
lib_LTLIBRARIES = libxbase64.la |