wok view stardict/stuff/sigc++.patch @ rev 13277
Add X keyboard name aliases in kbd-base (Bug 19)
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Thu Aug 23 10:14:12 2012 +0200 (2012-08-23) |
| parents | |
| children |
line source
1 diff -Naur stardict-3.0.1.orig/src/gconf_file.cpp stardict-3.0.1/src/gconf_file.cpp
2 --- stardict-3.0.1.orig/src/gconf_file.cpp 2007-07-10 08:16:04.000000000 +0100
3 +++ stardict-3.0.1/src/gconf_file.cpp 2008-04-11 18:18:43.000000000 +0100
4 @@ -22,6 +22,8 @@
5 # include "config.h"
6 #endif
8 +#include <memory>
9 +
10 #include <glib/gi18n.h>
12 #include "gconf_file.hpp"
13 diff -Naur stardict-3.0.1.orig/src/inifile.cpp stardict-3.0.1/src/inifile.cpp
14 --- stardict-3.0.1.orig/src/inifile.cpp 2007-08-01 10:43:00.000000000 +0100
15 +++ stardict-3.0.1/src/inifile.cpp 2008-04-11 18:18:43.000000000 +0100
16 @@ -25,6 +25,7 @@
17 #include <vector>
18 #include <cerrno>
19 #include <cstring>
20 +#include <cstdlib>
21 #include <cstdio>
22 #include <glib/gi18n.h>
23 #include <glib/gstdio.h>
24 diff -Naur stardict-3.0.1.orig/src/pangoview.cpp stardict-3.0.1/src/pangoview.cpp
25 --- stardict-3.0.1.orig/src/pangoview.cpp 2007-09-25 08:11:48.000000000 +0100
26 +++ stardict-3.0.1/src/pangoview.cpp 2008-04-11 18:18:43.000000000 +0100
27 @@ -22,6 +22,8 @@
28 # include "config.h"
29 #endif
31 +#include <cstring>
32 +
33 #include "gtktextviewpango.h"
34 #include "utils.h"
35 #include "skin.h"//for SkinCursor definition
36 diff -Naur stardict-3.0.1.orig/src/prefsdlg.cpp stardict-3.0.1/src/prefsdlg.cpp
37 --- stardict-3.0.1.orig/src/prefsdlg.cpp 2007-10-30 08:14:07.000000000 +0000
38 +++ stardict-3.0.1/src/prefsdlg.cpp 2008-04-11 18:18:43.000000000 +0100
39 @@ -21,6 +21,8 @@
40 # include "config.h"
41 #endif
43 +#include <cstdlib>
44 +
45 #include <glib/gi18n.h>
46 #include <glib/gstdio.h>
48 diff -Naur stardict-3.0.1.orig/src/readword.cpp stardict-3.0.1/src/readword.cpp
49 --- stardict-3.0.1.orig/src/readword.cpp 2007-07-10 08:16:04.000000000 +0100
50 +++ stardict-3.0.1/src/readword.cpp 2008-04-11 17:53:43.000000000 +0100
51 @@ -3,6 +3,7 @@
52 #endif
54 #include <cstring>
55 +#include <cstdlib>
56 #include <string>
58 #include <glib/gi18n.h>
59 diff -Naur stardict-3.0.1.orig/src/sigc++/signal.h stardict-3.0.1/src/sigc++/signal.h
60 --- stardict-3.0.1.orig/src/sigc++/signal.h 2007-07-10 08:16:01.000000000 +0100
61 +++ stardict-3.0.1/src/sigc++/signal.h 2008-04-11 17:50:11.000000000 +0100
62 @@ -18,7 +18,7 @@
63 //Compilers, such as older versions of SUN Forte C++, that do not allow this also often
64 //do not allow a typedef to have the same name as a class in the typedef's definition.
65 //For Sun Forte CC 5.7 (SUN Workshop 10), comment this out to fix the build.
66 - #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
67 +// #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
68 #endif
70 namespace sigc {
71 diff -Naur stardict-3.0.1.orig/src/utils.cpp stardict-3.0.1/src/utils.cpp
72 --- stardict-3.0.1.orig/src/utils.cpp 2007-10-22 03:25:02.000000000 +0100
73 +++ stardict-3.0.1/src/utils.cpp 2008-04-11 18:18:43.000000000 +0100
74 @@ -22,6 +22,8 @@
75 # include "config.h"
76 #endif
78 +#include <cstring>
79 +
80 #include <glib.h>
81 #include <glib/gi18n.h>
82 #include <cstdlib>
83 diff -Naur stardict-3.0.1.orig/src/x11_iskeyspressed.hpp stardict-3.0.1/src/x11_iskeyspressed.hpp
84 --- stardict-3.0.1.orig/src/x11_iskeyspressed.hpp 2007-07-10 08:16:04.000000000 +0100
85 +++ stardict-3.0.1/src/x11_iskeyspressed.hpp 2008-04-11 17:57:08.000000000 +0100
86 @@ -1,6 +1,8 @@
87 #ifndef _X11_ISKEYSPRESSED_HPP_
88 #define _X11_ISKEYSPRESSED_HPP_
90 +#include <memory>
91 +
92 #include <gdk/gdkx.h>
93 #include <X11/keysym.h>
94 #include <gtk/gtk.h>
96 #ifdef _WIN32
97 diff -Naur stardict-3.0.1.orig/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp stardict-3.0.1/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp
98 --- stardict-3.0.1.orig/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp 2007-09-19 09:27:18.000000000 +0100
99 +++ stardict-3.0.1/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp 2008-04-11 18:02:55.000000000 +0100
100 @@ -1,4 +1,5 @@
101 #include "stardict_espeak.h"
102 +#include <cstring>
103 #include <espeak/speak_lib.h>
104 #include <glib/gi18n.h>
106 diff -Naur stardict-3.0.1.orig/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp stardict-3.0.1/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp
107 --- stardict-3.0.1.orig/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp 2007-09-13 08:51:55.000000000 +0100
108 +++ stardict-3.0.1/stardict-plugins/stardict-html-parsedata-plugin/stardict_html_parsedata.cpp 2008-04-11 17:59:50.000000000 +0100
109 @@ -1,4 +1,6 @@
110 #include "stardict_html_parsedata.h"
111 +#include <cstring>
112 +#include <cstdlib>
113 #include <glib/gi18n.h>
115 #ifdef _WIN32
117 diff -Naur stardict-3.0.1.orig/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp stardict-3.0.1/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp
118 --- stardict-3.0.1.orig/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp 2007-09-19 09:29:21.000000000 +0100
119 +++ stardict-3.0.1/stardict-plugins/stardict-spell-plugin/stardict_spell.cpp 2008-04-11 18:02:38.000000000 +0100
120 @@ -1,4 +1,5 @@
121 #include "stardict_spell.h"
122 +#include <cstring>
123 #include <glib.h>
124 #include <glib/gi18n.h>
125 #include <enchant.h>
127 diff -Naur stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp
128 --- stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp 2007-10-18 02:36:22.000000000 +0100
129 +++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/court_widget.cpp 2008-04-11 18:01:10.000000000 +0100
130 @@ -1,4 +1,5 @@
131 #include "court_widget.h"
132 +#include <cstring>
133 #include <math.h>
134 #include <list>
136 diff -Naur stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp
137 --- stardict-3.0.1.orig/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp 2007-10-15 04:32:04.000000000 +0100
138 +++ stardict-3.0.1/stardict-plugins/stardict-wordnet-plugin/stardict_wordnet.cpp 2008-04-11 18:00:35.000000000 +0100
139 @@ -1,5 +1,6 @@
140 #include "stardict_wordnet.h"
141 #include "court_widget.h"
142 +#include <cstring>
143 #include <glib/gi18n.h>
145 #ifdef _WIN32
147 diff -Naur stardict-3.0.1.orig/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp stardict-3.0.1/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp
148 --- stardict-3.0.1.orig/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp 2007-08-31 07:41:54.000000000 +0100
149 +++ stardict-3.0.1/stardict-plugins/stardict-xdxf-parsedata-plugin/stardict_xdxf_parsedata.cpp 2008-04-11 18:00:12.000000000 +0100
150 @@ -1,4 +1,5 @@
151 #include "stardict_xdxf_parsedata.h"
152 +#include <cstring>
153 #include <glib/gi18n.h>
155 #ifdef _WIN32
156 diff -Naur stardict-3.0.1.orig/tests/t_config_file.cpp stardict-3.0.1/tests/t_config_file.cpp
157 --- stardict-3.0.1.orig/tests/t_config_file.cpp 2007-07-10 08:16:04.000000000 +0100
158 +++ stardict-3.0.1/tests/t_config_file.cpp 2008-04-11 18:04:13.000000000 +0100
159 @@ -8,6 +8,7 @@
160 #include <cstring>
161 #include <iterator>
162 #include <iostream>
163 +#include <memory>
164 #include <gtk/gtk.h>
166 #include "config_file.hpp"
167 diff -Naur stardict-3.0.1.orig/tests/t_xml.cpp stardict-3.0.1/tests/t_xml.cpp
168 --- stardict-3.0.1.orig/tests/t_xml.cpp 2007-07-10 08:16:04.000000000 +0100
169 +++ stardict-3.0.1/tests/t_xml.cpp 2008-04-11 18:04:58.000000000 +0100
170 @@ -5,6 +5,7 @@
171 #include <glib.h>
172 #include <cstdlib>
173 #include <string>
174 +#include <cstring>
177 static void xml_decode(const char *str, std::string& decoded)