rpms/kasumi/devel kasumi-2.2-fix-dict-breakage.patch, NONE, 1.1 kasumi.spec, 1.21, 1.22 kasumi-1.0-gcc41.patch, 1.1, NONE

[Akira Tagoh (tagoh)]

Author: tagoh

Update of /cvs/pkgs/rpms/kasumi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13586

Modified Files:
	kasumi.spec 
Added Files:
	kasumi-2.2-fix-dict-breakage.patch 
Removed Files:
	kasumi-1.0-gcc41.patch 
Log Message:
* Thu Jun 14 2007 Akira TAGOH <tagoh at redhat.com> - 2.2-3
- kasumi-2.2-fix-dict-breakage.patch: patch from Debian to fix the dictionary
  breakage when adding words to the personal dictionary against the bugfix
  version of anthy that the version contains non-numeric characters.

kasumi-2.2-fix-dict-breakage.patch:

--- NEW FILE kasumi-2.2-fix-dict-breakage.patch ---
diff -urNad kasumi-2.2~/KasumiDic.cxx kasumi-2.2/KasumiDic.cxx
--- kasumi-2.2~/KasumiDic.cxx	2006-06-20 23:41:47.000000000 +0900
+++ kasumi-2.2/KasumiDic.cxx	2007-06-02 23:54:15.000000000 +0900
@@ -38,6 +38,7 @@
 #include <sstream>
 #include <string>
 #include <vector>
+#include <cassert>
 
 using namespace std;
 
@@ -72,6 +73,9 @@
   const int FREQ_LBOUND = conf->getPropertyValueByInt("MinFrequency");  
   const int FREQ_UBOUND = conf->getPropertyValueByInt("MaxFrequency");
 
+  int anthy_version = atoi(anthy_get_version_string());
+  assert(anthy_version != 0);
+
   try{
       if(anthy_priv_dic_select_first_entry() == -1){
 	  // no word
@@ -79,7 +83,6 @@
       }
       else if(anthy_priv_dic_select_first_entry() == -3)
       {
-	  int anthy_version = str2int(string(anthy_get_version_string()));
 	  if(anthy_version >= 7716)
 	  {
 	      // do not throw exception in the case that this doesn't fail to
@@ -109,16 +112,14 @@
 	      KasumiWord *newWord = KasumiWord::createNewWord(conf);
 
 	      newWord->setSound(string(sound));
-	      int anthy_version = str2int(string(anthy_get_version_string()));
-	      if(anthy_version >= 7710)
+	      if (anthy_version < 7710 && spelling[0] == ' ') {
+		      // Measures against a defect of anthy.
+		      // "anthy_priv_dic_get_word()" function returns
+		      // a string whose first character is an unwated
+		      // white space.
+		      newWord->setSpelling(string(spelling+1));
+	      } else
 		  newWord->setSpelling(string(spelling));
-	      else
-	      {
-		  // Measures against a defect of anthy.
-		  // "anthy_priv_dic_get_word()" function returns a string
-		  // whose first character is an unwated white space.
-		  newWord->setSpelling(string(spelling+1));
-	      }
 	      newWord->setFrequency(freq);
 	      newWord->setWordType(KasumiWordType::getWordTypeFromCannaTab(string(wt)));
 	      appendWord(newWord);


Index: kasumi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kasumi/devel/kasumi.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kasumi.spec	28 Mar 2007 05:01:45 -0000	1.21
+++ kasumi.spec	14 Jun 2007 03:10:51 -0000	1.22
@@ -1,13 +1,13 @@
 Name:    kasumi
 Version: 2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 URL:     http://kasumi.sourceforge.jp/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils, gtk2-devel gettext-devel anthy-devel automake autoconf
 Source0: %{name}-%{version}.tar.gz
-Patch0:	kasumi-1.0-gcc41.patch
+Patch0:	kasumi-2.2-fix-dict-breakage.patch
 
 
 Summary: An anthy dictionary management tool.
@@ -18,10 +18,7 @@
 
 %prep
 %setup -q
-#%%patch0 -p1 -b .gcc41
-#aclocal
-#automake --add-missing
-#autoconf
+%patch0 -p1
 
 %build
 %configure
@@ -58,6 +55,11 @@
 
 
 %changelog
+* Thu Jun 14 2007 Akira TAGOH <tagoh at redhat.com> - 2.2-3
+- kasumi-2.2-fix-dict-breakage.patch: patch from Debian to fix the dictionary
+  breakage when adding words to the personal dictionary against the bugfix
+  version of anthy that the version contains non-numeric characters.
+
 * Wed Mar 28 2007 Akira TAGOH <tagoh at redhat.com> - 2.2-2
 - Add X-GNOME-PersonalSettings to the category. (#234169)
 


--- kasumi-1.0-gcc41.patch DELETED ---