rpms/scim-chewing/devel scim-chewing-0.3.1-13.gcc.patch, NONE, 1.1 scim-chewing.spec, 1.35, 1.36

[Caius Chance (cchance)]

Author: cchance

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

Modified Files:
	scim-chewing.spec 
Added Files:
	scim-chewing-0.3.1-13.gcc.patch 
Log Message:
rebuild for f9, patches due to gcc update


scim-chewing-0.3.1-13.gcc.patch:

--- NEW FILE scim-chewing-0.3.1-13.gcc.patch ---
diff -up scim-chewing-0.3.1/src/scim_chewing_imengine.cpp.8-gcc scim-chewing-0.3.1/src/scim_chewing_imengine.cpp
--- scim-chewing-0.3.1/src/scim_chewing_imengine.cpp.8-gcc	2008-01-29 22:37:31.000000000 +1000
+++ scim-chewing-0.3.1/src/scim_chewing_imengine.cpp	2008-01-29 22:38:02.000000000 +1000
@@ -45,6 +45,7 @@
 #define SCIM_CHEWING_SELECTION_KEYS_NUM_DEF 9
 static int _selection_keys_num;
 
+#include <string.h>
 #include <scim.h>
 #include <chewing/chewing.h>
 
diff -up scim-chewing-0.3.1/src/scim_chewing_imengine_setup.cpp.8-gcc scim-chewing-0.3.1/src/scim_chewing_imengine_setup.cpp
--- scim-chewing-0.3.1/src/scim_chewing_imengine_setup.cpp.8-gcc	2008-01-29 22:32:44.000000000 +1000
+++ scim-chewing-0.3.1/src/scim_chewing_imengine_setup.cpp	2008-01-29 22:38:57.000000000 +1000
@@ -16,6 +16,7 @@
 #define Uses_SCIM_CONFIG_BASE
 
 #include <gtk/gtk.h>
+#include <string.h>
 
 #ifdef HAVE_CONFIG_H
   #include <config.h>
@@ -390,7 +391,7 @@ struct _builtin_keymap {
 			String( _( "Han-Yu PinYin Keyboard" ) ) }
 };
 
-static char *builtin_selectkeys[] = {
+static const char *builtin_selectkeys[] = {
 	SCIM_CONFIG_IMENGINE_CHEWING_SELECTION_KEYS,
 	"asdfghjkl;",
 	"asdfzxcv89",
@@ -399,7 +400,7 @@ static char *builtin_selectkeys[] = {
 	"1234qweras",
 };
 
-static char *builtin_selectkeys_num[] = {
+static const char *builtin_selectkeys_num[] = {
 	"9",
 	"8",
 	"7",
@@ -415,7 +416,7 @@ static GtkWidget *create_keyboard_page()
 	table = gtk_table_new (4, 5, FALSE);
 	gtk_widget_show (table);
 
-	int i;
+	unsigned int i;
 	// Create keyboard setting.
 	for (i = 0; __config_keyboards [i].key; ++ i) {
 		label = gtk_label_new (NULL);


Index: scim-chewing.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-chewing/devel/scim-chewing.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- scim-chewing.spec	8 Jan 2008 07:06:51 -0000	1.35
+++ scim-chewing.spec	13 Feb 2008 03:20:53 -0000	1.36
@@ -1,6 +1,6 @@
 Name:           scim-chewing
 Version:        0.3.1
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Chewing Chinese input method for SCIM
 
 License:        GPL
@@ -18,6 +18,7 @@
 Patch4:         scim-chewing-0.3.1-9.bz216581.patch
 Patch5:         scim-chewing-0.3.1-10.bz237924.patch
 Patch6:         scim-chewing-0.3.1-11.bz200694.patch
+Patch7:         scim-chewing-0.3.1-13.gcc.patch
 
 %description
 This package provides Chewing Chinese input method for SCIM. 
@@ -32,6 +33,7 @@
 %patch4 -p1 -b .5-bz216581
 %patch5 -p1 -b .6-bz237924
 %patch6 -p1 -b .7-bz200694
+%patch7 -p1 -b .8-gcc
 
 %build
 %configure --disable-static
@@ -61,6 +63,9 @@
 
 
 %changelog
+* Wed Jan 13 2008 Caius Chance <cchance at redhat.com> 0.3.1-13.fc9
+- Rebuild for F9.
+
 * Tue Jan 08 2008 Caius Chance <cchance at redhat.com> 0.3.1-12.fc9
 - Updated buildrequires version of libchewing-devel to 0.3.0-9.