rpms/scim-skk/FC-4 scim-skk-broken-iter.diff, NONE, 1.1 scim-skk.spec, 1.11, 1.12

[Ryo Dairiki (ryo)]

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17776

Modified Files:
	scim-skk.spec 
Added Files:
	scim-skk-broken-iter.diff 
Log Message:
Add a patch file.


scim-skk-broken-iter.diff:

--- NEW FILE scim-skk-broken-iter.diff ---
--- src/scim_skk_dictionary.cpp.orig	2006-04-29 13:24:36.000000000 +0900
+++ src/scim_skk_dictionary.cpp	2006-04-29 13:25:16.000000000 +0900
@@ -544,9 +544,11 @@
 {
     list<CandPair> &cl = m_dictdata[key];
-    for (list<CandPair>::iterator it = cl.begin(); it != cl.end(); it++) {
-        if (it->first == data.first) {
-            cl.erase(it);
-        }
+    for (list<CandPair>::iterator it = cl.begin(); it != cl.end();) {
+        if (it->first == data.first) {
+            it = cl.erase(it);
+        } else {
+            ++it;
+        }
     }
     cl.push_front(data);
     m_writeflag = true;


Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-4/scim-skk.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scim-skk.spec	1 Mar 2006 05:30:42 -0000	1.11
+++ scim-skk.spec	23 Jul 2006 03:35:44 -0000	1.12
@@ -1,6 +1,6 @@
 Name:	    scim-skk
 Version:	0.5.2
-Release:	2%{?dist}
+Release:	4%{?dist}
 Summary:	SCIM IMEngine module for skk
 
 Group:		System Environment/Libraries
@@ -9,6 +9,8 @@
 Source0:	http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0: scim-skk-broken-iter.patch
+
 Requires:		scim skkdic
 BuildRequires:	scim-devel
 
@@ -18,6 +20,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -48,6 +51,9 @@
 
 
 %changelog
+* Sun Jul 23 2006 Ryo Diairki <ryo-dairiki at users.sourceforge.net> - 0.5.2-4
+- add a patch for the problem of broken iterators.
+
 * Wed Mar  1 2006 Ryo Diairki <ryo-dairiki at users.sourceforge.net> - 0.5.2-2
 - update filelist since moduledir is now api-versioned