Hello community,
here is the log from the commit of package kasumi
checked in at Mon Nov 19 18:11:39 CET 2007.
--------
--- kasumi/kasumi.changes 2007-05-21 18:11:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/kasumi/kasumi.changes 2007-11-19 17:46:03.000000000 +0100
@@ -1,0 +2,17 @@
+Tue Nov 06 18:20:11 CET 2007 - mfabian@suse.de
+
+- update to 2.3:
+ • FTBFS with GCC 4.3: missing #includes
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=417266
+ Thaks to Martin Michlmayr .
+ • kasumi dumps core on x86_64 systems when trying
+ to add new words to the dictionary
+ https://bugzilla.novell.com/show_bug.cgi?id=253788
+ Thanks to Mike Fabian (-> remove 64bit patch).
+ • fail in the judgment of the version.
+ http://kasumi.sourceforge.jp/index.php?%A5%D0%A5%B0%CA%F3%B9%F0%2F95
+ Thanks to dtana.
+- remove typo.patch.
+- fix build with gcc 4.3.
+
+-------------------------------------------------------------------
Old:
----
64bit.patch
kasumi-2.2.tar.bz2
typo.patch
New:
----
fix-build.patch
kasumi-2.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kasumi.spec ++++++
--- /var/tmp/diff_new_pack.pN2763/_old 2007-11-19 18:11:23.000000000 +0100
+++ /var/tmp/diff_new_pack.pN2763/_new 2007-11-19 18:11:23.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kasumi (Version 2.2)
+# spec file for package kasumi (Version 2.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,17 +12,16 @@
Name: kasumi
BuildRequires: anthy-devel gcc-c++ gtk2-devel update-desktop-files
-License: GNU General Public License (GPL)
+License: GPL v2 or later
Group: System/I18n/Japanese
-Autoreqprov: on
+AutoReqProv: on
Provides: locale(anthy:ja)
-Version: 2.2
-Release: 17
-URL: http://kasumi.sourceforge.jp/
-Source0: http://osdn.dl.sourceforge.jp/kasumi/22902/kasumi-2.2.tar.bz2
-Patch0: 64bit.patch
+Version: 2.3
+Release: 1
+Url: http://kasumi.sourceforge.jp/
+Source0: http://keihanna.dl.sourceforge.jp/kasumi/27825/kasumi-2.3.tar.bz2
+Patch0: fix-build.patch
Patch1: gcc41.patch
-Patch2: typo.patch
Patch3: desktop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Dictionary Tool for Anthy
@@ -40,7 +39,6 @@
%setup0 -q -n %{name}-%{version}
%patch0 -p1
#%patch1 -p1
-%patch2 -p1
%patch3 -p1
%build
@@ -74,8 +72,21 @@
%{_datadir}/pixmaps/kasumi.png
%{_datadir}/applications/kasumi.desktop
%{_mandir}/man1/*
-
%changelog
+* Tue Nov 06 2007 - mfabian@suse.de
+- update to 2.3:
+ • FTBFS with GCC 4.3: missing #includes
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=417266
+ Thaks to Martin Michlmayr .
+ • kasumi dumps core on x86_64 systems when trying
+ to add new words to the dictionary
+ https://bugzilla.novell.com/show_bug.cgi?id=253788
+ Thanks to Mike Fabian (-> remove 64bit patch).
+ • fail in the judgment of the version.
+ http://kasumi.sourceforge.jp/index.php?%%A5%%D0%%A5%%B0%%CA%%F3%%B9%%F0%%2F9...
+ Thanks to dtana.
+- remove typo.patch.
+- fix build with gcc 4.3.
* Mon May 21 2007 - mfabian@suse.de
- fix build on STABLE (remove X-SuSE-translate=true from .desktop
file).
++++++ fix-build.patch ++++++
diff -ru kasumi-2.3.orig/KasumiAddWindow.cxx kasumi-2.3/KasumiAddWindow.cxx
--- kasumi-2.3.orig/KasumiAddWindow.cxx 2007-10-28 09:40:43.000000000 +0100
+++ kasumi-2.3/KasumiAddWindow.cxx 2007-11-19 17:36:09.000000000 +0100
@@ -26,6 +26,7 @@
#include
#include <iostream>
+#include <algorithm>
#include "KasumiAddWindow.hxx"
#include "KasumiWord.hxx"
#include "KasumiDic.hxx"
kasumi-2.3だけに発見: KasumiAddWindow.cxx.~1~
diff -ru kasumi-2.3.orig/KasumiWord.cxx kasumi-2.3/KasumiWord.cxx
--- kasumi-2.3.orig/KasumiWord.cxx 2007-10-30 15:01:05.000000000 +0100
+++ kasumi-2.3/KasumiWord.cxx 2007-11-06 18:53:58.000000000 +0100
@@ -25,6 +25,7 @@
#include <cstdlib>
#include <string>
+#include <cstring>
#include <map>
#include
#include "KasumiWord.hxx"
diff -ru kasumi-2.3.orig/main.cxx kasumi-2.3/main.cxx
--- kasumi-2.3.orig/main.cxx 2007-10-30 15:01:22.000000000 +0100
+++ kasumi-2.3/main.cxx 2007-11-06 18:54:22.000000000 +0100
@@ -29,7 +29,8 @@
#endif
#include
-#include
+#include <cstdlib>
+#include <cstring>
#include
#include <iostream>
#include <string>
++++++ kasumi-2.2.tar.bz2 -> kasumi-2.3.tar.bz2 ++++++
++++ 3850 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kasumi-2.2/ChangeLog new/kasumi-2.3/ChangeLog
--- old/kasumi-2.2/ChangeLog 2006-11-29 10:52:32.000000000 +0100
+++ new/kasumi-2.3/ChangeLog 2007-10-30 15:46:15.000000000 +0100
@@ -1,3 +1,17 @@
+2007-10-30 Ikuya Awashiro
+ * fix:
+ - FTBFS with GCC 4.3: missing #includes
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=417266
+ Thaks to Martin Michlmayr .
+ - kasumi dumps core on x86_64 systems when trying
+ to add new words to the dictionary
+ https://bugzilla.novell.com/show_bug.cgi?id=253788
+ Thanks to Mike Fabian.
+ - fail in the judgment of the version.
+ http://kasumi.sourceforge.jp/index.php?%A5%D0%A5%B0%CA%F3%B9%F0%2F95
+ Thanks to dtana.
+ * preparation for release (ver 2.3)
+
2006-11-29 Takashi Nakamoto
* preparation for release (ver 2.2)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kasumi-2.2/configure.in new/kasumi-2.3/configure.in
--- old/kasumi-2.2/configure.in 2006-11-29 10:51:20.000000000 +0100
+++ new/kasumi-2.3/configure.in 2007-10-30 15:50:24.000000000 +0100
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.cxx, 2.0)
-AM_INIT_AUTOMAKE(kasumi, 2.2)
+AM_INIT_AUTOMAKE(kasumi, 2.3)
AM_CONFIG_HEADER(config.h)
dnl Checks for programs.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kasumi-2.2/KasumiConfiguration.cxx new/kasumi-2.3/KasumiConfiguration.cxx
--- old/kasumi-2.2/KasumiConfiguration.cxx 2006-10-15 15:47:02.000000000 +0200
+++ new/kasumi-2.3/KasumiConfiguration.cxx 2007-10-30 15:00:56.000000000 +0100
@@ -23,6 +23,7 @@
*
*********************************************************************/
+#include <cstdlib>
#include <iostream>
#include <fstream>
#include <map>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kasumi-2.2/KasumiDic.cxx new/kasumi-2.3/KasumiDic.cxx
--- old/kasumi-2.2/KasumiDic.cxx 2006-06-20 16:41:47.000000000 +0200
+++ new/kasumi-2.3/KasumiDic.cxx 2007-10-30 15:02:08.000000000 +0100
@@ -33,11 +33,13 @@
}
#include
#include
+#include <cstdlib>
#include <iostream>
#include <fstream>
#include <sstream>
#include <string>
#include <vector>
+#include <cassert>
using namespace std;
@@ -72,6 +74,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 +84,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 +113,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);
@@ -148,7 +150,7 @@
}
}
-void KasumiDic::removeWord(size_t id)
+void KasumiDic::removeWord(unsigned int id)
{
int flag = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kasumi-2.2/KasumiDicEventListener.hxx new/kasumi-2.3/KasumiDicEventListener.hxx
--- old/kasumi-2.2/KasumiDicEventListener.hxx 2006-06-26 08:21:40.000000000 +0200
+++ new/kasumi-2.3/KasumiDicEventListener.hxx 2007-10-30 15:01:05.000000000 +0100
@@ -36,7 +36,7 @@
private:
public:
virtual ~KasumiDicEventListener() {};
- virtual void removedWord(size_t id) = 0;
+ virtual void removedWord(unsigned int id) = 0;
virtual void appendedWord(KasumiWord *word) = 0;
virtual void modifiedWord(KasumiWord *word) = 0;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kasumi-2.2/KasumiDic.hxx new/kasumi-2.3/KasumiDic.hxx
--- old/kasumi-2.2/KasumiDic.hxx 2006-05-26 19:41:25.000000000 +0200
+++ new/kasumi-2.3/KasumiDic.hxx 2007-10-30 15:01:05.000000000 +0100
@@ -56,7 +56,7 @@
~KasumiDic();
void store() throw(KasumiException);
void appendWord(KasumiWord *word); // returns this word's ID
- void removeWord(size_t id);
+ void removeWord(unsigned int id);
void registerEventListener(KasumiDicEventListener *listener);
void removeEventListener(KasumiDicEventListener *listener);
@@ -69,7 +69,7 @@
void changedSound(KasumiWord *word);
void changedWordType(KasumiWord *word);
-// KasumiWord *getWordWithID(size_t id) throw(KasumiException);
+// KasumiWord *getWordWithID(unsigned int id) throw(KasumiException);
// int getUpperBoundOfWordID();
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kasumi-2.2/KasumiException.cxx new/kasumi-2.3/KasumiException.cxx
--- old/kasumi-2.2/KasumiException.cxx 2006-06-26 09:20:27.000000000 +0200
+++ new/kasumi-2.3/KasumiException.cxx 2007-10-30 15:00:57.000000000 +0100
@@ -24,6 +24,7 @@
*********************************************************************/
#include
+#include <cstdlib>
#include <iostream>
#include "KasumiException.hxx"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kasumi-2.2/KasumiMainWindow.cxx new/kasumi-2.3/KasumiMainWindow.cxx
--- old/kasumi-2.2/KasumiMainWindow.cxx 2006-11-28 13:57:16.000000000 +0100
+++ new/kasumi-2.3/KasumiMainWindow.cxx 2007-10-30 15:01:05.000000000 +0100
@@ -26,6 +26,7 @@
#include
#include "cellrendererspin.h"
+#include <cstdlib>
#include <iostream>
#include "KasumiMainWindow.hxx"
#include "KasumiException.hxx"
@@ -435,7 +436,7 @@
void KasumiMainWindow::ClickedRemoveButton(){
GtkTreeModel *model = GTK_TREE_MODEL(SortList);
GtkTreeIter iter;
- int id;
+ unsigned int id;
if(gtk_tree_selection_get_selected(SortListSelection, &model, &iter)){
gtk_tree_model_get(model, &iter, COL_ID, &id, -1);
@@ -476,7 +477,7 @@
GtkTreeIter iter;
gtk_tree_model_get_iter(SortList, &iter, editingPath);
- size_t id;
+ unsigned int id;
gtk_tree_model_get(SortList, &iter, COL_ID, &id, -1);
KasumiWord *word = KasumiWord::getWordFromID(id);
@@ -568,7 +569,7 @@
if(editingPath == NULL)
throw KasumiException(string("internal error: editingPath is already freed."), STDERR, KILL);
gtk_tree_model_get_iter(SortList, &iter, editingPath);
- size_t id;
+ unsigned int id;
gtk_tree_model_get(SortList, &iter, COL_ID, &id, -1);
KasumiWord *word = KasumiWord::getWordFromID(id);
@@ -586,7 +587,7 @@
GtkTreeIter iter;
KasumiWord *word;
GtkTreeIter StartIter;
- int id;
+ unsigned int id;
string searchString = string(gtk_entry_get_text(GTK_ENTRY(mSearchEntry)));
string comparedString;
@@ -692,7 +693,7 @@
gtk_tree_view_column_set_sort_order(column,order);
}
-void KasumiMainWindow::removedWord(size_t id){
+void KasumiMainWindow::removedWord(unsigned int id){
refresh();
modificationFlag = true;
}
@@ -735,7 +736,7 @@
}
void KasumiMainWindow::modifiedWord(KasumiWord *word){
- size_t id = word->getID();
+ unsigned int id = word->getID();
GtkTreeIter *iter = findCorrespondingIter(id);
if(iter != NULL)
@@ -753,8 +754,8 @@
}
// Do not returns iter of SortList but WordList
-GtkTreeIter *KasumiMainWindow::findCorrespondingIter(size_t id){
- size_t i;
+GtkTreeIter *KasumiMainWindow::findCorrespondingIter(unsigned int id){
+ unsigned int i;
GtkTreeModel *model = GTK_TREE_MODEL(WordList);
GtkTreeIter *iter = (GtkTreeIter*)calloc(1,sizeof(GtkTreeIter));
@@ -959,7 +960,7 @@
i = key.find("+",0);
- if(i == key.npos){
+ if(i == (unsigned int) key.npos){
return (GdkModifierType)0;
}
@@ -978,7 +979,7 @@
GtkTreeIter *a,
GtkTreeIter *b,
gpointer user_data){
- int id_a, id_b;
+ unsigned int id_a, id_b;
gtk_tree_model_get(model, a, COL_ID, &id_a, -1);
gtk_tree_model_get(model, b, COL_ID, &id_b, -1);
KasumiWord *word_a = KasumiWord::getWordFromID(id_a);
@@ -991,7 +992,7 @@
GtkTreeIter *iter_a,
GtkTreeIter *iter_b,
gpointer user_data){
- int id_a, id_b;
+ unsigned int id_a, id_b;
gtk_tree_model_get(model, iter_a, COL_ID, &id_a, -1);
gtk_tree_model_get(model, iter_b, COL_ID, &id_b, -1);
KasumiWord *word_a = KasumiWord::getWordFromID(id_a);
@@ -1033,7 +1034,7 @@
GtkTreeIter *iter_a,
GtkTreeIter *iter_b,
gpointer user_data){
- int id_a, id_b;
+ unsigned int id_a, id_b;
gtk_tree_model_get(model, iter_a, COL_ID, &id_a, -1);
gtk_tree_model_get(model, iter_b, COL_ID, &id_b, -1);
KasumiWord *word_a = KasumiWord::getWordFromID(id_a);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kasumi-2.2/KasumiMainWindow.hxx new/kasumi-2.3/KasumiMainWindow.hxx
--- old/kasumi-2.2/KasumiMainWindow.hxx 2006-06-23 15:39:20.000000000 +0200
+++ new/kasumi-2.3/KasumiMainWindow.hxx 2007-10-30 15:01:05.000000000 +0100
@@ -228,7 +228,7 @@
void changedWordTypeColumn(GtkComboBox *combo);
void FindNext(bool fromCurrent);
- GtkTreeIter *findCorrespondingIter(size_t id);
+ GtkTreeIter *findCorrespondingIter(unsigned int id);
void SortBy(GtkTreeViewColumn *column);
@@ -236,7 +236,7 @@
KasumiMainWindow(KasumiDic *aDictionary, KasumiConfiguration *conf);
virtual ~KasumiMainWindow();
void refresh();
- void removedWord(size_t id);
+ void removedWord(unsigned int id);
void appendedWord(KasumiWord *word);
void modifiedWord(KasumiWord *word);
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kasumi-2.2/KasumiString.cxx new/kasumi-2.3/KasumiString.cxx
--- old/kasumi-2.2/KasumiString.cxx 2006-05-26 19:41:25.000000000 +0200
+++ new/kasumi-2.3/KasumiString.cxx 2007-10-30 15:00:57.000000000 +0100
@@ -24,6 +24,7 @@
*********************************************************************/
#include "KasumiString.hxx"
+#include <cstdlib>
#include <iostream>
#include <sstream>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kasumi-2.2/KasumiWord.cxx new/kasumi-2.3/KasumiWord.cxx
--- old/kasumi-2.2/KasumiWord.cxx 2006-10-14 09:31:21.000000000 +0200
+++ new/kasumi-2.3/KasumiWord.cxx 2007-10-30 15:01:05.000000000 +0100
@@ -23,6 +23,7 @@
*
*********************************************************************/
+#include <cstdlib>
#include <string>
#include <map>
#include
@@ -41,7 +42,7 @@
iconv_t KasumiWord::IconvUTF8_To_EUCJP = iconv_open("EUC-JP", "UTF-8");
iconv_t KasumiWord::IconvEUCJP_To_UTF8 = iconv_open("UTF-8", "EUC-JP");
-size_t KasumiWord::id_generator = 0;
+unsigned int KasumiWord::id_generator = 0;
vector KasumiWord::words = vector(VECTOR_UNIT);
@@ -277,7 +278,7 @@
return string("");
}
-KasumiWord* KasumiWord::getWordFromID(size_t id)
+KasumiWord* KasumiWord::getWordFromID(unsigned int id)
{
return KasumiWord::words[id];
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kasumi-2.2/KasumiWord.hxx new/kasumi-2.3/KasumiWord.hxx
--- old/kasumi-2.2/KasumiWord.hxx 2006-05-26 19:41:25.000000000 +0200
+++ new/kasumi-2.3/KasumiWord.hxx 2007-10-30 15:01:05.000000000 +0100
@@ -48,7 +48,7 @@
int Frequency; // corresponding "Hindo"
string Spelling; // corresponding "Tango"
string Spelling_UTF8;
- size_t id;
+ unsigned int id;
vector EventListeners;
KasumiWordType *mWordType;
@@ -60,7 +60,7 @@
// if no invalid character, returns empty string
static string extractInvalidCharacterFromSound(string soundByUTF8);
- static size_t id_generator;
+ static unsigned int id_generator;
static vector words;
KasumiWord(KasumiConfiguration *conf);
@@ -87,12 +87,12 @@
KasumiWordType *getWordType() { return mWordType; };
string getWordTypeUIString(); // UTF8
- size_t getID(){ return id; };
+ unsigned int getID(){ return id; };
void registerEventListener(KasumiWordEventListener *listener);
void removeEventListener(KasumiWordEventListener *listener);
- static KasumiWord *getWordFromID(size_t id);
+ static KasumiWord *getWordFromID(unsigned int id);
static string convertUTF8ToEUCJP(const string &aEUCJP);
static string convertEUCJPToUTF8(const string &aUTF8);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kasumi-2.2/main.cxx new/kasumi-2.3/main.cxx
--- old/kasumi-2.2/main.cxx 2006-10-15 15:47:02.000000000 +0200
+++ new/kasumi-2.3/main.cxx 2007-10-30 15:01:22.000000000 +0100
@@ -167,12 +167,12 @@
while (gtk_events_pending())
gtk_main_iteration();
if (instance > 0) {
- /* Kasumi process is already exists */
+ /* Kasumi process already exists */
while (arg_text != NULL)
while (gtk_events_pending())
gtk_main_iteration();
gtk_widget_destroy(window);
- cerr << "Kasumi process is already exists." << endl;
+ cerr << "Kasumi process already exists." << endl;
return NULL;
}
g_free(arg_text);
Files old/kasumi-2.2/po/it.gmo and new/kasumi-2.3/po/it.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kasumi-2.2/po/it.po new/kasumi-2.3/po/it.po
--- old/kasumi-2.2/po/it.po 2006-11-29 10:55:53.000000000 +0100
+++ new/kasumi-2.3/po/it.po 2007-10-30 15:51:43.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 18:55+0900\n"
+"POT-Creation-Date: 2007-10-30 23:51+0900\n"
"PO-Revision-Date: 2006-06-25 13:04+0900\n"
"Last-Translator: Diego 'Flameeyes' Pettenò \n"
"Language-Team: Italian\n"
@@ -17,7 +17,7 @@
"X-Generator: KBabel 1.11.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: KasumiWord.cxx:188 KasumiWord.cxx:211
+#: KasumiWord.cxx:189 KasumiWord.cxx:212
msgid ""
"Sound must consist of only Hiragana characters. You have entered invalid "
"character: "
@@ -25,39 +25,39 @@
"Il suono deve contenere solo caratteri Hiragana. Sono stati inseriti "
"caratteri non validi."
-#: KasumiMainWindow.cxx:94
+#: KasumiMainWindow.cxx:95
msgid "Kasumi"
msgstr "Kasumi"
-#: KasumiMainWindow.cxx:113
+#: KasumiMainWindow.cxx:114
msgid "search"
msgstr "cerca"
-#: KasumiMainWindow.cxx:123
+#: KasumiMainWindow.cxx:124
msgid "Search by Spelling"
msgstr "Cerca per ortografia"
-#: KasumiMainWindow.cxx:129
+#: KasumiMainWindow.cxx:130
msgid "Search by Sound"
msgstr "Cerca per suono"
-#: KasumiMainWindow.cxx:210 KasumiAddWindow.cxx:68
+#: KasumiMainWindow.cxx:211 KasumiAddWindow.cxx:68
msgid "Spelling"
msgstr "Ortografia"
-#: KasumiMainWindow.cxx:224 KasumiAddWindow.cxx:79
+#: KasumiMainWindow.cxx:225 KasumiAddWindow.cxx:79
msgid "Sound"
msgstr "Suono"
-#: KasumiMainWindow.cxx:249 KasumiAddWindow.cxx:90
+#: KasumiMainWindow.cxx:250 KasumiAddWindow.cxx:90
msgid "Frequency"
msgstr "Frequenza"
-#: KasumiMainWindow.cxx:283
+#: KasumiMainWindow.cxx:284
msgid "WordClass"
msgstr "WordClass"
-#: KasumiMainWindow.cxx:401
+#: KasumiMainWindow.cxx:402
msgid ""
"Your dictionary was changed. Do you save these changes before Kasumi quits?"
msgstr ""
Files old/kasumi-2.2/po/ja.gmo and new/kasumi-2.3/po/ja.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/kasumi-2.2/po/ja.po new/kasumi-2.3/po/ja.po
--- old/kasumi-2.2/po/ja.po 2006-11-29 10:55:53.000000000 +0100
+++ new/kasumi-2.3/po/ja.po 2007-10-30 15:51:43.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: 0.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 18:55+0900\n"
+"POT-Creation-Date: 2007-10-30 23:51+0900\n"
"PO-Revision-Date: 2006-10-15 22:30+0900\n"
"Last-Translator: Takashi Nakamoto \n"
"Language-Team: Takashi Nakamoto \n"
@@ -15,45 +15,45 @@
"Content-Type: text/plain; charset=EUC-JP\n"
"Content-Transfer-Encoding: 8bit\n"
-#: KasumiWord.cxx:188 KasumiWord.cxx:211
+#: KasumiWord.cxx:189 KasumiWord.cxx:212
msgid ""
"Sound must consist of only Hiragana characters. You have entered invalid "
"character: "
msgstr "�ɤߤˤҤ餬�ʰʳ���ʸ�������Ϥ��뤳�ȤϤǤ��ޤ���: "
-#: KasumiMainWindow.cxx:94
+#: KasumiMainWindow.cxx:95
msgid "Kasumi"
msgstr "��"
-#: KasumiMainWindow.cxx:113
+#: KasumiMainWindow.cxx:114
msgid "search"
msgstr "����"
-#: KasumiMainWindow.cxx:123
+#: KasumiMainWindow.cxx:124
msgid "Search by Spelling"
msgstr "ñ��Ǹ���"
-#: KasumiMainWindow.cxx:129
+#: KasumiMainWindow.cxx:130
msgid "Search by Sound"
msgstr "�ɤߤǸ���"
-#: KasumiMainWindow.cxx:210 KasumiAddWindow.cxx:68
+#: KasumiMainWindow.cxx:211 KasumiAddWindow.cxx:68
msgid "Spelling"
msgstr "ñ��"
-#: KasumiMainWindow.cxx:224 KasumiAddWindow.cxx:79
+#: KasumiMainWindow.cxx:225 KasumiAddWindow.cxx:79
msgid "Sound"
msgstr "�ɤ�"
-#: KasumiMainWindow.cxx:249 KasumiAddWindow.cxx:90
+#: KasumiMainWindow.cxx:250 KasumiAddWindow.cxx:90
msgid "Frequency"
msgstr "����"
-#: KasumiMainWindow.cxx:283
+#: KasumiMainWindow.cxx:284
msgid "WordClass"
msgstr "�ʻ�"
-#: KasumiMainWindow.cxx:401
+#: KasumiMainWindow.cxx:402
msgid ""
"Your dictionary was changed. Do you save these changes before Kasumi quits?"
msgstr "������ѹ����ä����ޤ��������λ����������¸���ޤ�����"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org