rpms/scim-tomoe/devel scim-tomoe-0.6.0-gcc43-cstring-440886.patch, NONE, 1.1 scim-tomoe.spec, 1.22, 1.23

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/scim-tomoe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10161

Modified Files:
	scim-tomoe.spec 
Added Files:
	scim-tomoe-0.6.0-gcc43-cstring-440886.patch 
Log Message:
- fix build under gcc43 (#440886)
- use the main sourceforge project URL
Resolves: #440886


scim-tomoe-0.6.0-gcc43-cstring-440886.patch:

--- NEW FILE scim-tomoe-0.6.0-gcc43-cstring-440886.patch ---
diff -up scim-tomoe-0.6.0/src/scim_tomoe_prefs_widget.cpp~ scim-tomoe-0.6.0/src/scim_tomoe_prefs_widget.cpp
--- scim-tomoe-0.6.0/src/scim_tomoe_prefs_widget.cpp~	2007-05-07 17:49:15.000000000 +1000
+++ scim-tomoe-0.6.0/src/scim_tomoe_prefs_widget.cpp	2008-04-14 16:47:34.000000000 +1000
@@ -26,6 +26,7 @@
 #include "scim_tomoe_prefs_widget.h"
 #include "scim_tomoe_prefs.h"
 #include <tomoe-gtk.h>
+#include <cstring>
 
 enum {
     HOGE_SIGNAL,


Index: scim-tomoe.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- scim-tomoe.spec	19 Feb 2008 23:08:01 -0000	1.22
+++ scim-tomoe.spec	14 Apr 2008 07:36:25 -0000	1.23
@@ -5,7 +5,7 @@
 
 Group:          System Environment/Libraries
 License:        GPL
-URL:            http://scim-imengine.sourceforge.jp/
+URL:            http://tomoe.sourceforge.net/
 Source0:        http://dl.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -13,6 +13,7 @@
 BuildRequires:  tomoe-devel >= %{version}, libtomoe-gtk-devel >= %{version}
 BuildRequires:  perl(XML::Parser), gettext
 Requires:       scim, tomoe >= %{version}, libtomoe-gtk >= %{version}
+Patch1:         scim-tomoe-0.6.0-gcc43-cstring-440886.patch
 
 %description
 Scim-tomoe allows handwritten input of Chinese and Japanese characters
@@ -21,6 +22,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .1-ctring~
 
 
 %build
@@ -50,8 +52,9 @@
 
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.6.0-3
-- Autorebuild for GCC 4.3
+* Mon Apr 14 2008 Jens Petersen <petersen at redhat.com> - 0.6.0-3
+- fix build under gcc43 (#440886)
+- use the main sourceforge project URL
 
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.6.0-2
 - Rebuild for selinux ppc32 issue.