|
353
|
1 |
diff -urp uim-1.4.1.orig/configure.ac uim-1.4.1/configure.ac
|
|
|
2 |
--- uim-1.4.1.orig/configure.ac 2007-03-15 01:26:47.000000000 +0800
|
|
|
3 |
+++ uim-1.4.1/configure.ac 2007-05-23 18:03:09.974699000 +0800
|
|
|
4 |
@@ -280,18 +280,18 @@ AX_CFLAGS_GCC_OPTION([-no-cpp-precomp])
|
|
|
5 |
# Deprecated autoconf macro used in AX_CXXFLAGS_GCC_OPTION.
|
|
|
6 |
AC_DEFUN([AC_LANG_CXX], [AC_LANG([C++])])
|
|
|
7 |
|
|
|
8 |
-AX_CXXFLAGS_GCC_OPTION([-pipe])
|
|
|
9 |
-AX_CXXFLAGS_GCC_OPTION([-W])
|
|
|
10 |
-AX_CXXFLAGS_GCC_OPTION([-Wall])
|
|
|
11 |
-AX_CXXFLAGS_GCC_OPTION([-Wchar-subscripts])
|
|
|
12 |
-AX_CXXFLAGS_GCC_OPTION([-Wnon-virtual-dtor])
|
|
|
13 |
-AX_CXXFLAGS_GCC_OPTION([-Wno-long-long])
|
|
|
14 |
-AX_CXXFLAGS_GCC_OPTION([-Wcast-align])
|
|
|
15 |
-AX_CXXFLAGS_GCC_OPTION([-Wconversion])
|
|
|
16 |
-AX_CXXFLAGS_GCC_OPTION([-Wchar-subscripts])
|
|
|
17 |
-AX_CXXFLAGS_GCC_OPTION([-Wpointer-arith])
|
|
|
18 |
-AX_CXXFLAGS_GCC_OPTION([-Wwrite-strings])
|
|
|
19 |
-AX_CXXFLAGS_GCC_OPTION([-Wformat-security])
|
|
|
20 |
+#AX_CXXFLAGS_GCC_OPTION([-pipe])
|
|
|
21 |
+#AX_CXXFLAGS_GCC_OPTION([-W])
|
|
|
22 |
+#AX_CXXFLAGS_GCC_OPTION([-Wall])
|
|
|
23 |
+#AX_CXXFLAGS_GCC_OPTION([-Wchar-subscripts])
|
|
|
24 |
+#AX_CXXFLAGS_GCC_OPTION([-Wnon-virtual-dtor])
|
|
|
25 |
+#AX_CXXFLAGS_GCC_OPTION([-Wno-long-long])
|
|
|
26 |
+#AX_CXXFLAGS_GCC_OPTION([-Wcast-align])
|
|
|
27 |
+#AX_CXXFLAGS_GCC_OPTION([-Wconversion])
|
|
|
28 |
+#AX_CXXFLAGS_GCC_OPTION([-Wchar-subscripts])
|
|
|
29 |
+#AX_CXXFLAGS_GCC_OPTION([-Wpointer-arith])
|
|
|
30 |
+#AX_CXXFLAGS_GCC_OPTION([-Wwrite-strings])
|
|
|
31 |
+#AX_CXXFLAGS_GCC_OPTION([-Wformat-security])
|
|
|
32 |
|
|
|
33 |
AX_LANG_WNOERROR # end AC_LANG_WERROR
|
|
|
34 |
|
|
|
35 |
diff -urp uim-1.4.1.orig/fep/uim-fep.c uim-1.4.1/fep/uim-fep.c
|
|
|
36 |
--- uim-1.4.1.orig/fep/uim-fep.c 2007-01-07 01:43:43.000000000 +0800
|
|
|
37 |
+++ uim-1.4.1/fep/uim-fep.c 2007-05-23 18:03:11.613850000 +0800
|
|
|
38 |
@@ -668,7 +668,7 @@ static pid_t my_forkpty(int *amaster, st
|
|
|
39 |
return pid;
|
|
|
40 |
}
|
|
|
41 |
}
|
|
|
42 |
-#elif defined(__svr4__) || defined(__sgi__)
|
|
|
43 |
+#elif defined(__svr4__) || defined(__sgi__) || defined(sun)
|
|
|
44 |
static pid_t my_forkpty(int *amaster, struct termios *termp, struct winsize *winp)
|
|
|
45 |
{
|
|
|
46 |
pid_t pid;
|
|
|
47 |
diff -urp uim-1.4.1.orig/gtk/Makefile.am uim-1.4.1/gtk/Makefile.am
|
|
|
48 |
--- uim-1.4.1.orig/gtk/Makefile.am 2006-11-11 00:13:27.000000000 +0800
|
|
|
49 |
+++ uim-1.4.1/gtk/Makefile.am 2007-05-23 18:03:11.069078000 +0800
|
|
|
50 |
@@ -6,7 +6,7 @@ GTK_IMMODULES= $(DESTDIR)$(sysconfdir)/g
|
|
|
51 |
if GTK2
|
|
|
52 |
im_uim_la = im-uim.la
|
|
|
53 |
im_uim_la_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
|
|
|
54 |
-im_uim_la_CFLAGS = @GTK2_CFLAGS@ -Wall
|
|
|
55 |
+im_uim_la_CFLAGS = @GTK2_CFLAGS@
|
|
|
56 |
module_LTLIBRARIES = $(im_uim_la)
|
|
|
57 |
|
|
|
58 |
|
|
|
59 |
diff -urp uim-1.4.1.orig/helper/Makefile.am uim-1.4.1/helper/Makefile.am
|
|
|
60 |
--- uim-1.4.1.orig/helper/Makefile.am 2006-12-02 19:45:13.000000000 +0800
|
|
|
61 |
+++ uim-1.4.1/helper/Makefile.am 2007-05-23 18:03:11.197206000 +0800
|
|
|
62 |
@@ -59,28 +59,28 @@ uim_candwin_gtk_SOURCES = candwin-gtk.c
|
|
|
63 |
../gtk/caret-state-indicator.h
|
|
|
64 |
uim_candwin_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
|
|
|
65 |
uim_candwin_gtk_CPPFLAGS = -I$(top_srcdir)
|
|
|
66 |
-uim_candwin_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall
|
|
|
67 |
+uim_candwin_gtk_CFLAGS = @GTK2_CFLAGS@
|
|
|
68 |
|
|
|
69 |
uim_toolbar_gtk_SOURCES = toolbar-standalone-gtk.c toolbar-common-gtk.c
|
|
|
70 |
uim_toolbar_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
|
|
|
71 |
uim_toolbar_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
|
|
|
72 |
-uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall
|
|
|
73 |
+uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@
|
|
|
74 |
|
|
|
75 |
uim_toolbar_gtk_systray_SOURCES = toolbar-systray-gtk.c toolbar-common-gtk.c \
|
|
|
76 |
eggtrayicon.c eggtrayicon.h
|
|
|
77 |
uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
|
|
|
78 |
uim_toolbar_gtk_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
|
|
|
79 |
-uim_toolbar_gtk_systray_CFLAGS = @GTK2_CFLAGS@ -Wall
|
|
|
80 |
+uim_toolbar_gtk_systray_CFLAGS = @GTK2_CFLAGS@
|
|
|
81 |
|
|
|
82 |
uim_im_switcher_gtk_SOURCES = im-switcher-gtk.c
|
|
|
83 |
uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
|
|
|
84 |
uim_im_switcher_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
|
|
|
85 |
-uim_im_switcher_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall
|
|
|
86 |
+uim_im_switcher_gtk_CFLAGS = @GTK2_CFLAGS@
|
|
|
87 |
|
|
|
88 |
uim_input_pad_ja_SOURCES = input-pad-ja.c
|
|
|
89 |
uim_input_pad_ja_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la
|
|
|
90 |
uim_input_pad_ja_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
|
|
|
91 |
-uim_input_pad_ja_CFLAGS = @GTK2_CFLAGS@ -Wall
|
|
|
92 |
+uim_input_pad_ja_CFLAGS = @GTK2_CFLAGS@
|
|
|
93 |
|
|
|
94 |
if PREF
|
|
|
95 |
if GTK2_4
|
|
|
96 |
@@ -91,7 +91,7 @@ uim_pref_gtk_SOURCES = pref-gtk.c \
|
|
|
97 |
uim_pref_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-custom.la \
|
|
|
98 |
$(top_builddir)/uim/libuim.la
|
|
|
99 |
uim_pref_gtk_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
|
|
|
100 |
-uim_pref_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall
|
|
|
101 |
+uim_pref_gtk_CFLAGS = @GTK2_CFLAGS@
|
|
|
102 |
endif
|
|
|
103 |
endif
|
|
|
104 |
|
|
|
105 |
diff -urp uim-1.4.1.orig/uim.desktop uim-1.4.1/uim.desktop
|
|
|
106 |
--- uim-1.4.1.orig/uim.desktop 2007-03-15 04:40:50.000000000 +0800
|
|
|
107 |
+++ uim-1.4.1/uim.desktop 2007-05-23 18:03:10.050953000 +0800
|
|
|
108 |
@@ -8,6 +8,6 @@ Comment=Customize uim input method envir
|
|
|
109 |
Comment[ja]=入力メソッド環境 (uim) を設定します
|
|
|
110 |
Comment[ko]=uim 환경설정
|
|
|
111 |
Exec=uim-pref-gtk
|
|
|
112 |
-Icon=/usr/local/share/uim/pixmaps/uim-icon.png
|
|
|
113 |
+Icon=/usr/share/uim/pixmaps/uim-icon.png
|
|
|
114 |
Terminal=false
|
|
|
115 |
Categories=Settings;
|
|
|
116 |
diff -urp uim-1.4.1.orig/xim/Makefile.am uim-1.4.1/xim/Makefile.am
|
|
|
117 |
--- uim-1.4.1.orig/xim/Makefile.am 2006-05-16 20:43:27.000000000 +0800
|
|
|
118 |
+++ uim-1.4.1/xim/Makefile.am 2007-05-23 18:03:11.342001000 +0800
|
|
|
119 |
@@ -6,8 +6,8 @@ bin_PROGRAMS = uim-xim
|
|
|
120 |
uim_xim_LDFLAGS = @X_LIBS@
|
|
|
121 |
uim_xim_LDADD = -lXext -lX11 $(top_builddir)/uim/libuim.la
|
|
|
122 |
uim_xim_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
|
|
|
123 |
-uim_xim_CFLAGS = @X_CFLAGS@ -Wall
|
|
|
124 |
-uim_xim_CXXFLAGS = @X_CFLAGS@ -Wall
|
|
|
125 |
+uim_xim_CFLAGS = @X_CFLAGS@
|
|
|
126 |
+uim_xim_CXXFLAGS = @X_CFLAGS@
|
|
|
127 |
man1_MANS = uim-xim.1
|
|
|
128 |
|
|
|
129 |
if DEFAULT_TOOLKIT_GTK
|
|
|
130 |
diff -urp uim-1.4.1.orig/xim/ximserver.cpp uim-1.4.1/xim/ximserver.cpp
|
|
|
131 |
--- uim-1.4.1.orig/xim/ximserver.cpp 2007-01-07 01:43:43.000000000 +0800
|
|
|
132 |
+++ uim-1.4.1/xim/ximserver.cpp 2007-05-23 18:03:11.345301000 +0800
|
|
|
133 |
@@ -795,7 +795,7 @@ void InputContext::candidate_activate(in
|
|
|
134 |
int i;
|
|
|
135 |
const char *cand_str;
|
|
|
136 |
const char *heading_label;
|
|
|
137 |
- uim_candidate cand[nr];
|
|
|
138 |
+ uim_candidate *cand = new uim_candidate[nr];
|
|
|
139 |
std::vector<const char *> candidates;
|
|
|
140 |
char *str;
|
|
|
141 |
|
|
|
142 |
@@ -830,6 +830,8 @@ void InputContext::candidate_activate(in
|
|
|
143 |
current_cand_selection = 0;
|
|
|
144 |
current_page = 0;
|
|
|
145 |
need_hilite_selected_cand = false;
|
|
|
146 |
+
|
|
|
147 |
+ delete[] cand;
|
|
|
148 |
}
|
|
|
149 |
|
|
|
150 |
void InputContext::candidate_update()
|