wok view stardict/stuff/stardict_gcc43.patch @ rev 20251

mixxx: force 32 bits arch
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Mar 12 18:00:41 2018 +0100 (2018-03-12)
parents
children
line source
1 --- stardict-3.0.1/src/Makefile.am.gcc43 2007-07-10 16:16:04.000000000 +0900
2 +++ stardict-3.0.1/src/Makefile.am 2008-02-26 19:35:12.000000000 +0900
3 @@ -14,6 +14,8 @@
4
5 bin_PROGRAMS = stardict
6
7 +DEFAULT_INCLUDES = -I$(top_builddir)
8 +
9 INCLUDES = \
10 $(STARDICT_CFLAGS) \
11 $(LOCAL_SIGCPP_INCLUDE) \
12
13 --- stardict-3.0.1/src/config_file.hpp.gcc43 2007-07-10 16:16:04.000000000 +0900
14 +++ stardict-3.0.1/src/config_file.hpp 2008-02-26 19:35:00.000000000 +0900
15 @@ -5,7 +5,7 @@
16 #include <list>
17 #include <string>
18
19 -#include "sigc++/sigc++.h"
20 +#include <sigc++/sigc++.h>
21
22 class config_file;
23
24 --- stardict-3.0.1/src/gconf_file.cpp.gcc43 2007-07-10 16:16:04.000000000 +0900
25 +++ stardict-3.0.1/src/gconf_file.cpp 2008-02-26 19:37:18.000000000 +0900
26 @@ -22,6 +22,7 @@
27 # include "config.h"
28 #endif
29
30 +#include <memory>
31 #include <glib/gi18n.h>
32
33 #include "gconf_file.hpp"
34
35 --- stardict-3.0.1/src/gtk_iskeyspressed.cpp.gcc43 2007-07-10 16:16:04.000000000 +0900
36 +++ stardict-3.0.1/src/gtk_iskeyspressed.cpp 2008-02-26 19:37:35.000000000 +0900
37 @@ -97,7 +97,7 @@
38 GDK_BUTTON5_MASK = 1 << 12,
39 */
40
41 - mask = GdkModifierType(guint(mask) & (1<<13)-1);
42 + mask = GdkModifierType(guint(mask) & ((1<<13)-1));
43
44 mask =
45 GdkModifierType(guint(mask) & ~(GDK_LOCK_MASK | GDK_BUTTON1_MASK | GDK_BUTTON2_MASK |
46
47 --- stardict-3.0.1/src/inifile.cpp.gcc43 2007-08-01 18:43:00.000000000 +0900
48 +++ stardict-3.0.1/src/inifile.cpp 2008-02-26 19:37:51.000000000 +0900
49 @@ -28,6 +28,7 @@
50 #include <cstdio>
51 #include <glib/gi18n.h>
52 #include <glib/gstdio.h>
53 +#include <stdlib.h>
54
55 #include "utils.h"
56
57 --- stardict-3.0.1/src/lib/common.cpp.gcc43 2007-09-25 11:27:24.000000000 +0900
58 +++ stardict-3.0.1/src/lib/common.cpp 2008-02-26 19:34:01.000000000 +0900
59 @@ -24,6 +24,8 @@
60 # include "config.h"
61 #endif
62
63 +#include <cstring>
64 +#include <stdlib.h>
65 #include "common.hpp"
66
67 static void parse_description(const char *p, long len, std::string &description)
68
69 --- stardict-3.0.1/src/lib/data.cpp.gcc43 2007-09-21 10:09:52.000000000 +0900
70 +++ stardict-3.0.1/src/lib/data.cpp 2008-02-26 19:33:38.000000000 +0900
71 @@ -26,6 +26,8 @@
72
73 #include "data.hpp"
74 #include "getuint32.h"
75 +#include <cstring>
76 +#include <cstdio>
77
78
79 DictBase::DictBase()
80
81 --- stardict-3.0.1/src/lib/http_client.cpp.gcc43 2007-09-06 17:29:30.000000000 +0900
82 +++ stardict-3.0.1/src/lib/http_client.cpp 2008-02-26 19:34:27.000000000 +0900
83 @@ -4,6 +4,7 @@
84
85 #include "http_client.h"
86 #include "sockets.hpp"
87 +#include <cstring>
88
89 sigc::signal<void, HttpClient *, const char *> HttpClient::on_error_;
90 sigc::signal<void, HttpClient *> HttpClient::on_response_;
91
92 --- stardict-3.0.1/src/lib/pluginmanager.cpp.gcc43 2007-10-10 12:26:45.000000000 +0900
93 +++ stardict-3.0.1/src/lib/pluginmanager.cpp 2008-02-26 19:34:36.000000000 +0900
94 @@ -1,6 +1,7 @@
95 #include "pluginmanager.h"
96 #include "file.hpp"
97 #include <string>
98 +#include <cstring>
99
100 StarDictPluginBaseObject::StarDictPluginBaseObject(const char *filename, GModule *module_, plugin_configure_func_t configure_func_):
101 plugin_filename(filename), module(module_), configure_func(configure_func_)
102
103 --- stardict-3.0.1/src/lib/stardict_client.cpp.gcc43 2007-10-31 17:32:11.000000000 +0900
104 +++ stardict-3.0.1/src/lib/stardict_client.cpp 2008-02-26 19:34:16.000000000 +0900
105 @@ -25,6 +25,9 @@
106 #include <glib.h>
107 #include <glib/gi18n.h>
108
109 +#include <cstring>
110 +#include <stdlib.h>
111 +#include <cstdio>
112 #include "sockets.hpp"
113 #include "md5.h"
114 #include "getuint32.h"
115
116 --- stardict-3.0.1/src/lib/stddict.cpp.gcc43 2007-10-30 18:06:07.000000000 +0900
117 +++ stardict-3.0.1/src/lib/stddict.cpp 2008-02-26 19:33:46.000000000 +0900
118 @@ -28,6 +28,7 @@
119 # include "config.h"
120 #endif
121
122 +#include <cstring>
123 #include <glib/gi18n.h>
124 #include <glib/gstdio.h>
125
126 --- stardict-3.0.1/src/lib/treedict.cpp.gcc43 2007-09-21 10:09:52.000000000 +0900
127 +++ stardict-3.0.1/src/lib/treedict.cpp 2008-02-26 19:33:52.000000000 +0900
128 @@ -25,6 +25,7 @@
129 # include "config.h"
130 #endif
131
132 +#include <cstring>
133 #include "file.hpp"
134 #include "getuint32.h"
135
136 --- stardict-3.0.1/src/pangoview.cpp.gcc43 2007-09-25 16:11:48.000000000 +0900
137 +++ stardict-3.0.1/src/pangoview.cpp 2008-02-26 19:37:02.000000000 +0900
138 @@ -22,6 +22,7 @@
139 # include "config.h"
140 #endif
141
142 +#include <cstring>
143 #include "gtktextviewpango.h"
144 #include "utils.h"
145 #include "skin.h"//for SkinCursor definition
146
147 --- stardict-3.0.1/src/utils.cpp.gcc43 2007-10-22 11:25:02.000000000 +0900
148 +++ stardict-3.0.1/src/utils.cpp 2008-02-26 19:36:01.000000000 +0900
149 @@ -22,6 +22,7 @@
150 # include "config.h"
151 #endif
152
153 +#include <cstring>
154 #include <glib.h>
155 #include <glib/gi18n.h>
156 #include <cstdlib>
157
158 --- stardict-3.0.1/src/x11_iskeyspressed.hpp.gcc43 2007-07-10 16:16:04.000000000 +0900
159 +++ stardict-3.0.1/src/x11_iskeyspressed.hpp 2008-02-27 16:16:17.000000000 +0900
160 @@ -5,6 +5,8 @@
161 #include <X11/keysym.h>
162 #include <gtk/gtk.h>
163
164 +#include <memory>
165 +
166 #include "iskeyspressed.hpp"
167
168 typedef enum { SYM, CODE, BUTTON } KeyType_t;
169
170 --- stardict-3.0.1/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp.gcc43 2007-09-21 10:09:53.000000000 +0900
171 +++ stardict-3.0.1/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp 2008-02-26 19:39:34.000000000 +0900
172 @@ -2,6 +2,7 @@
173 #include <glib.h>
174 #include <glib/gi18n.h>
175 #include <glib/gstdio.h>
176 +#include <cstring>
177 #include <string>
178 #include <map>
179 #include <list>
180
181 --- stardict-3.0.1/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp.gcc43 2007-10-10 18:28:29.000000000 +0900
182 +++ stardict-3.0.1/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp 2008-02-26 19:38:56.000000000 +0900
183 @@ -1,5 +1,6 @@
184 #include "stardict_dictdotcn.h"
185 #include <glib/gi18n.h>
186 +#include <cstring>
187 #include <string>
188 #include <list>
189
190 --- stardict-3.0.1/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp.gcc43 2007-09-19 17:27:18.000000000 +0900
191 +++ stardict-3.0.1/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp 2008-02-26 19:45:43.000000000 +0900
192 @@ -1,6 +1,7 @@
193 #include "stardict_espeak.h"
194 #include <espeak/speak_lib.h>
195 #include <glib/gi18n.h>
196 +#include <cstring>
197
198 static const StarDictPluginSystemInfo *plugin_info = NULL;
199 static std::string voice_engine;
200
201 --- stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp.gcc43 2007-08-31 16:10:41.000000000 +0900
202 +++ stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp 2008-02-26 19:45:27.000000000 +0900
203 @@ -1,6 +1,8 @@
204 #include "stardict_gucharmap.h"
205 #include <glib/gi18n.h>
206 #include <gucharmap/gucharmap.h>
207 +#include <stdlib.h>
208 +#include <cstring>
209 #include <string>
210
211 static char *build_dictdata(char type, const char *definition)
212
213 --- stardict-3.0.1/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp.gcc43 2007-09-13 16:51:55.000000000 +0900
214 +++ stardict-3.0.1/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp 2008-02-26 19:41:11.000000000 +0900
215 @@ -1,5 +1,7 @@
216 #include "stardict_html_parsedata.h"
217 #include <glib/gi18n.h>
218 +#include <cstring>
219 +#include <stdlib.h>
220
221 #ifdef _WIN32
222 #include <windows.h>
223
224 --- stardict-3.0.1/stardict-plugins/stardict-man-plugin/stardict_man.cpp.gcc43 2007-09-19 17:30:54.000000000 +0900
225 +++ stardict-3.0.1/stardict-plugins/stardict-man-plugin/stardict_man.cpp 2008-02-26 19:40:22.000000000 +0900
226 @@ -1,5 +1,6 @@
227 #include "stardict_man.h"
228 #include <glib/gi18n.h>
229 +#include <cstring>
230 #include <string>
231
232 static const StarDictPluginSystemInfo *plugin_info = NULL;
233
234 --- stardict-3.0.1/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp.gcc43 2007-10-25 17:16:37.000000000 +0900
235 +++ stardict-3.0.1/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp 2008-02-26 19:44:06.000000000 +0900
236 @@ -1,4 +1,5 @@
237 #include "stardict_powerword_parsedata.h"
238 +#include <cstring>
239 #include <glib/gi18n.h>
240
241 #ifdef _WIN32
242
243 --- stardict-3.0.1/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp.gcc43 2007-11-02 17:41:26.000000000 +0900
244 +++ stardict-3.0.1/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp 2008-02-26 19:45:57.000000000 +0900
245 @@ -1,6 +1,8 @@
246 #include "stardict_qqwry.h"
247 #include <glib/gi18n.h>
248 #include <glib/gstdio.h>
249 +#include <cstring>
250 +#include <stdlib.h>
251 #include <string>
252
253 #ifdef _WIN32
254
255 --- stardict-3.0.1/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp.gcc43 2007-09-19 17:29:21.000000000 +0900
256 +++ stardict-3.0.1/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp 2008-02-26 19:45:13.000000000 +0900
257 @@ -3,6 +3,7 @@
258 #include <glib/gi18n.h>
259 #include <enchant.h>
260 #include <pango/pango.h>
261 +#include <cstring>
262 #include <string>
263 #include <vector>
264
265 --- stardict-3.0.1/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp.gcc43 2007-09-19 17:34:36.000000000 +0900
266 +++ stardict-3.0.1/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp 2008-02-26 19:40:46.000000000 +0900
267 @@ -1,5 +1,7 @@
268 #include "stardict_update_info.h"
269 #include <glib/gi18n.h>
270 +#include <cstring>
271 +#include <stdlib.h>
272
273 #ifdef _WIN32
274 #include <windows.h>
275
276 --- stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp.gcc43 2007-07-10 16:16:15.000000000 +0900
277 +++ stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp 2008-02-26 19:45:00.000000000 +0900
278 @@ -1,5 +1,6 @@
279 #include "stardict_wiki2xml.h"
280 #include "WIKI2XML.h"
281 +#include <cstring>
282 #include <glib.h>
283
284 std::string wiki2xml(std::string &str)
285
286 --- stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp.gcc43 2007-08-31 15:41:21.000000000 +0900
287 +++ stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp 2008-02-26 19:44:40.000000000 +0900
288 @@ -1,5 +1,6 @@
289 #include "stardict_wiki_parsedata.h"
290 #include "stardict_wiki2xml.h"
291 +#include <cstring>
292 #include <glib/gi18n.h>
293
294 #ifdef _WIN32
295
296 --- stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp.gcc43 2007-10-18 10:36:22.000000000 +0900
297 +++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp 2008-02-26 19:42:25.000000000 +0900
298 @@ -1,6 +1,7 @@
299 #include "court_widget.h"
300 #include <math.h>
301 #include <list>
302 +#include <cstring>
303
304
305 wnobj::wnobj(partic_t & p, unsigned int t) : _p(p), _t(t), highlight(false)
306
307 --- stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp.gcc43 2007-10-15 12:32:04.000000000 +0900
308 +++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp 2008-02-26 19:42:05.000000000 +0900
309 @@ -1,6 +1,7 @@
310 #include "stardict_wordnet.h"
311 #include "court_widget.h"
312 #include <glib/gi18n.h>
313 +#include <cstring>
314
315 #ifdef _WIN32
316 #include <windows.h>
317
318 --- stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp.gcc43 2007-10-10 18:39:10.000000000 +0900
319 +++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp 2008-02-26 19:43:21.000000000 +0900
320 @@ -1,4 +1,5 @@
321 #include "stardict_wordnet_parsedata.h"
322 +#include <cstring>
323 #include <glib/gi18n.h>
324
325 #ifdef _WIN32
326
327 --- stardict-3.0.1/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp.gcc43 2007-08-31 15:41:54.000000000 +0900
328 +++ stardict-3.0.1/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp 2008-02-26 19:41:36.000000000 +0900
329 @@ -1,5 +1,6 @@
330 #include "stardict_xdxf_parsedata.h"
331 #include <glib/gi18n.h>
332 +#include <cstring>
333
334 #ifdef _WIN32
335 #include <windows.h>
336
337 --- stardict-3.0.1/tests/t_config_file.cpp.gcc43 2007-07-10 16:16:04.000000000 +0900
338 +++ stardict-3.0.1/tests/t_config_file.cpp 2008-02-26 19:38:14.000000000 +0900
339 @@ -2,6 +2,7 @@
340 # include "config.h"
341 #endif
342
343 +#include <memory>
344 #include <cerrno>
345 #include <cstdio>
346 #include <cstdlib>
347
348 --- stardict-3.0.1/tests/t_xml.cpp.gcc43 2007-07-10 16:16:04.000000000 +0900
349 +++ stardict-3.0.1/tests/t_xml.cpp 2008-02-26 19:38:04.000000000 +0900
350 @@ -3,6 +3,7 @@
351 #endif
352
353 #include <glib.h>
354 +#include <cstring>
355 #include <cstdlib>
356 #include <string>
357