rpms/scim-pinyin/devel scim-pinyin-0.5.91-gcc43.patch, NONE, 1.1 scim-pinyin.spec, 1.45, 1.46

[Huang Peng (phuang)]

Author: phuang

Update of /cvs/pkgs/rpms/scim-pinyin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5160

Modified Files:
	scim-pinyin.spec 
Added Files:
	scim-pinyin-0.5.91-gcc43.patch 
Log Message:
Fix build error with GCC 4.3. 
Drop scim-pinyin-helper.


scim-pinyin-0.5.91-gcc43.patch:

--- NEW FILE scim-pinyin-0.5.91-gcc43.patch ---
diff -up scim-pinyin-0.5.91/src/scim_phrase.cpp.gcc43 scim-pinyin-0.5.91/src/scim_phrase.cpp
--- scim-pinyin-0.5.91/src/scim_phrase.cpp.gcc43	2008-02-25 16:27:05.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_phrase.cpp	2008-02-25 16:26:41.000000000 +0800
@@ -28,6 +28,7 @@
 #define SCIM_PHRASE_MAX_RELATION 1000
 
 #include <scim.h>
+#include <cstring>
 #include "scim_pinyin_private.h"
 #include "scim_phrase.h"
 
diff -up scim-pinyin-0.5.91/src/scim_special_table.cpp.gcc43 scim-pinyin-0.5.91/src/scim_special_table.cpp
--- scim-pinyin-0.5.91/src/scim_special_table.cpp.gcc43	2008-02-25 16:27:55.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_special_table.cpp	2008-02-25 16:28:08.000000000 +0800
@@ -22,6 +22,7 @@
 
 #include <time.h>
 #include <scim.h>
+#include <cstring>
 #include "scim_pinyin_private.h"
 #include "scim_special_table.h"
 
diff -up scim-pinyin-0.5.91/src/scim_pinyin.cpp.gcc43 scim-pinyin-0.5.91/src/scim_pinyin.cpp
--- scim-pinyin-0.5.91/src/scim_pinyin.cpp.gcc43	2008-02-25 16:26:10.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_pinyin.cpp	2008-02-25 16:26:26.000000000 +0800
@@ -29,6 +29,7 @@
 #define Uses_SCIM_LOOKUP_TABLE
 
 #include <scim.h>
+#include <cstring>
 #include "scim_pinyin.h"
 
 // Internal functions
diff -up scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp.gcc43 scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp
--- scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp.gcc43	2008-02-25 16:27:15.000000000 +0800
+++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp	2008-02-25 16:27:28.000000000 +0800
@@ -27,6 +27,7 @@
 #define Uses_SCIM_LOOKUP_TABLE
 
 #include <scim.h>
+#include <cstring>
 #include "scim_pinyin_private.h"
 #include "scim_phrase.h"
 #include "scim_pinyin.h"


Index: scim-pinyin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-pinyin/devel/scim-pinyin.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- scim-pinyin.spec	19 Feb 2008 19:25:56 -0000	1.45
+++ scim-pinyin.spec	25 Feb 2008 08:36:19 -0000	1.46
@@ -1,6 +1,6 @@
 Name:       scim-pinyin
 Version:    0.5.91
-Release:    24%{?dist}
+Release:    25%{?dist}
 Summary:    Smart Pinyin IMEngine for Smart Common Input Method platform
 
 License:    GPLv2
@@ -13,9 +13,9 @@
 Requires:   scim
 Obsoletes:  iiimf-le-chinput <= 0.3, miniChinput <= 0.0.3
 Patch2:         scim-pinyin-showallkeys.patch
-Patch3:         scim-pinyin-helper.patch
-Patch4:         scim-pinyin-0.5.91-13.bz200702.patch
-Patch5:         scim-pinyin-help-translate.patch
+# Patch3:         scim-pinyin-helper.patch
+# Patch4:         scim-pinyin-0.5.91-13.bz200702.patch
+# Patch5:         scim-pinyin-help-translate.patch
 Patch6:         scim-pinyin-0.5.91-save-in-temp.patch
 Patch7:         scim-pinyin-0.5.91-fix-load.patch
 Patch8:         scim-pinyin-0.5.91-fix-ms-shuangpin.patch
@@ -27,9 +27,9 @@
 %prep
 %setup -q
 %patch2 -p1 -b .2-showallkeys
-%patch3 -p1 -b .3-helperi
-%patch4 -p1 -b .4-bz200702
-%patch5 -p1 -b .5-translate
+# %patch3 -p1 -b .3-helperi
+# %patch4 -p1 -b .4-bz200702
+# %patch5 -p1 -b .5-translate
 %patch6 -p1 -b .6-savetmp
 %patch7 -p1 -b .6-fix-load
 %patch8 -p1 -b .8-fix-ms-shuangpin
@@ -66,6 +66,10 @@
 
 
 %changelog
+* Mon Feb 25 2008 Huang Peng <phuang at redhat.com> - 0.5.91-25
+- Fix build error with GCC 4.3.
+- Drop the scim-pinyin-helper because upstream does not accept it and we will stop maintaining it.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5.91-24
 - Autorebuild for GCC 4.3