1 |
tgurr 08/08/26 22:52:58 |
2 |
|
3 |
Modified: hk_classes-0.8.3-gcc43.patch |
4 |
Log: |
5 |
Update gcc 4.3 patch borrowed from mandriva, fixing bug #230251. Fix some quoting. |
6 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 dev-db/hk_classes/files/hk_classes-0.8.3-gcc43.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/hk_classes/files/hk_classes-0.8.3-gcc43.patch?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/hk_classes/files/hk_classes-0.8.3-gcc43.patch?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/hk_classes/files/hk_classes-0.8.3-gcc43.patch?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: hk_classes-0.8.3-gcc43.patch |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-db/hk_classes/files/hk_classes-0.8.3-gcc43.patch,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- hk_classes-0.8.3-gcc43.patch 25 Apr 2008 23:38:02 -0000 1.1 |
22 |
+++ hk_classes-0.8.3-gcc43.patch 26 Aug 2008 22:52:57 -0000 1.2 |
23 |
@@ -225,3 +225,97 @@ |
24 |
{ |
25 |
#ifdef HK_DEBUG |
26 |
|
27 |
+--- hk_classes-0.8.3/hk_dbaseclasses/xbase/xblock.cpp~ 2008-07-31 05:24:53.000000000 +0200 |
28 |
++++ hk_classes-0.8.3/hk_dbaseclasses/xbase/xblock.cpp 2008-07-31 05:25:00.000000000 +0200 |
29 |
+@@ -48,7 +48,7 @@ |
30 |
+ |
31 |
+ |
32 |
+ #include "xbase64.h" |
33 |
+- |
34 |
++#include <cerrno> |
35 |
+ #ifdef HAVE_IO_H // windows locking |
36 |
+ #include <io.h> |
37 |
+ #endif |
38 |
+@@ -124,7 +124,7 @@ |
39 |
+ return 0; |
40 |
+ } |
41 |
+ |
42 |
+-#elif HAVE_FCNTL_H |
43 |
++#else |
44 |
+ |
45 |
+ xbShort xbLock::LockFile( int fn, xbShort LockType, xbOffT lockLen ) |
46 |
+ { |
47 |
+--- hk_classes-0.8.3/hk_paradoxclasses/hk_paradoxcolumn.cpp~ 2006-04-19 15:11:18.000000000 +0200 |
48 |
++++ hk_classes-0.8.3/hk_paradoxclasses/hk_paradoxcolumn.cpp 2008-07-31 05:33:42.000000000 +0200 |
49 |
+@@ -10,7 +10,7 @@ |
50 |
+ // **************************************************************************** |
51 |
+ #include "hk_paradoxcolumn.h" |
52 |
+ #include "hk_paradoxdatasource.h" |
53 |
+- |
54 |
++#include <cstring> |
55 |
+ |
56 |
+ hk_paradoxcolumn::hk_paradoxcolumn(hk_paradoxdatasource* ds, const hk_string& tTRUE,const hk_string& tFALSE) |
57 |
+ :hk_storagecolumn(ds,tTRUE,tFALSE) |
58 |
+--- hk_classes-0.8.3/hk_paradoxclasses/hk_paradoxtable.cpp~ 2006-06-29 20:10:18.000000000 +0200 |
59 |
++++ hk_classes-0.8.3/hk_paradoxclasses/hk_paradoxtable.cpp 2008-07-31 05:34:19.000000000 +0200 |
60 |
+@@ -16,6 +16,7 @@ |
61 |
+ #include "hk_paradoxconnection.h" |
62 |
+ #include "hk_paradoxdatabase.h" |
63 |
+ #include "hk_url.h" |
64 |
++#include <cstring> |
65 |
+ //#include <pxversion.h> |
66 |
+ |
67 |
+ hk_paradoxtable::hk_paradoxtable(hk_paradoxdatabase* db,hk_presentation* p):hk_paradoxdatasource(db,p) |
68 |
+--- hk_classes-0.8.3/hk_firebirdclasses/hk_firebirdcolumn.cpp~ 2005-07-02 16:15:04.000000000 +0200 |
69 |
++++ hk_classes-0.8.3/hk_firebirdclasses/hk_firebirdcolumn.cpp 2008-07-31 07:53:52.000000000 +0200 |
70 |
+@@ -10,7 +10,7 @@ |
71 |
+ // **************************************************************************** |
72 |
+ #include "hk_firebirdcolumn.h" |
73 |
+ #include "hk_firebirddatasource.h" |
74 |
+- |
75 |
++#include <cstring> |
76 |
+ |
77 |
+ hk_firebirdcolumn::hk_firebirdcolumn(hk_firebirddatasource* ds, const hk_string& tTRUE,const hk_string& tFALSE) |
78 |
+ :hk_storagecolumn(ds,tTRUE,tFALSE) |
79 |
+--- hk_classes-0.8.3/hk_firebirdclasses/hk_firebirdconnection.cpp~ 2006-07-16 21:11:52.000000000 +0200 |
80 |
++++ hk_classes-0.8.3/hk_firebirdclasses/hk_firebirdconnection.cpp 2008-07-31 07:52:59.000000000 +0200 |
81 |
+@@ -14,6 +14,7 @@ |
82 |
+ #include <dirent.h> |
83 |
+ #include <unistd.h> |
84 |
+ #include <sys/stat.h> |
85 |
++#include <cstring> |
86 |
+ #ifdef HAVE_SSTREAM |
87 |
+ #include <sstream> |
88 |
+ #else |
89 |
+--- hk_classes-0.8.3/hk_firebirdclasses/hk_firebirddatasource.cpp~ 2006-06-29 20:10:17.000000000 +0200 |
90 |
++++ hk_classes-0.8.3/hk_firebirdclasses/hk_firebirddatasource.cpp 2008-07-31 07:53:29.000000000 +0200 |
91 |
+@@ -15,6 +15,7 @@ |
92 |
+ #include "hk_firebirdactionquery.h" |
93 |
+ #include <hk_datetime.h> |
94 |
+ #include <time.h> |
95 |
++#include <cstring> |
96 |
+ #include <exception> |
97 |
+ #include <new> |
98 |
+ |
99 |
+--- hk_classes-0.8.3/hk_xbaseclasses/Makefile.in~ 2006-12-17 15:27:52.000000000 +0100 |
100 |
++++ hk_classes-0.8.3/hk_xbaseclasses/Makefile.in 2008-07-31 11:08:48.000000000 +0200 |
101 |
+@@ -233,7 +233,7 @@ |
102 |
+ AM_CPPFLAGS = |
103 |
+ AM_CXXFLAGS = -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings -I@XMLINCLUDE@ @BITARCHITECTURE@ |
104 |
+ libhk_xbasedriver_la_LDFLAGS = -version-info 0:0:0 -L@XBASELIBDIR@ |
105 |
+-libhk_xbasedriver_la_LIBADD = -lxbsql ../hk_classes/libhk_classes.la |
106 |
++libhk_xbasedriver_la_LIBADD = -lxbase -lxbsql ../hk_classes/libhk_classes.la |
107 |
+ lib_LTLIBRARIES = libhk_xbasedriver.la |
108 |
+ noinst_HEADERS = hk_xbaseconnection.h hk_xbaseactionquery.h hk_xbaseconnection.h \ |
109 |
+ hk_xbasedatabase.h hk_xbasedatasource.h hk_xbasecolumn.h \ |
110 |
+--- hk_classes-0.8.3/hk_xbaseclasses/Makefile.am~ 2006-10-02 19:54:20.000000000 +0200 |
111 |
++++ hk_classes-0.8.3/hk_xbaseclasses/Makefile.am 2008-07-31 11:08:24.000000000 +0200 |
112 |
+@@ -6,7 +6,7 @@ |
113 |
+ AM_CXXFLAGS= -Wall -W -Wconversion -Wshadow -Wcast-qual -Wwrite-strings -I@XMLINCLUDE@ @BITARCHITECTURE@ |
114 |
+ |
115 |
+ libhk_xbasedriver_la_LDFLAGS = -version-info 0:0:0 -L@XBASELIBDIR@ |
116 |
+-libhk_xbasedriver_la_LIBADD = -lxbsql ../hk_classes/libhk_classes.la |
117 |
++libhk_xbasedriver_la_LIBADD = -lxbase -lxbsql ../hk_classes/libhk_classes.la |
118 |
+ |
119 |
+ lib_LTLIBRARIES = libhk_xbasedriver.la |
120 |
+ |