From 120bca2fdb3c1d7b9f41cfd6a3359628c1bf401ce2df867c9ccb67b2e6dc6d33 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 15 Mar 2007 00:41:11 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kasumi?expand=0&rev=2 --- 64bit.patch | 80 ++++++++++++++++++++++---------------------- desktop.patch | 18 ++++++++++ kasumi-2.0.1.tar.bz2 | 3 -- kasumi-2.2.tar.bz2 | 3 ++ kasumi.changes | 12 +++++++ kasumi.spec | 31 +++++++++++------ 6 files changed, 93 insertions(+), 54 deletions(-) create mode 100644 desktop.patch delete mode 100644 kasumi-2.0.1.tar.bz2 create mode 100644 kasumi-2.2.tar.bz2 diff --git a/64bit.patch b/64bit.patch index 36b1b1f..354884e 100644 --- a/64bit.patch +++ b/64bit.patch @@ -1,6 +1,6 @@ -diff -ru kasumi-2.0.1.orig/KasumiDic.cxx kasumi-2.0.1/KasumiDic.cxx ---- kasumi-2.0.1.orig/KasumiDic.cxx 2006-05-26 19:41:25.000000000 +0200 -+++ kasumi-2.0.1/KasumiDic.cxx 2006-08-29 17:24:58.000000000 +0200 +diff -ru kasumi-2.2.orig/KasumiDic.cxx kasumi-2.2/KasumiDic.cxx +--- kasumi-2.2.orig/KasumiDic.cxx 2006-06-20 16:41:47.000000000 +0200 ++++ kasumi-2.2/KasumiDic.cxx 2007-03-13 18:18:16.000000000 +0100 @@ -148,7 +148,7 @@ } } @@ -10,9 +10,9 @@ diff -ru kasumi-2.0.1.orig/KasumiDic.cxx kasumi-2.0.1/KasumiDic.cxx { int flag = 0; -diff -ru kasumi-2.0.1.orig/KasumiDic.hxx kasumi-2.0.1/KasumiDic.hxx ---- kasumi-2.0.1.orig/KasumiDic.hxx 2006-05-26 19:41:25.000000000 +0200 -+++ kasumi-2.0.1/KasumiDic.hxx 2006-08-29 17:25:39.000000000 +0200 +diff -ru kasumi-2.2.orig/KasumiDic.hxx kasumi-2.2/KasumiDic.hxx +--- kasumi-2.2.orig/KasumiDic.hxx 2006-05-26 19:41:25.000000000 +0200 ++++ kasumi-2.2/KasumiDic.hxx 2007-03-13 18:19:11.000000000 +0100 @@ -56,7 +56,7 @@ ~KasumiDic(); void store() throw(KasumiException); @@ -31,21 +31,21 @@ diff -ru kasumi-2.0.1.orig/KasumiDic.hxx kasumi-2.0.1/KasumiDic.hxx // int getUpperBoundOfWordID(); }; -diff -ru kasumi-2.0.1.orig/KasumiDicEventListener.hxx kasumi-2.0.1/KasumiDicEventListener.hxx ---- kasumi-2.0.1.orig/KasumiDicEventListener.hxx 2006-05-26 19:41:25.000000000 +0200 -+++ kasumi-2.0.1/KasumiDicEventListener.hxx 2006-08-29 17:25:53.000000000 +0200 -@@ -35,7 +35,7 @@ - class KasumiDicEventListener{ +diff -ru kasumi-2.2.orig/KasumiDicEventListener.hxx kasumi-2.2/KasumiDicEventListener.hxx +--- kasumi-2.2.orig/KasumiDicEventListener.hxx 2006-06-26 08:21:40.000000000 +0200 ++++ kasumi-2.2/KasumiDicEventListener.hxx 2007-03-13 18:19:45.000000000 +0100 +@@ -36,7 +36,7 @@ private: public: -- 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; + 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 -ru kasumi-2.0.1.orig/KasumiMainWindow.cxx kasumi-2.0.1/KasumiMainWindow.cxx ---- kasumi-2.0.1.orig/KasumiMainWindow.cxx 2006-05-29 06:59:37.000000000 +0200 -+++ kasumi-2.0.1/KasumiMainWindow.cxx 2006-08-29 17:26:17.000000000 +0200 +diff -ru kasumi-2.2.orig/KasumiMainWindow.cxx kasumi-2.2/KasumiMainWindow.cxx +--- kasumi-2.2.orig/KasumiMainWindow.cxx 2006-11-28 13:57:16.000000000 +0100 ++++ kasumi-2.2/KasumiMainWindow.cxx 2007-03-13 18:32:15.000000000 +0100 @@ -435,7 +435,7 @@ void KasumiMainWindow::ClickedRemoveButton(){ GtkTreeModel *model = GTK_TREE_MODEL(SortList); @@ -73,16 +73,16 @@ diff -ru kasumi-2.0.1.orig/KasumiMainWindow.cxx kasumi-2.0.1/KasumiMainWindow.cx gtk_tree_model_get(SortList, &iter, COL_ID, &id, -1); KasumiWord *word = KasumiWord::getWordFromID(id); -@@ -587,7 +587,7 @@ +@@ -586,7 +586,7 @@ + GtkTreeIter iter; KasumiWord *word; - bool fromFirst = false; GtkTreeIter StartIter; - int id; + unsigned int id; string searchString = string(gtk_entry_get_text(GTK_ENTRY(mSearchEntry))); string comparedString; - GtkWidget *dialog; -@@ -714,7 +714,7 @@ + +@@ -692,7 +692,7 @@ gtk_tree_view_column_set_sort_order(column,order); } @@ -91,7 +91,7 @@ diff -ru kasumi-2.0.1.orig/KasumiMainWindow.cxx kasumi-2.0.1/KasumiMainWindow.cx refresh(); modificationFlag = true; } -@@ -754,7 +754,7 @@ +@@ -735,7 +735,7 @@ } void KasumiMainWindow::modifiedWord(KasumiWord *word){ @@ -100,7 +100,7 @@ diff -ru kasumi-2.0.1.orig/KasumiMainWindow.cxx kasumi-2.0.1/KasumiMainWindow.cx GtkTreeIter *iter = findCorrespondingIter(id); if(iter != NULL) -@@ -772,8 +772,8 @@ +@@ -753,8 +753,8 @@ } // Do not returns iter of SortList but WordList @@ -111,7 +111,7 @@ diff -ru kasumi-2.0.1.orig/KasumiMainWindow.cxx kasumi-2.0.1/KasumiMainWindow.cx GtkTreeModel *model = GTK_TREE_MODEL(WordList); GtkTreeIter *iter = (GtkTreeIter*)calloc(1,sizeof(GtkTreeIter)); -@@ -978,7 +978,7 @@ +@@ -959,7 +959,7 @@ i = key.find("+",0); @@ -120,7 +120,7 @@ diff -ru kasumi-2.0.1.orig/KasumiMainWindow.cxx kasumi-2.0.1/KasumiMainWindow.cx return (GdkModifierType)0; } -@@ -997,7 +997,7 @@ +@@ -978,7 +978,7 @@ GtkTreeIter *a, GtkTreeIter *b, gpointer user_data){ @@ -129,7 +129,7 @@ diff -ru kasumi-2.0.1.orig/KasumiMainWindow.cxx kasumi-2.0.1/KasumiMainWindow.cx 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); -@@ -1010,7 +1010,7 @@ +@@ -991,7 +991,7 @@ GtkTreeIter *iter_a, GtkTreeIter *iter_b, gpointer user_data){ @@ -138,7 +138,7 @@ diff -ru kasumi-2.0.1.orig/KasumiMainWindow.cxx kasumi-2.0.1/KasumiMainWindow.cx 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); -@@ -1075,7 +1075,7 @@ +@@ -1033,7 +1033,7 @@ GtkTreeIter *iter_a, GtkTreeIter *iter_b, gpointer user_data){ @@ -147,10 +147,10 @@ diff -ru kasumi-2.0.1.orig/KasumiMainWindow.cxx kasumi-2.0.1/KasumiMainWindow.cx 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 -ru kasumi-2.0.1.orig/KasumiMainWindow.hxx kasumi-2.0.1/KasumiMainWindow.hxx ---- kasumi-2.0.1.orig/KasumiMainWindow.hxx 2006-05-29 06:59:37.000000000 +0200 -+++ kasumi-2.0.1/KasumiMainWindow.hxx 2006-08-29 17:26:55.000000000 +0200 -@@ -174,7 +174,7 @@ +diff -ru kasumi-2.2.orig/KasumiMainWindow.hxx kasumi-2.2/KasumiMainWindow.hxx +--- kasumi-2.2.orig/KasumiMainWindow.hxx 2006-06-23 15:39:20.000000000 +0200 ++++ kasumi-2.2/KasumiMainWindow.hxx 2007-03-13 18:33:03.000000000 +0100 +@@ -228,7 +228,7 @@ void changedWordTypeColumn(GtkComboBox *combo); void FindNext(bool fromCurrent); @@ -159,7 +159,7 @@ diff -ru kasumi-2.0.1.orig/KasumiMainWindow.hxx kasumi-2.0.1/KasumiMainWindow.hx void SortBy(GtkTreeViewColumn *column); -@@ -182,7 +182,7 @@ +@@ -236,7 +236,7 @@ KasumiMainWindow(KasumiDic *aDictionary, KasumiConfiguration *conf); virtual ~KasumiMainWindow(); void refresh(); @@ -168,9 +168,9 @@ diff -ru kasumi-2.0.1.orig/KasumiMainWindow.hxx kasumi-2.0.1/KasumiMainWindow.hx void appendedWord(KasumiWord *word); void modifiedWord(KasumiWord *word); }; -diff -ru kasumi-2.0.1.orig/KasumiWord.cxx kasumi-2.0.1/KasumiWord.cxx ---- kasumi-2.0.1.orig/KasumiWord.cxx 2006-05-29 16:04:39.000000000 +0200 -+++ kasumi-2.0.1/KasumiWord.cxx 2006-08-29 17:27:15.000000000 +0200 +diff -ru kasumi-2.2.orig/KasumiWord.cxx kasumi-2.2/KasumiWord.cxx +--- kasumi-2.2.orig/KasumiWord.cxx 2006-10-14 09:31:21.000000000 +0200 ++++ kasumi-2.2/KasumiWord.cxx 2007-03-13 18:33:49.000000000 +0100 @@ -41,7 +41,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"); @@ -180,7 +180,7 @@ diff -ru kasumi-2.0.1.orig/KasumiWord.cxx kasumi-2.0.1/KasumiWord.cxx vector KasumiWord::words = vector(VECTOR_UNIT); -@@ -273,7 +273,7 @@ +@@ -277,7 +277,7 @@ return string(""); } @@ -189,9 +189,9 @@ diff -ru kasumi-2.0.1.orig/KasumiWord.cxx kasumi-2.0.1/KasumiWord.cxx { return KasumiWord::words[id]; } -diff -ru kasumi-2.0.1.orig/KasumiWord.hxx kasumi-2.0.1/KasumiWord.hxx ---- kasumi-2.0.1.orig/KasumiWord.hxx 2006-05-26 19:41:25.000000000 +0200 -+++ kasumi-2.0.1/KasumiWord.hxx 2006-08-29 17:21:31.000000000 +0200 +diff -ru kasumi-2.2.orig/KasumiWord.hxx kasumi-2.2/KasumiWord.hxx +--- kasumi-2.2.orig/KasumiWord.hxx 2006-05-26 19:41:25.000000000 +0200 ++++ kasumi-2.2/KasumiWord.hxx 2007-03-13 18:37:14.000000000 +0100 @@ -48,7 +48,7 @@ int Frequency; // corresponding "Hindo" string Spelling; // corresponding "Tango" diff --git a/desktop.patch b/desktop.patch new file mode 100644 index 0000000..665f70b --- /dev/null +++ b/desktop.patch @@ -0,0 +1,18 @@ +diff -ru kasumi-2.2.orig/kasumi.desktop.in kasumi-2.2/kasumi.desktop.in +--- kasumi-2.2.orig/kasumi.desktop.in 2006-06-03 16:30:07.000000000 +0200 ++++ kasumi-2.2/kasumi.desktop.in 2007-03-13 17:50:20.000000000 +0100 +@@ -1,4 +1,5 @@ + [Desktop Entry] ++X-SuSE-translate=true + Version=1.0 + Encoding=UTF-8 + Name=Anthy Dictionary editor +@@ -8,7 +9,7 @@ + Comment=Edit Anthy dictionary. + Comment[ja]=Anthy の個人辞書に単語を登録、削除、編集するツールです。 + Exec=kasumi +-Icon=kasumi.png ++Icon=kasumi + StartupNotify=true + Terminal=false + Type=Application diff --git a/kasumi-2.0.1.tar.bz2 b/kasumi-2.0.1.tar.bz2 deleted file mode 100644 index b2a4762..0000000 --- a/kasumi-2.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3df6dc416c43e4add6701ac341e5838b81cd7d4f87f51deb7ec2923033a03164 -size 215894 diff --git a/kasumi-2.2.tar.bz2 b/kasumi-2.2.tar.bz2 new file mode 100644 index 0000000..bcc6dbf --- /dev/null +++ b/kasumi-2.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74d7aa70e0d3388a6d78c536d9290a642953b926a861f07154d8fd875e349dc1 +size 222588 diff --git a/kasumi.changes b/kasumi.changes index 3b58509..ae68f19 100644 --- a/kasumi.changes +++ b/kasumi.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Mar 14 12:51:57 CET 2007 - mfabian@suse.de + +- enable 64bit patch again. + +------------------------------------------------------------------- +Tue Mar 13 14:47:38 CET 2007 - mfabian@suse.de + +- updating to 2.2 (also fixes Bugzilla #253788) + • man page added + • Italian translations added + ------------------------------------------------------------------- Mon Aug 28 21:54:37 CEST 2006 - mfabian@suse.de diff --git a/kasumi.spec b/kasumi.spec index ea71ce7..9b8ee73 100644 --- a/kasumi.spec +++ b/kasumi.spec @@ -1,7 +1,7 @@ # -# spec file for package kasumi (Version 2.0.1) +# spec file for package kasumi (Version 2.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,17 +12,18 @@ Name: kasumi BuildRequires: anthy-devel gcc-c++ gtk2-devel update-desktop-files -License: GPL +License: GNU General Public License (GPL) Group: System/I18n/Japanese Autoreqprov: on Provides: locale(anthy:ja) -Version: 2.0.1 +Version: 2.2 Release: 1 URL: http://kasumi.sourceforge.jp/ -Source0: http://osdn.dl.sourceforge.jp/kasumi/20684/kasumi-2.0.1.tar.bz2 +Source0: http://osdn.dl.sourceforge.jp/kasumi/22902/kasumi-2.2.tar.bz2 Patch0: 64bit.patch Patch1: gcc41.patch Patch2: typo.patch +Patch3: desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Dictionary Tool for Anthy @@ -38,8 +39,9 @@ Authors: %prep %setup0 -q -n %{name}-%{version} %patch0 -p1 -%patch1 -p1 +#%patch1 -p1 %patch2 -p1 +%patch3 -p1 %build rm -f config.cache @@ -48,7 +50,6 @@ rm -f config.cache libtoolize --force autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS" -export CFLAGS="-g -O0" ./configure --prefix=/usr \ --bindir=%{_bindir} \ --libdir=%{_libdir} \ @@ -60,19 +61,27 @@ make %install make DESTDIR=$RPM_BUILD_ROOT install +%suse_update_desktop_file -i %name System SystemSetup %find_lang kasumi %clean -#[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; +rm -rf $RPM_BUILD_ROOT %files -n kasumi -f kasumi.lang %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README %{_bindir}/* -%dir %{_datadir}/kasumi/ -%dir %{_datadir}/kasumi/kasumi.png +%{_datadir}/pixmaps/kasumi.png +%{_datadir}/applications/kasumi.desktop +%{_mandir}/man1/* -%changelog -n kasumi +%changelog +* Wed Mar 14 2007 - mfabian@suse.de +- enable 64bit patch again. +* Tue Mar 13 2007 - mfabian@suse.de +- updating to 2.2 (also fixes Bugzilla #253788) + • man page added + • Italian translations added * Mon Aug 28 2006 - mfabian@suse.de - update to 2.0.1. • search function for KasumiMainWindow