rpms/scim-anthy/devel scim-anthy-dict-encoding.patch, NONE, 1.1 scim-anthy-fix-pending-state.patch, NONE, 1.1 scim-anthy-libtool-export.patch, NONE, 1.1 scim-anthy.spec, 1.34, 1.35
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Sep 26 12:02:07 UTC 2006
Author: tagoh
Update of /cvs/dist/rpms/scim-anthy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7987
Modified Files:
scim-anthy.spec
Added Files:
scim-anthy-dict-encoding.patch
scim-anthy-fix-pending-state.patch
scim-anthy-libtool-export.patch
Log Message:
* Tue Sep 26 2006 Akira TAGOH <tagoh at redhat.com> - 1.2.0-2
- scim-anthy-libtool-export.patch: fix a typo.
- scim-anthy-fix-pending-state.patch: fix not composing roman character
properly when any characters are still in pending queue after deleting.
(#208074)
- scim-anthy-dict-encoding.patch: revert the default dictionary encoding to
EUC-JP.
scim-anthy-dict-encoding.patch:
scim_anthy_prefs.h | 2 +-
scim_anthy_setup.cpp | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
--- NEW FILE scim-anthy-dict-encoding.patch ---
2006-09-25 Takuro Ashie <ashie at homa.ne.jp>
* src/scim_anthy_setup.cpp: Enable dictionary encoding prefs.
* src/scim_anthy_prefs.h: Revert default dictionary encoding to EUC-JP.
Index: src/scim_anthy_prefs.h
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_prefs.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- src/scim_anthy_prefs.h 25 Jul 2006 08:12:00 -0000 1.76
+++ src/scim_anthy_prefs.h 25 Sep 2006 09:04:54 -0000 1.77
@@ -186,7 +186,7 @@
#define SCIM_ANTHY_CONFIG_LEARN_ON_MANUAL_COMMIT_DEFAULT true
#define SCIM_ANTHY_CONFIG_LEARN_ON_AUTO_COMMIT_DEFAULT true
-#define SCIM_ANTHY_CONFIG_DICT_ENCODING_DEFAULT "EUC-JP-MS"
+#define SCIM_ANTHY_CONFIG_DICT_ENCODING_DEFAULT "EUC-JP"
#define SCIM_ANTHY_CONFIG_DICT_ADMIN_COMMAND_DEFAULT "kasumi"
#define SCIM_ANTHY_CONFIG_ADD_WORD_COMMAND_DEFAULT "kasumi --add"
Index: src/scim_anthy_setup.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_setup.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- src/scim_anthy_setup.cpp 24 Jul 2006 02:33:36 -0000 1.71
+++ src/scim_anthy_setup.cpp 25 Sep 2006 09:04:54 -0000 1.72
@@ -273,14 +273,12 @@
{NULL, NULL},
};
-#if 0
static ComboConfigCandidate dict_encoding[] =
{
{N_("EUC-JP"), "EUC-JP"},
{N_("EUC-JP-MS"), "EUC-JP-MS"},
{NULL, NULL},
};
-#endif
static ComboConfigCandidate preedit_style[] =
{
@@ -1043,12 +1041,10 @@
table = gtk_table_new (3, 3, FALSE);
gtk_widget_show (table);
-#if 0
// encoding of dictionary
create_combo (SCIM_ANTHY_CONFIG_DICT_ENCODING,
(gpointer) &dict_encoding,
GTK_TABLE (table), 0);
-#endif
// dict admin command
create_entry (SCIM_ANTHY_CONFIG_DICT_ADMIN_COMMAND,
scim-anthy-fix-pending-state.patch:
scim_anthy_key2kana.cpp | 6 ++++--
scim_anthy_reading.cpp | 5 ++++-
2 files changed, 8 insertions(+), 3 deletions(-)
--- NEW FILE scim-anthy-fix-pending-state.patch ---
2006-09-25 Takuro Ashie <ashie at homa.ne.jp>
* src/scim_anthy_reading.cpp, src/scim_anthy_key2kana.cpp:
Apply TAGOH-san's solution for the previous problem. Thanks.
2006-09-25 Takuro Ashie <ashie at homa.ne.jp>
* src/scim_anthy_reading.cpp: Give a first aid to the problem that
codes of pseudo ASCII mode breaks pending state of normal kana input
mode. Fix indent.
* src/scim_anthy_key2kana.cpp: Fix indent.
Index: src/scim_anthy_key2kana.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_key2kana.cpp,v
retrieving revision 1.14
retrieving revision 1.16
diff -u -r1.14 -r1.16
--- src/scim_anthy_key2kana.cpp 13 Jul 2006 07:41:51 -0000 1.14
+++ src/scim_anthy_key2kana.cpp 25 Sep 2006 07:41:26 -0000 1.16
@@ -273,7 +273,8 @@
{
for (unsigned int i = 0; i < wstr.length (); i++) {
if ((wstr[i] >= 'A' && wstr[i] <= 'Z') ||
- iswspace(wstr[i])) {
+ iswspace(wstr[i]))
+ {
m_is_in_pseudo_ascii_mode = true;
} else if (wstr[i] >= 0x80) {
m_is_in_pseudo_ascii_mode = false;
@@ -286,8 +287,9 @@
void
Key2KanaConvertor::reset_pseudo_ascii_mode (void)
{
+ if (m_is_in_pseudo_ascii_mode)
+ m_pending.clear();
m_is_in_pseudo_ascii_mode = false;
- m_pending.clear();
}
/*
Index: src/scim_anthy_reading.cpp
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_reading.cpp,v
retrieving revision 1.39
retrieving revision 1.41
diff -u -r1.39 -r1.41
--- src/scim_anthy_reading.cpp 24 Jul 2006 01:56:00 -0000 1.39
+++ src/scim_anthy_reading.cpp 25 Sep 2006 07:41:26 -0000 1.41
@@ -496,6 +496,8 @@
m_segments[m_segment_pos - 1].raw);
m_kana.reset_pending (m_segments[m_segment_pos - 1].kana,
m_segments[m_segment_pos - 1].raw);
+
+ // FIXME! this code breaks pending state on normal input mode.
m_key2kana->reset_pseudo_ascii_mode();
for (unsigned int i = 0; i < m_segment_pos; i++)
m_key2kana->process_pseudo_ascii_mode(m_segments[i].kana);
@@ -735,7 +737,8 @@
Reading::reset_pseudo_ascii_mode (void)
{
if (m_key2kana_normal.is_pseudo_ascii_mode () &&
- m_key2kana_normal.is_pending ()) {
+ m_key2kana_normal.is_pending ())
+ {
ReadingSegment c;
ReadingSegments::iterator it = m_segments.begin ();
scim-anthy-libtool-export.patch:
configure.ac | 1 +
1 files changed, 1 insertion(+)
--- NEW FILE scim-anthy-libtool-export.patch ---
2006-08-06 Takuro Ashie <ashie at homa.ne.jp>
* configure.ac: Add AC_SUBST(LIBTOOL_EXPORT_OPTIONS).
Thanks Kouhei Sutou.
Index: configure.ac
===================================================================
RCS file: /cvsroot/scim-imengine/scim-anthy/configure.ac,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- configure.ac 4 Jul 2006 06:44:03 -0000 1.25
+++ configure.ac 6 Aug 2006 10:20:33 -0000 1.26
@@ -102,6 +102,7 @@
# libtool option to control which symbols are exported
# right now, symbols starting with _ are not exported
LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
+AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
# Extra args.
AC_ARG_ENABLE(debug,
Index: scim-anthy.spec
===================================================================
RCS file: /cvs/dist/rpms/scim-anthy/devel/scim-anthy.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- scim-anthy.spec 31 Jul 2006 05:28:32 -0000 1.34
+++ scim-anthy.spec 26 Sep 2006 12:02:04 -0000 1.35
@@ -2,18 +2,21 @@
Name: scim-anthy
Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
URL: http://scim-imengine.sourceforge.jp/
Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: scim-devel
-BuildRequires: anthy-devel >= 6700b-1 gettext-devel automake libtool
+BuildRequires: anthy-devel >= 6700b-1 gettext-devel automake libtool autoconf
%if %{with_libstdc_preview}
Buildrequires: libstdc++so7-devel
%endif
Patch1: scim-anthy-helper-moduledir.patch
+Patch2: scim-anthy-libtool-export.patch
+Patch3: scim-anthy-fix-pending-state.patch
+Patch4: scim-anthy-dict-encoding.patch
Summary: SCIM IMEngine for anthy for Japanese input
Group: System Environment/Libraries
@@ -27,6 +30,10 @@
%setup -q
%patch1 -p1 -b .1-moduledir
# patch1 touches src/Makefile.am
+%patch2 -p0 -b .2-libtool
+# patch2 touches configure.ac
+%patch3 -p0 -b .3-pending-state
+%patch4 -p0 -b .4-dict-enc
aclocal
automake
autoconf
@@ -70,6 +77,14 @@
%changelog
+* Tue Sep 26 2006 Akira TAGOH <tagoh at redhat.com> - 1.2.0-2
+- scim-anthy-libtool-export.patch: fix a typo.
+- scim-anthy-fix-pending-state.patch: fix not composing roman character
+ properly when any characters are still in pending queue after deleting.
+ (#208074)
+- scim-anthy-dict-encoding.patch: revert the default dictionary encoding to
+ EUC-JP.
+
* Mon Jul 31 2006 Akira TAGOH <tagoh at redhat.com> - 1.2.0-1
- New upstream release.
- scim-anthy-1.0.0-pseudo-ascii*.patch: merged into upstream.
More information about the fedora-cvs-commits
mailing list