rpms/dasher/devel dasher-4.9.0-malloc.patch, NONE, 1.1 dasher.spec, 1.77, 1.78

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/dasher/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1716

Modified Files:
	dasher.spec 
Added Files:
	dasher-4.9.0-malloc.patch 
Log Message:
fix c++


dasher-4.9.0-malloc.patch:

--- NEW FILE dasher-4.9.0-malloc.patch ---
diff -up dasher-4.9.0/Src/DasherCore/CannaConversionHelper.h.malloc dasher-4.9.0/Src/DasherCore/CannaConversionHelper.h
--- dasher-4.9.0/Src/DasherCore/CannaConversionHelper.h.malloc	2008-04-25 10:35:55.000000000 -0400
+++ dasher-4.9.0/Src/DasherCore/CannaConversionHelper.h	2008-04-25 10:36:33.000000000 -0400
@@ -7,6 +7,8 @@
 #include <iconv.h>
 
 #include <iostream> 
+#include <cstdlib>
+
 /// \ingroup Model
 /// @{
 class CCannaConversionHelper : public CConversionHelper {
diff -up dasher-4.9.0/Src/DasherCore/PinYinConversionHelper.cpp.malloc dasher-4.9.0/Src/DasherCore/PinYinConversionHelper.cpp
--- dasher-4.9.0/Src/DasherCore/PinYinConversionHelper.cpp.malloc	2008-04-25 10:36:06.000000000 -0400
+++ dasher-4.9.0/Src/DasherCore/PinYinConversionHelper.cpp	2008-04-25 10:36:24.000000000 -0400
@@ -12,7 +12,7 @@
 
 #include <fstream>
 #include <iostream>
-
+#include <cstdlib>
 
 
 using namespace Dasher;


Index: dasher.spec
===================================================================
RCS file: /cvs/extras/rpms/dasher/devel/dasher.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- dasher.spec	25 Apr 2008 14:16:26 -0000	1.77
+++ dasher.spec	25 Apr 2008 14:41:24 -0000	1.78
@@ -7,6 +7,9 @@
 URL: http://www.gnome.org/
 Source0: http://download.gnome.org/sources/dasher/4.9/%{name}-%{version}.tar.bz2
 
+#
+Patch0: dasher-4.9.0-malloc.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: gnome-speech-devel
 BuildRequires: at-spi-devel
@@ -35,7 +38,7 @@
 
 %build
 
-%configure --disable-scrollkeeper --enable-japanese
+%configure --disable-scrollkeeper --enable-japanese --enable-chinese
 
 make
 
@@ -110,7 +113,7 @@
 %changelog
 * Fri Apr 25 2008 Matthias Clasen <mclasen at redhat.com> - 4.9.0-1
 - Update to 4.9.0
-- Build with --enable-japanese (#444131)
+- Build with --enable-japanese and --enable-chinese (#444131)
 
 * Mon Apr  7 2008 Matthias Clasen <mclasen at redhat.com> - 4.7.3-1
 - Update to 4.7.3