2009-01-16 Takao Fujiwara <[email protected]> gnome-2-24
authorfujiwara
Fri, 16 Jan 2009 02:34:02 +0000
branchgnome-2-24
changeset 14171 bad0b27674db
parent 14170 b1e56ad260c2
child 14172 71a2077c5b8c
2009-01-16 Takao Fujiwara <[email protected]> * base-specs/enchant.spec: * patches/enchant-03-zemberek-segv.diff: Added to avoid segv when zemberek server doesn't connect. 6793551. * patches/enchant-04-ordering.diff: Added myspell is default.
ChangeLog
base-specs/enchant.spec
patches/enchant-03-zemberek-segv.diff
patches/enchant-04-ordering.diff
--- a/ChangeLog	Thu Jan 15 01:04:20 2009 +0000
+++ b/ChangeLog	Fri Jan 16 02:34:02 2009 +0000
@@ -1,3 +1,10 @@
+2009-01-16  Takao Fujiwara  <[email protected]>
+
+	* base-specs/enchant.spec:
+	* patches/enchant-03-zemberek-segv.diff: Added to avoid segv 
+	when zemberek server doesn't connect. 6793551.
+	* patches/enchant-04-ordering.diff: Added myspell is default.
+
 2009-01-15  Dave Lin <[email protected]>
 
 	* SUNWbabl.spec: 
--- a/base-specs/enchant.spec	Thu Jan 15 01:04:20 2009 +0000
+++ b/base-specs/enchant.spec	Fri Jan 16 02:34:02 2009 +0000
@@ -25,6 +25,11 @@
 Patch1:         enchant-01-define_FILE.diff
 # date:2008-11-19 owner:jefftsai type:branding
 Patch2:         enchant-02-build-request-dict.diff
+# This patch is applied until zemberek-server is implemented.
+# date:2009-01-14 owner:fujiwara type:feature bugster:6793551
+Patch3:         enchant-03-zemberek-segv.diff
+# date:2009-01-14 owner:fujiwara type:feature
+Patch4:         enchant-04-ordering.diff
 Summary:	Generic spell checking library
 Group:		Applications/Text
 
@@ -39,6 +44,8 @@
 %setup  -q -n %{name}-%{version}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -77,6 +84,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jan 14 2009 - [email protected]
+- Add patch zemberek-segv.diff to avoid segv on tr_TR.UTF-8
+- Add patch ordering.diff so that we configure myspell by default.
 * Wed Nov 19 2008 - [email protected]
 - Add patch -02-build-request-dic to solve the build issue
   with SunStudio 12
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/enchant-03-zemberek-segv.diff	Fri Jan 16 02:34:02 2009 +0000
@@ -0,0 +1,15 @@
+--- enchant-1.4.2/src/zemberek/zemberek_provider.cpp.orig	2009-01-13 10:43:51.355274468 +0900
++++ enchant-1.4.2/src/zemberek/zemberek_provider.cpp	2009-01-13 10:49:15.930766869 +0900
+@@ -72,6 +72,12 @@ zemberek_provider_request_dict(EnchantPr
+     if (!checker)
+ 	return NULL;
+ 
++    int result = checker->checkWord("test");
++    if(result == -1) {
++    	delete checker;
++    	return NULL;
++    }
++
+     EnchantDict* dict = g_new0(EnchantDict, 1);
+     dict->user_data = (void *) checker;
+     dict->check = zemberek_dict_check;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/enchant-04-ordering.diff	Fri Jan 16 02:34:02 2009 +0000
@@ -0,0 +1,15 @@
+--- enchant-1.4.2/data/enchant.ordering.orig	2009-01-14 18:55:34.634040000 +0900
++++ enchant-1.4.2/data/enchant.ordering	2009-01-14 18:57:00.750038000 +0900
+@@ -1,8 +1,5 @@
+ *:myspell,aspell,ispell
+-fi:voikko,ispell,myspell,aspell
+-fi_FI:voikko,ispell,myspell,aspell
+-he:hspell,myspell
+-he_IL:hspell,myspell
+-yi:uspell
+-tr:zemberek
+-tr_TR:zemberek
++fi:voikko,myspell
++fi_FI:voikko,myspell
++tr:zemberek,myspell
++tr_TR:zemberek,myspell