1 Index: src/scim.h |
|
2 =================================================================== |
|
3 --- src/scim.h (revision 56) |
|
4 +++ src/scim.h (working copy) |
|
5 @@ -298,14 +298,14 @@ |
|
6 #include <scim_global_config.h> |
|
7 #endif |
|
8 |
|
9 +#ifdef Uses_SCIM_POINTER |
|
10 + #include <scim_pointer.h> |
|
11 +#endif |
|
12 + |
|
13 #ifdef Uses_SCIM_OBJECT |
|
14 #include <scim_object.h> |
|
15 #endif |
|
16 |
|
17 -#ifdef Uses_SCIM_POINTER |
|
18 - #include <scim_pointer.h> |
|
19 -#endif |
|
20 - |
|
21 #ifdef Uses_SCIM_SLOT |
|
22 #include <scim_slot.h> |
|
23 #endif |
|
24 Index: src/ltdl.cpp |
|
25 =================================================================== |
|
26 --- src/ltdl.cpp (revision 56) |
|
27 +++ src/ltdl.cpp (working copy) |
|
28 @@ -3372,7 +3372,7 @@ |
|
29 assert (filename); |
|
30 |
|
31 len = LT_STRLEN (filename); |
|
32 - ext = strrchr (filename, '.'); |
|
33 + ext = strrchr ((char*)filename, '.'); |
|
34 |
|
35 /* If FILENAME already bears a suitable extension, there is no need |
|
36 to try appending additional extensions. */ |
|
37 Index: src/scim_socket.cpp |
|
38 =================================================================== |
|
39 --- src/scim_socket.cpp (revision 56) |
|
40 +++ src/scim_socket.cpp (working copy) |
|
41 @@ -50,6 +50,10 @@ |
|
42 #include "scim_private.h" |
|
43 #include "scim.h" |
|
44 |
|
45 +#if defined(sun) && !defined(SUN_LEN) |
|
46 +#define SUN_LEN(su) (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path)) |
|
47 +#endif |
|
48 + |
|
49 #define SCIM_SOCKET_SERVER_MAX_CLIENTS 256 |
|
50 |
|
51 namespace scim { |
|
52 Index: src/scim_utility.cpp |
|
53 =================================================================== |
|
54 --- src/scim_utility.cpp (revision 56) |
|
55 +++ src/scim_utility.cpp (working copy) |
|
56 @@ -40,6 +40,7 @@ |
|
57 #include <stdio.h> |
|
58 #include <time.h> |
|
59 #include <errno.h> |
|
60 +#include <locale.h> |
|
61 |
|
62 #include "scim_private.h" |
|
63 #include "scim.h" |
|
64 Index: src/scim_transaction.cpp |
|
65 =================================================================== |
|
66 --- src/scim_transaction.cpp (revision 56) |
|
67 +++ src/scim_transaction.cpp (working copy) |
|
68 @@ -792,7 +792,8 @@ |
|
69 } |
|
70 |
|
71 if (len) |
|
72 - str = String (m_impl->m_holder->m_buffer + m_impl->m_read_pos, m_impl->m_holder->m_buffer + m_impl->m_read_pos + len); |
|
73 + str = String ((const char*)(m_impl->m_holder->m_buffer + m_impl->m_read_pos), |
|
74 + (const char*)m_impl->m_holder->m_buffer + m_impl->m_read_pos + len); |
|
75 else |
|
76 str = String (""); |
|
77 |
|
78 @@ -828,7 +829,8 @@ |
|
79 } |
|
80 |
|
81 if (len) |
|
82 - mbs = String (m_impl->m_holder->m_buffer + m_impl->m_read_pos, m_impl->m_holder->m_buffer + m_impl->m_read_pos + len); |
|
83 + mbs = String ((const char*)(m_impl->m_holder->m_buffer + m_impl->m_read_pos), |
|
84 + (const char*)m_impl->m_holder->m_buffer + m_impl->m_read_pos + len); |
|
85 else |
|
86 mbs = String (""); |
|
87 |
|
88 Index: src/scim_pointer.h |
|
89 =================================================================== |
|
90 --- src/scim_pointer.h (revision 56) |
|
91 +++ src/scim_pointer.h (working copy) |
|
92 @@ -84,7 +84,7 @@ |
|
93 //!< |
|
94 //!< <BR>Initialize a new Pointer with any dumb pointer. |
|
95 |
|
96 - Pointer(Pointer& src) : t(0) |
|
97 + Pointer(const Pointer& src) : t(0) |
|
98 { |
|
99 set(src.get()); |
|
100 } |
|
101 Index: src/scim_types.h.in |
|
102 =================================================================== |
|
103 --- src/scim_types.h.in (revision 56) |
|
104 +++ src/scim_types.h.in (working copy) |
|
105 @@ -32,6 +32,10 @@ |
|
106 |
|
107 @INCLUDE_STDINT@ |
|
108 |
|
109 +#if defined (sun) && defined (_WCHAR_T) |
|
110 +# define __STDC_ISO_10646__ |
|
111 +#endif |
|
112 + |
|
113 #ifdef __FreeBSD__ |
|
114 # include <osreldate.h> |
|
115 # if __FreeBSD_version > 500035 |
|
116 Index: src/Makefile.am |
|
117 =================================================================== |
|
118 --- src/Makefile.am (revision 56) |
|
119 +++ src/Makefile.am (working copy) |
|
120 @@ -134,8 +134,7 @@ |
|
121 $(LD_VERSION_SCRIPT_OPTION) \ |
|
122 @LIBTOOL_EXPORT_OPTIONS@ \ |
|
123 @LIBICONV@ \ |
|
124 - @LTLIBINTL@ \ |
|
125 - -lstdc++ |
|
126 + @LTLIBINTL@ |
|
127 |
|
128 libscim@SCIM_EPOCH@_la_LIBADD = libltdlc.la |
|
129 |
|
130 Index: tests/Makefile.am |
|
131 =================================================================== |
|
132 --- tests/Makefile.am (revision 56) |
|
133 +++ tests/Makefile.am (working copy) |
|
134 @@ -49,7 +49,6 @@ |
|
135 test_helper_la_LDFLAGS = -avoid-version \ |
|
136 -rpath $(helpermoduledir) \ |
|
137 -module \ |
|
138 - -lstdc++ \ |
|
139 @LIBTOOL_EXPORT_OPTIONS@ \ |
|
140 @GTK2_LIBS@ \ |
|
141 @LTLIBINTL@ |
|
142 Index: configure.ac |
|
143 =================================================================== |
|
144 --- configure.ac (revision 56) |
|
145 +++ configure.ac (working copy) |
|
146 @@ -66,7 +66,9 @@ |
|
147 |
|
148 # Init gettext |
|
149 ALL_LINGUAS="zh_CN zh_TW ja ko de fr it cs pa fi sv nl" |
|
150 -AM_GNU_GETTEXT |
|
151 +AM_GLIB_GNU_GETTEXT |
|
152 +LTLIBINTL= |
|
153 +AC_SUBST(LTLIBINTL) |
|
154 |
|
155 # Init libtool |
|
156 AC_LIBTOOL_DLOPEN |
|
157 Index: extras/setup/Makefile.am |
|
158 =================================================================== |
|
159 --- extras/setup/Makefile.am (revision 56) |
|
160 +++ extras/setup/Makefile.am (working copy) |
|
161 @@ -55,7 +55,6 @@ |
|
162 setup_la_LDFLAGS = -avoid-version \ |
|
163 -rpath $(moduledir) \ |
|
164 -module \ |
|
165 - -lstdc++ \ |
|
166 @LIBTOOL_EXPORT_OPTIONS@ \ |
|
167 @GTK2_LIBS@ \ |
|
168 @LTLIBINTL@ |
|
169 Index: extras/gtk2_immodule/Makefile.am |
|
170 =================================================================== |
|
171 --- extras/gtk2_immodule/Makefile.am (revision 56) |
|
172 +++ extras/gtk2_immodule/Makefile.am (working copy) |
|
173 @@ -38,13 +38,13 @@ |
|
174 |
|
175 im_scim_la_SOURCES = gtkimcontextscim.cpp imscim.cpp |
|
176 |
|
177 -im_scim_la_CXXFLAGS=@GTK2_CFLAGS@ |
|
178 +im_scim_la_CXXFLAGS=@GTK2_CFLAGS@ \ |
|
179 + -instlib=$(top_builddir)/src/.libs/libscim-1.0.so |
|
180 im_scim_la_CFLAGS =@GTK2_CFLAGS@ |
|
181 |
|
182 im_scim_la_LDFLAGS = -rpath $(moduledir) \ |
|
183 -avoid-version \ |
|
184 -module \ |
|
185 - -lstdc++ \ |
|
186 $(LD_VERSION_SCRIPT_OPTION) \ |
|
187 @GTK2_LIBS@ |
|
188 |
|
189 Index: modules/FrontEnd/scim_x11_frontend.cpp |
|
190 =================================================================== |
|
191 --- modules/FrontEnd/scim_x11_frontend.cpp (revision 56) |
|
192 +++ modules/FrontEnd/scim_x11_frontend.cpp (working copy) |
|
193 @@ -46,6 +46,7 @@ |
|
194 #include <X11/Xlib.h> |
|
195 #include <X11/keysym.h> |
|
196 #include <X11/Xutil.h> |
|
197 +#include <locale.h> |
|
198 #include "IMdkit/IMdkit.h" |
|
199 #include "IMdkit/Xi18n.h" |
|
200 |
|
201 Index: bootstrap |
|
202 =================================================================== |
|
203 --- bootstrap (revision 56) |
|
204 +++ bootstrap (working copy) |
|
205 @@ -20,7 +20,7 @@ |
|
206 #! /bin/sh |
|
207 |
|
208 set -x |
|
209 -aclocal -I m4 |
|
210 +aclocal |
|
211 autoheader |
|
212 libtoolize -c --automake |
|
213 automake --add-missing --copy --include-deps |
|
214 Index: Makefile.am |
|
215 =================================================================== |
|
216 --- Makefile.am (revision 56) |
|
217 +++ Makefile.am (working copy) |
|
218 @@ -33,7 +33,7 @@ |
|
219 intltool-update.in |
|
220 |
|
221 AUTOMAKE_OPTIONS = gnu |
|
222 -SUBDIRS = m4 intl src utils modules configs docs po extras data tests |
|
223 +SUBDIRS = src utils modules configs docs po extras data tests |
|
224 |
|
225 MAINTAINERCLEANFILES = Makefile.in \ |
|
226 aclocal.m4 \ |
|
227 @@ -61,7 +61,7 @@ |
|
228 $(GTK_UTILS_PKGCONFIG) \ |
|
229 $(X11_UTILS_PKGCONFIG) |
|
230 |
|
231 -ACLOCAL_AMFLAGS = -I m4 |
|
232 +ACLOCAL_AMFLAGS = |
|
233 |
|
234 .PHONY: update-ChangeLog |
|
235 |
|