1 Index: Makefile.am |
|
2 =================================================================== |
|
3 RCS file: /cvsroot/scim/scim-pinyin/Makefile.am,v |
|
4 retrieving revision 1.6 |
|
5 diff -u -p -r1.6 Makefile.am |
|
6 --- Makefile.am 6 Aug 2005 17:03:54 -0000 1.6 |
|
7 +++ Makefile.am 8 May 2007 18:04:23 -0000 |
|
8 @@ -33,11 +33,11 @@ SKIM_SUBDIR=skim |
|
9 endif |
|
10 |
|
11 AUTOMAKE_OPTIONS = gnu |
|
12 -SUBDIRS = m4 src data intl po $(SKIM_SUBDIR) |
|
13 +SUBDIRS = src data po $(SKIM_SUBDIR) |
|
14 |
|
15 ## @start 1 |
|
16 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in $(AUX_DIST) |
|
17 |
|
18 CLEANFILES = *.bak src/*.bak |
|
19 |
|
20 -ACLOCAL_AMFLAGS = -I m4 |
|
21 +ACLOCAL_AMFLAGS = |
|
22 Index: bootstrap |
|
23 =================================================================== |
|
24 RCS file: /cvsroot/scim/scim-pinyin/bootstrap,v |
|
25 retrieving revision 1.2 |
|
26 diff -u -p -r1.2 bootstrap |
|
27 --- bootstrap 5 Mar 2005 21:23:44 -0000 1.2 |
|
28 +++ bootstrap 18 May 2007 09:20:59 -0000 |
|
29 @@ -20,12 +20,13 @@ |
|
30 #! /bin/sh |
|
31 |
|
32 set -x |
|
33 -aclocal -I m4 |
|
34 +intltoolize --force |
|
35 +aclocal |
|
36 autoheader |
|
37 libtoolize -c --automake --force |
|
38 automake --add-missing --copy --include-deps |
|
39 autoconf |
|
40 -cd skim |
|
41 -./bootstrap |
|
42 -cd .. |
|
43 +#cd skim |
|
44 +#./bootstrap |
|
45 +#cd .. |
|
46 ## @end 1 |
|
47 Index: configure.ac |
|
48 =================================================================== |
|
49 RCS file: /cvsroot/scim/scim-pinyin/configure.ac,v |
|
50 retrieving revision 1.10 |
|
51 diff -u -p -r1.10 configure.ac |
|
52 --- configure.ac 12 Aug 2005 01:09:34 -0000 1.10 |
|
53 +++ configure.ac 8 May 2007 18:04:23 -0000 |
|
54 @@ -15,7 +15,12 @@ AM_CONFIG_HEADER([config.h]) |
|
55 |
|
56 # Init gettext |
|
57 ALL_LINGUAS="zh_CN zh_TW ko ja de fr it" |
|
58 -AM_GNU_GETTEXT |
|
59 +AM_GLIB_GNU_GETTEXT |
|
60 +LTLIBINTL= |
|
61 +AC_SUBST(LTLIBINTL) |
|
62 + |
|
63 +# Check intltool |
|
64 +IT_PROG_INTLTOOL([0.33], [no-xml]) |
|
65 |
|
66 # Init libtool |
|
67 AC_LIBTOOL_WIN32_DLL |
|
68 Index: src/scim_pinyin.cpp |
|
69 =================================================================== |
|
70 RCS file: /cvsroot/scim/scim-pinyin/src/scim_pinyin.cpp,v |
|
71 retrieving revision 1.3 |
|
72 diff -u -p -r1.3 scim_pinyin.cpp |
|
73 --- src/scim_pinyin.cpp 8 Aug 2005 06:11:16 -0000 1.3 |
|
74 +++ src/scim_pinyin.cpp 8 May 2007 18:04:26 -0000 |
|
75 @@ -1867,7 +1867,7 @@ PinyinTable::find_keys (PinyinKeyVector |
|
76 |
|
77 vec.clear (); |
|
78 |
|
79 - std::pair<ReversePinyinMap::const_iterator, ReversePinyinMap::const_iterator> result = |
|
80 + std::pair<ReversePinyinMap::iterator, ReversePinyinMap::iterator> result = |
|
81 m_revmap.equal_range (code); |
|
82 |
|
83 for (ReversePinyinMap::const_iterator i = result.first; i != result.second; i++) |
|
84 Index: src/scim_pinyin.h |
|
85 =================================================================== |
|
86 RCS file: /cvsroot/scim/scim-pinyin/src/scim_pinyin.h,v |
|
87 retrieving revision 1.3 |
|
88 diff -u -p -r1.3 scim_pinyin.h |
|
89 --- src/scim_pinyin.h 6 Aug 2005 15:19:01 -0000 1.3 |
|
90 +++ src/scim_pinyin.h 8 May 2007 18:04:27 -0000 |
|
91 @@ -975,7 +975,7 @@ class PinyinTable |
|
92 typedef std::multimap<ucs4_t, PinyinKey> ReversePinyinMap; |
|
93 #endif |
|
94 |
|
95 - typedef std::pair<ucs4_t,PinyinKey> ReversePinyinPair; |
|
96 + typedef std::pair<const ucs4_t,PinyinKey> ReversePinyinPair; |
|
97 typedef std::vector<PinyinEntry> PinyinEntryVector; |
|
98 |
|
99 /** |
|