wok-stable diff stardict/stuff/stardict_gcc43.patch @ rev 9576
Up: xorg-libXfixes to 5.0.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Tue Apr 12 11:17:31 2011 +0000 (2011-04-12) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/stardict/stuff/stardict_gcc43.patch Tue Apr 12 11:17:31 2011 +0000 1.3 @@ -0,0 +1,357 @@ 1.4 +--- stardict-3.0.1/src/Makefile.am.gcc43 2007-07-10 16:16:04.000000000 +0900 1.5 ++++ stardict-3.0.1/src/Makefile.am 2008-02-26 19:35:12.000000000 +0900 1.6 +@@ -14,6 +14,8 @@ 1.7 + 1.8 + bin_PROGRAMS = stardict 1.9 + 1.10 ++DEFAULT_INCLUDES = -I$(top_builddir) 1.11 ++ 1.12 + INCLUDES = \ 1.13 + $(STARDICT_CFLAGS) \ 1.14 + $(LOCAL_SIGCPP_INCLUDE) \ 1.15 + 1.16 +--- stardict-3.0.1/src/config_file.hpp.gcc43 2007-07-10 16:16:04.000000000 +0900 1.17 ++++ stardict-3.0.1/src/config_file.hpp 2008-02-26 19:35:00.000000000 +0900 1.18 +@@ -5,7 +5,7 @@ 1.19 + #include <list> 1.20 + #include <string> 1.21 + 1.22 +-#include "sigc++/sigc++.h" 1.23 ++#include <sigc++/sigc++.h> 1.24 + 1.25 + class config_file; 1.26 + 1.27 +--- stardict-3.0.1/src/gconf_file.cpp.gcc43 2007-07-10 16:16:04.000000000 +0900 1.28 ++++ stardict-3.0.1/src/gconf_file.cpp 2008-02-26 19:37:18.000000000 +0900 1.29 +@@ -22,6 +22,7 @@ 1.30 + # include "config.h" 1.31 + #endif 1.32 + 1.33 ++#include <memory> 1.34 + #include <glib/gi18n.h> 1.35 + 1.36 + #include "gconf_file.hpp" 1.37 + 1.38 +--- stardict-3.0.1/src/gtk_iskeyspressed.cpp.gcc43 2007-07-10 16:16:04.000000000 +0900 1.39 ++++ stardict-3.0.1/src/gtk_iskeyspressed.cpp 2008-02-26 19:37:35.000000000 +0900 1.40 +@@ -97,7 +97,7 @@ 1.41 + GDK_BUTTON5_MASK = 1 << 12, 1.42 + */ 1.43 + 1.44 +- mask = GdkModifierType(guint(mask) & (1<<13)-1); 1.45 ++ mask = GdkModifierType(guint(mask) & ((1<<13)-1)); 1.46 + 1.47 + mask = 1.48 + GdkModifierType(guint(mask) & ~(GDK_LOCK_MASK | GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | 1.49 + 1.50 +--- stardict-3.0.1/src/inifile.cpp.gcc43 2007-08-01 18:43:00.000000000 +0900 1.51 ++++ stardict-3.0.1/src/inifile.cpp 2008-02-26 19:37:51.000000000 +0900 1.52 +@@ -28,6 +28,7 @@ 1.53 + #include <cstdio> 1.54 + #include <glib/gi18n.h> 1.55 + #include <glib/gstdio.h> 1.56 ++#include <stdlib.h> 1.57 + 1.58 + #include "utils.h" 1.59 + 1.60 +--- stardict-3.0.1/src/lib/common.cpp.gcc43 2007-09-25 11:27:24.000000000 +0900 1.61 ++++ stardict-3.0.1/src/lib/common.cpp 2008-02-26 19:34:01.000000000 +0900 1.62 +@@ -24,6 +24,8 @@ 1.63 + # include "config.h" 1.64 + #endif 1.65 + 1.66 ++#include <cstring> 1.67 ++#include <stdlib.h> 1.68 + #include "common.hpp" 1.69 + 1.70 + static void parse_description(const char *p, long len, std::string &description) 1.71 + 1.72 +--- stardict-3.0.1/src/lib/data.cpp.gcc43 2007-09-21 10:09:52.000000000 +0900 1.73 ++++ stardict-3.0.1/src/lib/data.cpp 2008-02-26 19:33:38.000000000 +0900 1.74 +@@ -26,6 +26,8 @@ 1.75 + 1.76 + #include "data.hpp" 1.77 + #include "getuint32.h" 1.78 ++#include <cstring> 1.79 ++#include <cstdio> 1.80 + 1.81 + 1.82 + DictBase::DictBase() 1.83 + 1.84 +--- stardict-3.0.1/src/lib/http_client.cpp.gcc43 2007-09-06 17:29:30.000000000 +0900 1.85 ++++ stardict-3.0.1/src/lib/http_client.cpp 2008-02-26 19:34:27.000000000 +0900 1.86 +@@ -4,6 +4,7 @@ 1.87 + 1.88 + #include "http_client.h" 1.89 + #include "sockets.hpp" 1.90 ++#include <cstring> 1.91 + 1.92 + sigc::signal<void, HttpClient *, const char *> HttpClient::on_error_; 1.93 + sigc::signal<void, HttpClient *> HttpClient::on_response_; 1.94 + 1.95 +--- stardict-3.0.1/src/lib/pluginmanager.cpp.gcc43 2007-10-10 12:26:45.000000000 +0900 1.96 ++++ stardict-3.0.1/src/lib/pluginmanager.cpp 2008-02-26 19:34:36.000000000 +0900 1.97 +@@ -1,6 +1,7 @@ 1.98 + #include "pluginmanager.h" 1.99 + #include "file.hpp" 1.100 + #include <string> 1.101 ++#include <cstring> 1.102 + 1.103 + StarDictPluginBaseObject::StarDictPluginBaseObject(const char *filename, GModule *module_, plugin_configure_func_t configure_func_): 1.104 + plugin_filename(filename), module(module_), configure_func(configure_func_) 1.105 + 1.106 +--- stardict-3.0.1/src/lib/stardict_client.cpp.gcc43 2007-10-31 17:32:11.000000000 +0900 1.107 ++++ stardict-3.0.1/src/lib/stardict_client.cpp 2008-02-26 19:34:16.000000000 +0900 1.108 +@@ -25,6 +25,9 @@ 1.109 + #include <glib.h> 1.110 + #include <glib/gi18n.h> 1.111 + 1.112 ++#include <cstring> 1.113 ++#include <stdlib.h> 1.114 ++#include <cstdio> 1.115 + #include "sockets.hpp" 1.116 + #include "md5.h" 1.117 + #include "getuint32.h" 1.118 + 1.119 +--- stardict-3.0.1/src/lib/stddict.cpp.gcc43 2007-10-30 18:06:07.000000000 +0900 1.120 ++++ stardict-3.0.1/src/lib/stddict.cpp 2008-02-26 19:33:46.000000000 +0900 1.121 +@@ -28,6 +28,7 @@ 1.122 + # include "config.h" 1.123 + #endif 1.124 + 1.125 ++#include <cstring> 1.126 + #include <glib/gi18n.h> 1.127 + #include <glib/gstdio.h> 1.128 + 1.129 +--- stardict-3.0.1/src/lib/treedict.cpp.gcc43 2007-09-21 10:09:52.000000000 +0900 1.130 ++++ stardict-3.0.1/src/lib/treedict.cpp 2008-02-26 19:33:52.000000000 +0900 1.131 +@@ -25,6 +25,7 @@ 1.132 + # include "config.h" 1.133 + #endif 1.134 + 1.135 ++#include <cstring> 1.136 + #include "file.hpp" 1.137 + #include "getuint32.h" 1.138 + 1.139 +--- stardict-3.0.1/src/pangoview.cpp.gcc43 2007-09-25 16:11:48.000000000 +0900 1.140 ++++ stardict-3.0.1/src/pangoview.cpp 2008-02-26 19:37:02.000000000 +0900 1.141 +@@ -22,6 +22,7 @@ 1.142 + # include "config.h" 1.143 + #endif 1.144 + 1.145 ++#include <cstring> 1.146 + #include "gtktextviewpango.h" 1.147 + #include "utils.h" 1.148 + #include "skin.h"//for SkinCursor definition 1.149 + 1.150 +--- stardict-3.0.1/src/utils.cpp.gcc43 2007-10-22 11:25:02.000000000 +0900 1.151 ++++ stardict-3.0.1/src/utils.cpp 2008-02-26 19:36:01.000000000 +0900 1.152 +@@ -22,6 +22,7 @@ 1.153 + # include "config.h" 1.154 + #endif 1.155 + 1.156 ++#include <cstring> 1.157 + #include <glib.h> 1.158 + #include <glib/gi18n.h> 1.159 + #include <cstdlib> 1.160 + 1.161 +--- stardict-3.0.1/src/x11_iskeyspressed.hpp.gcc43 2007-07-10 16:16:04.000000000 +0900 1.162 ++++ stardict-3.0.1/src/x11_iskeyspressed.hpp 2008-02-27 16:16:17.000000000 +0900 1.163 +@@ -5,6 +5,8 @@ 1.164 + #include <X11/keysym.h> 1.165 + #include <gtk/gtk.h> 1.166 + 1.167 ++#include <memory> 1.168 ++ 1.169 + #include "iskeyspressed.hpp" 1.170 + 1.171 + typedef enum { SYM, CODE, BUTTON } KeyType_t; 1.172 + 1.173 +--- stardict-3.0.1/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp.gcc43 2007-09-21 10:09:53.000000000 +0900 1.174 ++++ stardict-3.0.1/stardict-plugins/stardict-advertisement-plugin/advertisement.cpp 2008-02-26 19:39:34.000000000 +0900 1.175 +@@ -2,6 +2,7 @@ 1.176 + #include <glib.h> 1.177 + #include <glib/gi18n.h> 1.178 + #include <glib/gstdio.h> 1.179 ++#include <cstring> 1.180 + #include <string> 1.181 + #include <map> 1.182 + #include <list> 1.183 + 1.184 +--- stardict-3.0.1/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp.gcc43 2007-10-10 18:28:29.000000000 +0900 1.185 ++++ stardict-3.0.1/stardict-plugins/stardict-dictdotcn-plugin/stardict_dictdotcn.cpp 2008-02-26 19:38:56.000000000 +0900 1.186 +@@ -1,5 +1,6 @@ 1.187 + #include "stardict_dictdotcn.h" 1.188 + #include <glib/gi18n.h> 1.189 ++#include <cstring> 1.190 + #include <string> 1.191 + #include <list> 1.192 + 1.193 +--- stardict-3.0.1/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp.gcc43 2007-09-19 17:27:18.000000000 +0900 1.194 ++++ stardict-3.0.1/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp 2008-02-26 19:45:43.000000000 +0900 1.195 +@@ -1,6 +1,7 @@ 1.196 + #include "stardict_espeak.h" 1.197 + #include <espeak/speak_lib.h> 1.198 + #include <glib/gi18n.h> 1.199 ++#include <cstring> 1.200 + 1.201 + static const StarDictPluginSystemInfo *plugin_info = NULL; 1.202 + static std::string voice_engine; 1.203 + 1.204 +--- stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp.gcc43 2007-08-31 16:10:41.000000000 +0900 1.205 ++++ stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp 2008-02-26 19:45:27.000000000 +0900 1.206 +@@ -1,6 +1,8 @@ 1.207 + #include "stardict_gucharmap.h" 1.208 + #include <glib/gi18n.h> 1.209 + #include <gucharmap/gucharmap.h> 1.210 ++#include <stdlib.h> 1.211 ++#include <cstring> 1.212 + #include <string> 1.213 + 1.214 + static char *build_dictdata(char type, const char *definition) 1.215 + 1.216 +--- stardict-3.0.1/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp.gcc43 2007-09-13 16:51:55.000000000 +0900 1.217 ++++ stardict-3.0.1/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp 2008-02-26 19:41:11.000000000 +0900 1.218 +@@ -1,5 +1,7 @@ 1.219 + #include "stardict_html_parsedata.h" 1.220 + #include <glib/gi18n.h> 1.221 ++#include <cstring> 1.222 ++#include <stdlib.h> 1.223 + 1.224 + #ifdef _WIN32 1.225 + #include <windows.h> 1.226 + 1.227 +--- stardict-3.0.1/stardict-plugins/stardict-man-plugin/stardict_man.cpp.gcc43 2007-09-19 17:30:54.000000000 +0900 1.228 ++++ stardict-3.0.1/stardict-plugins/stardict-man-plugin/stardict_man.cpp 2008-02-26 19:40:22.000000000 +0900 1.229 +@@ -1,5 +1,6 @@ 1.230 + #include "stardict_man.h" 1.231 + #include <glib/gi18n.h> 1.232 ++#include <cstring> 1.233 + #include <string> 1.234 + 1.235 + static const StarDictPluginSystemInfo *plugin_info = NULL; 1.236 + 1.237 +--- stardict-3.0.1/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp.gcc43 2007-10-25 17:16:37.000000000 +0900 1.238 ++++ stardict-3.0.1/stardict-plugins/stardict-powerword-parsedata-plugin/stardict_powerword_parsedata.cpp 2008-02-26 19:44:06.000000000 +0900 1.239 +@@ -1,4 +1,5 @@ 1.240 + #include "stardict_powerword_parsedata.h" 1.241 ++#include <cstring> 1.242 + #include <glib/gi18n.h> 1.243 + 1.244 + #ifdef _WIN32 1.245 + 1.246 +--- stardict-3.0.1/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp.gcc43 2007-11-02 17:41:26.000000000 +0900 1.247 ++++ stardict-3.0.1/stardict-plugins/stardict-qqwry-plugin/stardict_qqwry.cpp 2008-02-26 19:45:57.000000000 +0900 1.248 +@@ -1,6 +1,8 @@ 1.249 + #include "stardict_qqwry.h" 1.250 + #include <glib/gi18n.h> 1.251 + #include <glib/gstdio.h> 1.252 ++#include <cstring> 1.253 ++#include <stdlib.h> 1.254 + #include <string> 1.255 + 1.256 + #ifdef _WIN32 1.257 + 1.258 +--- stardict-3.0.1/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp.gcc43 2007-09-19 17:29:21.000000000 +0900 1.259 ++++ stardict-3.0.1/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp 2008-02-26 19:45:13.000000000 +0900 1.260 +@@ -3,6 +3,7 @@ 1.261 + #include <glib/gi18n.h> 1.262 + #include <enchant.h> 1.263 + #include <pango/pango.h> 1.264 ++#include <cstring> 1.265 + #include <string> 1.266 + #include <vector> 1.267 + 1.268 +--- stardict-3.0.1/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp.gcc43 2007-09-19 17:34:36.000000000 +0900 1.269 ++++ stardict-3.0.1/stardict-plugins/stardict-update-info-plugin/stardict_update_info.cpp 2008-02-26 19:40:46.000000000 +0900 1.270 +@@ -1,5 +1,7 @@ 1.271 + #include "stardict_update_info.h" 1.272 + #include <glib/gi18n.h> 1.273 ++#include <cstring> 1.274 ++#include <stdlib.h> 1.275 + 1.276 + #ifdef _WIN32 1.277 + #include <windows.h> 1.278 + 1.279 +--- stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp.gcc43 2007-07-10 16:16:15.000000000 +0900 1.280 ++++ stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki2xml.cpp 2008-02-26 19:45:00.000000000 +0900 1.281 +@@ -1,5 +1,6 @@ 1.282 + #include "stardict_wiki2xml.h" 1.283 + #include "WIKI2XML.h" 1.284 ++#include <cstring> 1.285 + #include <glib.h> 1.286 + 1.287 + std::string wiki2xml(std::string &str) 1.288 + 1.289 +--- stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp.gcc43 2007-08-31 15:41:21.000000000 +0900 1.290 ++++ stardict-3.0.1/stardict-plugins/stardict-wiki-parsedata-plugin/stardict_wiki_parsedata.cpp 2008-02-26 19:44:40.000000000 +0900 1.291 +@@ -1,5 +1,6 @@ 1.292 + #include "stardict_wiki_parsedata.h" 1.293 + #include "stardict_wiki2xml.h" 1.294 ++#include <cstring> 1.295 + #include <glib/gi18n.h> 1.296 + 1.297 + #ifdef _WIN32 1.298 + 1.299 +--- stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp.gcc43 2007-10-18 10:36:22.000000000 +0900 1.300 ++++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp 2008-02-26 19:42:25.000000000 +0900 1.301 +@@ -1,6 +1,7 @@ 1.302 + #include "court_widget.h" 1.303 + #include <math.h> 1.304 + #include <list> 1.305 ++#include <cstring> 1.306 + 1.307 + 1.308 + wnobj::wnobj(partic_t & p, unsigned int t) : _p(p), _t(t), highlight(false) 1.309 + 1.310 +--- stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp.gcc43 2007-10-15 12:32:04.000000000 +0900 1.311 ++++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp 2008-02-26 19:42:05.000000000 +0900 1.312 +@@ -1,6 +1,7 @@ 1.313 + #include "stardict_wordnet.h" 1.314 + #include "court_widget.h" 1.315 + #include <glib/gi18n.h> 1.316 ++#include <cstring> 1.317 + 1.318 + #ifdef _WIN32 1.319 + #include <windows.h> 1.320 + 1.321 +--- stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp.gcc43 2007-10-10 18:39:10.000000000 +0900 1.322 ++++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet_parsedata.cpp 2008-02-26 19:43:21.000000000 +0900 1.323 +@@ -1,4 +1,5 @@ 1.324 + #include "stardict_wordnet_parsedata.h" 1.325 ++#include <cstring> 1.326 + #include <glib/gi18n.h> 1.327 + 1.328 + #ifdef _WIN32 1.329 + 1.330 +--- stardict-3.0.1/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp.gcc43 2007-08-31 15:41:54.000000000 +0900 1.331 ++++ stardict-3.0.1/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp 2008-02-26 19:41:36.000000000 +0900 1.332 +@@ -1,5 +1,6 @@ 1.333 + #include "stardict_xdxf_parsedata.h" 1.334 + #include <glib/gi18n.h> 1.335 ++#include <cstring> 1.336 + 1.337 + #ifdef _WIN32 1.338 + #include <windows.h> 1.339 + 1.340 +--- stardict-3.0.1/tests/t_config_file.cpp.gcc43 2007-07-10 16:16:04.000000000 +0900 1.341 ++++ stardict-3.0.1/tests/t_config_file.cpp 2008-02-26 19:38:14.000000000 +0900 1.342 +@@ -2,6 +2,7 @@ 1.343 + # include "config.h" 1.344 + #endif 1.345 + 1.346 ++#include <memory> 1.347 + #include <cerrno> 1.348 + #include <cstdio> 1.349 + #include <cstdlib> 1.350 + 1.351 +--- stardict-3.0.1/tests/t_xml.cpp.gcc43 2007-07-10 16:16:04.000000000 +0900 1.352 ++++ stardict-3.0.1/tests/t_xml.cpp 2008-02-26 19:38:04.000000000 +0900 1.353 +@@ -3,6 +3,7 @@ 1.354 + #endif 1.355 + 1.356 + #include <glib.h> 1.357 ++#include <cstring> 1.358 + #include <cstdlib> 1.359 + #include <string> 1.360 +