Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/m17n-lib/files: m17n-lib-1.6.2-parallel-make.patch m17n-lib-1.6.2-gui.patch m17n-lib-1.6.2-candidates-list.patch
Date: Mon, 04 Apr 2011 01:05:05
Message-Id: 20110404010440.E2F302004F@flycatcher.gentoo.org
1 flameeyes 11/04/04 01:04:40
2
3 Added: m17n-lib-1.6.2-parallel-make.patch
4 m17n-lib-1.6.2-gui.patch
5 m17n-lib-1.6.2-candidates-list.patch
6 Log:
7 Version bump; fix up --disable-gui and add USE=X to disable the GUI functionalities; fix parallel-make failures; apply a patch from ChromiumOS by Peng Huang to fix issues with traditional Chinese input.
8
9 (Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.1 dev-libs/m17n-lib/files/m17n-lib-1.6.2-parallel-make.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/m17n-lib/files/m17n-lib-1.6.2-parallel-make.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/m17n-lib/files/m17n-lib-1.6.2-parallel-make.patch?rev=1.1&content-type=text/plain
16
17 Index: m17n-lib-1.6.2-parallel-make.patch
18 ===================================================================
19 Index: m17n-lib-1.6.2/src/Makefile.am
20 ===================================================================
21 --- m17n-lib-1.6.2.orig/src/Makefile.am
22 +++ m17n-lib-1.6.2/src/Makefile.am
23 @@ -53,7 +53,7 @@ libm17n_la_SOURCES = \
24 language.h language.c \
25 mlocale.h locale.c \
26 m17n.h m17n.c
27 -libm17n_la_LIBADD = ${top_builddir}/src/libm17n-core.la -ldl
28 +libm17n_la_LIBADD = libm17n-core.la -ldl
29 libm17n_la_LDFLAGS = -export-dynamic ${VINFO}
30
31 FLT_SOURCES = \
32 @@ -61,7 +61,7 @@ FLT_SOURCES = \
33 m17n-flt.h m17n-flt.c
34
35 libm17n_flt_la_SOURCES = ${FLT_SOURCES}
36 -libm17n_flt_la_LIBADD = ${top_builddir}/src/libm17n-core.la
37 +libm17n_flt_la_LIBADD = libm17n-core.la
38 libm17n_flt_la_LDFLAGS = -export-dynamic ${VINFO}
39
40 GUI_SOURCES = \
41 @@ -80,7 +80,7 @@ OPTIONAL_LD_FLAGS = \
42 @FONTCONFIG_LD_FLAGS@
43
44 libm17n_gui_la_SOURCES = ${GUI_SOURCES}
45 -libm17n_gui_la_LIBADD = ${OPTIONAL_LD_FLAGS} ${top_builddir}/src/libm17n-core.la ${top_builddir}/src/libm17n.la ${top_builddir}/src/libm17n-flt.la
46 +libm17n_gui_la_LIBADD = ${OPTIONAL_LD_FLAGS} libm17n-core.la libm17n.la libm17n-flt.la
47 libm17n_gui_la_LDFLAGS = -export-dynamic ${VINFO}
48
49 if WITH_GUI
50 @@ -90,11 +90,11 @@ module_LTLIBRARIES = libm17n-X.la libm17
51 X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} @X11_LD_FLAGS@ ${X_EXTRA_LIBS}
52
53 libm17n_X_la_SOURCES = m17n-X.h m17n-X.c
54 -libm17n_X_la_LIBADD = ${X_LD_FLAGS} @XFT2_LD_FLAGS@ ${top_builddir}/src/libm17n-core.la ${top_builddir}/src/libm17n.la ${top_builddir}/src/libm17n-flt.la ${top_builddir}/src/libm17n-gui.la
55 +libm17n_X_la_LIBADD = ${X_LD_FLAGS} @XFT2_LD_FLAGS@ libm17n-core.la libm17n.la libm17n-flt.la libm17n-gui.la
56 libm17n_X_la_LDFLAGS = -avoid-version -module
57
58 libm17n_gd_la_SOURCES = m17n-gd.c
59 -libm17n_gd_la_LIBADD = @GD_LD_FLAGS@ @FREETYPE_LD_FLAGS@ ${top_builddir}/src/libm17n-core.la ${top_builddir}/src/libm17n.la ${top_builddir}/src/libm17n-flt.la ${top_builddir}/src/libm17n-gui.la
60 +libm17n_gd_la_LIBADD = @GD_LD_FLAGS@ @FREETYPE_LD_FLAGS@ libm17n-core.la libm17n.la libm17n-flt.la libm17n-gui.la
61 libm17n_gd_la_LDFLAGS = -avoid-version -module
62
63 endif
64 @@ -121,14 +121,14 @@ if MAINTAINER_MODE
65 noinst_PROGRAMS = linkcore linkshell linkgui
66
67 linkcore_SOURCES = linkcore.c
68 -linkcore_LDADD = ${top_builddir}/src/libm17n-core.la
69 +linkcore_LDADD = libm17n-core.la
70 linkcore_LDFLAGS = -static
71
72 linkshell_SOURCES = linkshell.c
73 -linkshell_LDADD = ${top_builddir}/src/libm17n.la
74 +linkshell_LDADD = libm17n.la
75 linkshell_LDFLAGS = -static
76
77 linkgui_SOURCES = linkgui.c
78 -linkgui_LDADD = ${top_builddir}/src/libm17n-gui.la
79 +linkgui_LDADD = libm17n-gui.la
80 linkgui_LDFLAGS = -static
81 endif
82
83
84
85 1.1 dev-libs/m17n-lib/files/m17n-lib-1.6.2-gui.patch
86
87 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/m17n-lib/files/m17n-lib-1.6.2-gui.patch?rev=1.1&view=markup
88 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/m17n-lib/files/m17n-lib-1.6.2-gui.patch?rev=1.1&content-type=text/plain
89
90 Index: m17n-lib-1.6.2-gui.patch
91 ===================================================================
92 Index: m17n-lib-1.6.2/configure.ac
93 ===================================================================
94 --- m17n-lib-1.6.2.orig/configure.ac
95 +++ m17n-lib-1.6.2/configure.ac
96 @@ -100,9 +100,9 @@ dnl Checks which levels of APIs should b
97 AC_ARG_ENABLE(gui,
98 AS_HELP_STRING([--enable-gui],[enable GUI level APIs (default is YES)]))
99
100 -AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno)
101 +AM_CONDITIONAL(WITH_GUI, test x$enable_gui != xno)
102
103 -if test x$with_gui != xno; then
104 +if test x$enable_gui != xno; then
105
106 dnl Checks if dlopen exists, and if it's in libc or libdl.
107
108
109
110
111 1.1 dev-libs/m17n-lib/files/m17n-lib-1.6.2-candidates-list.patch
112
113 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/m17n-lib/files/m17n-lib-1.6.2-candidates-list.patch?rev=1.1&view=markup
114 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/m17n-lib/files/m17n-lib-1.6.2-candidates-list.patch?rev=1.1&content-type=text/plain
115
116 Index: m17n-lib-1.6.2-candidates-list.patch
117 ===================================================================
118 --- src/input.c 2011/02/14 04:59:22 1.154
119 +++ src/input.c 2011/03/09 05:45:49 1.155
120 @@ -3004,9 +3004,6 @@
121 take_action_list (MInputContext *ic, MPlist *action_list)
122 {
123 MInputContextInfo *ic_info = (MInputContextInfo *) ic->info;
124 - MPlist *candidate_list = ic->candidate_list;
125 - int candidate_index = ic->candidate_index;
126 - int candidate_show = ic->candidate_show;
127 MTextProperty *prop;
128
129 MPLIST_DO (action_list, action_list)
130 @@ -3480,31 +3477,6 @@
131 };
132 }
133 }
134 -
135 - if (ic->candidate_list)
136 - {
137 - M17N_OBJECT_UNREF (ic->candidate_list);
138 - ic->candidate_list = NULL;
139 - }
140 - if (ic->cursor_pos > 0
141 - && (prop = mtext_get_property (ic->preedit, ic->cursor_pos - 1,
142 - Mcandidate_list)))
143 - {
144 - ic->candidate_list = mtext_property_value (prop);
145 - M17N_OBJECT_REF (ic->candidate_list);
146 - ic->candidate_index
147 - = (int) mtext_get_prop (ic->preedit, ic->cursor_pos - 1,
148 - Mcandidate_index);
149 - ic->candidate_from = mtext_property_start (prop);
150 - ic->candidate_to = mtext_property_end (prop);
151 - }
152 -
153 - if (candidate_list != ic->candidate_list)
154 - ic->candidates_changed |= MINPUT_CANDIDATES_LIST_CHANGED;
155 - if (candidate_index != ic->candidate_index)
156 - ic->candidates_changed |= MINPUT_CANDIDATES_INDEX_CHANGED;
157 - if (candidate_show != ic->candidate_show)
158 - ic->candidates_changed |= MINPUT_CANDIDATES_SHOW_CHANGED;
159 return 0;
160 }
161
162 @@ -3914,7 +3886,37 @@
163 ic_info->key_unhandled = 0;
164
165 do {
166 - if (handle_key (ic) < 0)
167 + MPlist *candidate_list = ic->candidate_list;
168 + int candidate_index = ic->candidate_index;
169 + int candidate_show = ic->candidate_show;
170 + MTextProperty *prop;
171 + int result = handle_key (ic);
172 +
173 + if (ic->candidate_list)
174 + {
175 + M17N_OBJECT_UNREF (ic->candidate_list);
176 + ic->candidate_list = NULL;
177 + }
178 + if (ic->cursor_pos > 0
179 + && (prop = mtext_get_property (ic->preedit, ic->cursor_pos - 1,
180 + Mcandidate_list)))
181 + {
182 + ic->candidate_list = mtext_property_value (prop);
183 + M17N_OBJECT_REF (ic->candidate_list);
184 + ic->candidate_index
185 + = (int) mtext_get_prop (ic->preedit, ic->cursor_pos - 1,
186 + Mcandidate_index);
187 + ic->candidate_from = mtext_property_start (prop);
188 + ic->candidate_to = mtext_property_end (prop);
189 + }
190 + if (candidate_list != ic->candidate_list)
191 + ic->candidates_changed |= MINPUT_CANDIDATES_LIST_CHANGED;
192 + if (candidate_index != ic->candidate_index)
193 + ic->candidates_changed |= MINPUT_CANDIDATES_INDEX_CHANGED;
194 + if (candidate_show != ic->candidate_show)
195 + ic->candidates_changed |= MINPUT_CANDIDATES_SHOW_CHANGED;
196 +
197 + if (result < 0)
198 {
199 /* KEY was not handled. Delete it from the current key sequence. */
200 if (ic_info->used > 0)
Report Message
Find on MARC Find on Google Groups