Gentoo Archives: gentoo-commits

From: "Mounir Lamouri (volkmar)" <volkmar@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/clinkcc/files: clinkcc-1.7.1-gentoo.patch
Date: Thu, 18 Jun 2009 18:57:19
Message-Id: E1MHMnV-0001Tp-PO@stork.gentoo.org
1 volkmar 09/06/18 18:57:17
2
3 Added: clinkcc-1.7.1-gentoo.patch
4 Log:
5 initial commit, bug 179471
6 (Portage version: 2.1.6.13/cvs/Linux ppc)
7
8 Revision Changes Path
9 1.1 net-libs/clinkcc/files/clinkcc-1.7.1-gentoo.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/clinkcc/files/clinkcc-1.7.1-gentoo.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/clinkcc/files/clinkcc-1.7.1-gentoo.patch?rev=1.1&content-type=text/plain
13
14 Index: clinkcc-1.7.1-gentoo.patch
15 ===================================================================
16 Fix various gcc and glibc isues
17 and more trivial ones.
18
19 By Mounir Lamouri (volkmar) for Gentoo
20
21 --- src/cybergarage/io/File.cpp.old 2009-06-17 01:53:25.000000000 +0200
22 +++ src/cybergarage/io/File.cpp 2009-06-17 01:54:06.000000000 +0200
23 @@ -37,6 +37,7 @@
24 #endif
25
26 #include <stdio.h>
27 +#include <string.h>
28
29 #if defined(WIN32)
30 #include <windows.h>
31 --- src/cybergarage/io/StringBufferInputStream.cpp.old 2009-06-17 01:58:57.000000000 +0200
32 +++ src/cybergarage/io/StringBufferInputStream.cpp 2009-06-17 01:59:16.000000000 +0200
33 @@ -13,6 +13,8 @@
34 *
35 ******************************************************************/
36
37 +#include <string.h>
38 +
39 #include <cybergarage/io/StringBufferInputStream.h>
40
41 using namespace CyberIO;
42 --- src/cybergarage/net/DatagramSocket.cpp.old 2009-06-17 02:01:50.000000000 +0200
43 +++ src/cybergarage/net/DatagramSocket.cpp 2009-06-17 02:02:14.000000000 +0200
44 @@ -30,6 +30,8 @@
45 #include <cybergarage/net/SocketUtil.h>
46
47 #include <stdio.h>
48 +#include <string.h>
49 +#include <stdlib.h>
50
51 using namespace CyberNet;
52
53 --- src/cybergarage/net/HostInterface.cpp.old 2009-06-17 02:03:40.000000000 +0200
54 +++ src/cybergarage/net/HostInterface.cpp 2009-06-17 02:03:54.000000000 +0200
55 @@ -38,6 +38,7 @@
56 #endif
57
58 #include <stdio.h>
59 +#include <stdlib.h>
60
61 #if (defined(WIN32) || defined(__CYGWIN__)) && !defined(ITRON)
62 #include <Iptypes.h>
63 --- src/cybergarage/net/MulticastSocket.cpp.old 2009-06-17 02:04:19.000000000 +0200
64 +++ src/cybergarage/net/MulticastSocket.cpp 2009-06-17 02:04:30.000000000 +0200
65 @@ -28,6 +28,7 @@
66 #include <cybergarage/net/HostInterface.h>
67 #include <cybergarage/util/StringUtil.h>
68 #include <stdio.h>
69 +#include <string.h>
70
71 using namespace CyberNet;
72
73 --- src/cybergarage/net/SocketUtil.cpp.old 2009-06-17 02:05:47.000000000 +0200
74 +++ src/cybergarage/net/SocketUtil.cpp 2009-06-17 02:06:23.000000000 +0200
75 @@ -24,6 +24,7 @@
76 #include <cybergarage/net/SocketUtil.h>
77
78 #include <stdio.h>
79 +#include <string.h>
80
81 using namespace CyberNet;
82
83 --- src/cybergarage/http/HTTPHeader.cpp.old 2009-06-17 02:07:57.000000000 +0200
84 +++ src/cybergarage/http/HTTPHeader.cpp 2009-06-17 02:08:12.000000000 +0200
85 @@ -17,6 +17,7 @@
86 ******************************************************************/
87
88 #include <string>
89 +#include <stdlib.h>
90 #include <cybergarage/http/HTTPHeader.h>
91 #include <cybergarage/util/StringUtil.h>
92 #include <cybergarage/io/StringReader.h>
93 --- include/cybergarage/http/HTTPPacket.h.old 2009-06-17 13:07:58.000000000 +0200
94 +++ include/cybergarage/http/HTTPPacket.h 2009-06-17 13:08:17.000000000 +0200
95 @@ -24,6 +24,7 @@
96 #include <string>
97 #include <vector>
98 #include <sstream>
99 +#include <stdlib.h>
100
101 namespace CyberHTTP {
102
103 --- src/cybergarage/http/HTTPRequest.cpp.old 2009-06-17 13:08:54.000000000 +0200
104 +++ src/cybergarage/http/HTTPRequest.cpp 2009-06-17 13:09:09.000000000 +0200
105 @@ -53,6 +53,7 @@
106 #include <string>
107 #include <iostream>
108 #include <sstream>
109 +#include <string.h>
110
111 using namespace std;
112 using namespace CyberNet;
113 --- src/cybergarage/http/HTTPPacket.cpp.old 2009-06-17 13:10:52.000000000 +0200
114 +++ src/cybergarage/http/HTTPPacket.cpp 2009-06-17 13:11:04.000000000 +0200
115 @@ -86,6 +86,7 @@
116 #include <string>
117 #include <sstream>
118 #include <stdlib.h>
119 +#include <string.h>
120
121 using namespace std;
122 using namespace CyberHTTP;
123 --- src/cybergarage/http/HTTPStatus.cpp.old 2009-06-17 13:13:08.000000000 +0200
124 +++ src/cybergarage/http/HTTPStatus.cpp 2009-06-17 13:13:27.000000000 +0200
125 @@ -26,6 +26,8 @@
126 #include <cybergarage/util/StringTokenizer.h>
127 #include <cybergarage/util/StringUtil.h>
128
129 +#include <stdlib.h>
130 +
131 using namespace CyberHTTP;
132 using namespace CyberUtil;
133
134 --- src/cybergarage/xml/Node.cpp.old 2009-06-17 13:15:02.000000000 +0200
135 +++ src/cybergarage/xml/Node.cpp 2009-06-17 13:15:34.000000000 +0200
136 @@ -32,6 +32,8 @@
137 #include <cybergarage/xml/Node.h>
138
139 #include <stdio.h>
140 +#include <stdlib.h>
141 +#include <string.h>
142
143 using namespace std;
144 using namespace CyberXML;
145 --- include/cybergarage/xml/Parser.h.old 2009-06-17 13:27:05.000000000 +0200
146 +++ include/cybergarage/xml/Parser.h 2009-06-17 13:27:23.000000000 +0200
147 @@ -18,6 +18,7 @@
148
149 #include <stdio.h>
150 #include <string>
151 +#include <string.h>
152 #include <cybergarage/xml/XML.h>
153 #include <cybergarage/xml/Node.h>
154 #include <cybergarage/io/File.h>
155 --- src/cybergarage/xml/XML.cpp.old 2009-06-17 13:28:00.000000000 +0200
156 +++ src/cybergarage/xml/XML.cpp 2009-06-17 13:29:31.000000000 +0200
157 @@ -51,6 +51,7 @@
158 #endif
159
160 #include <stdio.h>
161 +#include <stdlib.h>
162
163 using namespace std;
164 using namespace CyberXML;
165 @@ -123,7 +124,7 @@
166 char *cpbuf = strdup(str);
167 if (cpbuf == NULL)
168 return NULL;
169 - const char *inbuf = cpbuf;
170 + char *inbuf = cpbuf;
171 size_t inbyteleft = strlen(str);
172 size_t outbufSize = inbyteleft * sizeof(UnicodeStr) * 4;
173 UnicodeStr *outbuf = new UnicodeStr[outbufSize + 1];
174 --- src/cybergarage/xml/libxml2/Libxml2Parser.cpp.old 2009-06-17 13:33:14.000000000 +0200
175 +++ src/cybergarage/xml/libxml2/Libxml2Parser.cpp 2009-06-17 13:33:26.000000000 +0200
176 @@ -124,7 +124,7 @@
177 xmlNodePtr child = cur->xmlChildrenNode;
178 while ( child != NULL ) {
179
180 - Node *newChildNode = convertToCLinkFormat( doc, child, depth 1 );
181 + Node *newChildNode = convertToCLinkFormat( doc, child, depth + 1 );
182 if ( newChildNode ) {
183 newNode->addNode( newChildNode );
184 }
185 --- include/cybergarage/upnp/xml/ServiceData.h.old 2009-06-17 13:37:18.000000000 +0200
186 +++ include/cybergarage/upnp/xml/ServiceData.h 2009-06-17 13:37:24.000000000 +0200
187 @@ -58,7 +58,7 @@
188
189 public:
190
191 - void ServiceData::setService(Service *serv)
192 + void setService(Service *serv)
193 {
194 service = serv;
195 }
196 --- include/cybergarage/upnp/Argument.h.old 2009-06-17 13:40:06.000000000 +0200
197 +++ include/cybergarage/upnp/Argument.h 2009-06-17 13:40:23.000000000 +0200
198 @@ -20,6 +20,8 @@
199 #include <cybergarage/xml/Node.h>
200 #include <cybergarage/upnp/xml/ArgumentData.h>
201
202 +#include <stdlib.h>
203 +
204 namespace CyberLink{
205
206 class Service;
207 --- src/cybergarage/upnp/event/SubscriptionRequest.cpp.old 2009-06-17 13:50:07.000000000 +0200
208 +++ src/cybergarage/upnp/event/SubscriptionRequest.cpp 2009-06-17 13:50:43.000000000 +0200
209 @@ -28,6 +28,7 @@
210 #include <cybergarage/net/URL.h>
211
212 #include <string>
213 +#include <string.h>
214 #include <sstream>
215
216 using namespace std;
217 --- src/cybergarage/upnp/ssdp/SSDP.cpp.old 2009-06-17 14:13:19.000000000 +0200
218 +++ src/cybergarage/upnp/ssdp/SSDP.cpp 2009-06-17 14:13:31.000000000 +0200
219 @@ -14,6 +14,8 @@
220 ******************************************************************/
221
222 #include <string>
223 +#include <string.h>
224 +#include <stdlib.h>
225 #include <cybergarage/upnp/ssdp/SSDP.h>
226
227 using namespace std;
228 --- src/cybergarage/upnp/media/server/ContentDirectory.cpp.old 2009-06-17 14:16:37.000000000 +0200
229 +++ src/cybergarage/upnp/media/server/ContentDirectory.cpp 2009-06-17 14:17:11.000000000 +0200
230 @@ -43,6 +43,7 @@
231 #include <cybergarage/upnp/media/server/object/search/IdSearchCap.h>
232
233 #include <sstream>
234 +#include <string.h>
235
236 using namespace std;
237 using namespace CyberLink;
238 --- include/cybergarage/upnp/media/server/object/ContentProperty.h.old 2009-06-17 16:04:24.000000000 +0200
239 +++ include/cybergarage/upnp/media/server/object/ContentProperty.h 2009-06-17 16:04:48.000000000 +0200
240 @@ -18,6 +18,7 @@
241
242 #include <string>
243 #include <sstream>
244 +#include <stdlib.h>
245 #include <cybergarage/xml/AttributeList.h>
246
247 namespace CyberLink {
248 --- include/cybergarage/upnp/media/server/object/ContentNode.h.old 2009-06-17 16:05:31.000000000 +0200
249 +++ include/cybergarage/upnp/media/server/object/ContentNode.h 2009-06-17 16:05:41.000000000 +0200
250 @@ -19,6 +19,7 @@
251 #include <string>
252 #include <sstream>
253 #include <iostream>
254 +#include <stdlib.h>
255
256 #include <cybergarage/xml/Node.h>
257 #include <cybergarage/upnp/media/server/UPnP.h>
258 --- src/cybergarage/upnp/media/server/object/format/ID3Frame.cpp.old 2009-06-17 16:12:39.000000000 +0200
259 +++ src/cybergarage/upnp/media/server/object/format/ID3Frame.cpp 2009-06-17 16:12:54.000000000 +0200
260 @@ -14,6 +14,7 @@
261 ******************************************************************/
262
263 #include <cybergarage/upnp/media/server/object/format/ID3Frame.h>
264 +#include <string.h>
265
266 using namespace std;
267 using namespace CyberLink;
268 --- src/cybergarage/upnp/media/server/object/format/GIFFormat.cpp.old 2009-06-17 16:17:18.000000000 +0200
269 +++ src/cybergarage/upnp/media/server/object/format/GIFFormat.cpp 2009-06-17 16:17:29.000000000 +0200
270 @@ -14,6 +14,7 @@
271 ******************************************************************/
272
273 #include <stdio.h>
274 +#include <string.h>
275 #include <cybergarage/upnp/media/server/object/format/GIFFormat.h>
276
277 using namespace CyberLink;
278 --- src/cybergarage/upnp/media/server/object/format/PNGFormat.cpp.old 2009-06-17 16:25:40.000000000 +0200
279 +++ src/cybergarage/upnp/media/server/object/format/PNGFormat.cpp 2009-06-17 16:26:00.000000000 +0200
280 @@ -14,6 +14,7 @@
281 ******************************************************************/
282
283 #include <stdio.h>
284 +#include <string.h>
285 #include <cybergarage/upnp/media/server/object/format/PNGFormat.h>
286
287 using namespace CyberLink;
288 --- src/cybergarage/upnp/media/server/object/search/TitleSearchCap.cpp.old 2009-06-17 16:31:57.000000000 +0200
289 +++ src/cybergarage/upnp/media/server/object/search/TitleSearchCap.cpp 2009-06-17 16:32:06.000000000 +0200
290 @@ -14,6 +14,7 @@
291 ******************************************************************/
292
293 #include <string>
294 +#include <string.h>
295 #include <cybergarage/upnp/media/server/object/ContentNode.h>
296 #include <cybergarage/upnp/media/server/object/search/TitleSearchCap.h>
297
298 --- src/cybergarage/upnp/media/server/object/search/IdSearchCap.cpp.old 2009-06-17 16:34:46.000000000 +0200
299 +++ src/cybergarage/upnp/media/server/object/search/IdSearchCap.cpp 2009-06-17 16:34:54.000000000 +0200
300 @@ -14,6 +14,7 @@
301 ******************************************************************/
302
303 #include <string>
304 +#include <string.h>
305 #include <cybergarage/upnp/media/server/object/ContentNode.h>
306 #include <cybergarage/upnp/media/server/object/search/IdSearchCap.h>
307
308 --- sample/clock/ClockDevice.cpp.old 2009-06-17 16:38:22.000000000 +0200
309 +++ sample/clock/ClockDevice.cpp 2009-06-17 16:38:43.000000000 +0200
310 @@ -13,6 +13,7 @@
311
312 #include <iostream>
313 #include <sstream>
314 +#include <string.h>
315
316 using namespace std;
317 using namespace CyberLink;
318 --- sample/tv/TvDevice.cpp.old 2009-06-17 16:42:20.000000000 +0200
319 +++ sample/tv/TvDevice.cpp 2009-06-17 16:42:51.000000000 +0200
320 @@ -12,6 +12,7 @@
321
322 #include <iostream>
323 #include <sstream>
324 +#include <string.h>
325
326 using namespace std;
327 using namespace CyberLink;
328 --- sample/media/server/unix/MediaGateMain.cpp.old 2009-06-17 16:45:39.000000000 +0200
329 +++ sample/media/server/unix/MediaGateMain.cpp 2009-06-17 17:23:20.000000000 +0200
330 @@ -20,7 +20,7 @@
331 #include <iostream>
332
333 #include <stdio.h>
334 -#include <stdio.h>
335 +#include <string.h>
336 #if defined(WIN32) && !defined(__CYGWIN__)
337 #include <conio.h>
338 #else
339 @@ -67,9 +67,9 @@
340 for (n=1; n<argc; n++) {
341 #ifdef SUPPORT_MYTHTV
342 if (strcmp(MediaGate::MYTHTV_OPT_STRING, argv[n]) == 0)
343 - mode = MediaGate::MYTHTV_MODE;
344 + option = MediaGate::MYTHTV_MODE;
345 if (strcmp(MediaGate::MYTHTV_OPT_STRING_OLD, argv[n]) == 0)
346 - mode = MediaGate::MYTHTV_MODE;
347 + option = MediaGate::MYTHTV_MODE;
348 #endif
349 if (strcmp(VERBOSE_ARG, argv[n]) == 0)
350 Debug::on();