rpms/dasher/F-9 dasher-4.9.0-malloc.patch, NONE, 1.1 dasher.spec, 1.76, 1.77 sources, 1.33, 1.34

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/dasher/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31291

Modified Files:
	dasher.spec sources 
Added Files:
	dasher-4.9.0-malloc.patch 
Log Message:
0.4.9


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>
+#include <cstring>
 /// \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;
diff -up dasher-4.9.0/Src/DasherCore/PinyinParser.cpp.malloc dasher-4.9.0/Src/DasherCore/PinyinParser.cpp
--- dasher-4.9.0/Src/DasherCore/PinyinParser.cpp.malloc	2008-04-25 10:49:07.000000000 -0400
+++ dasher-4.9.0/Src/DasherCore/PinyinParser.cpp	2008-04-25 10:49:30.000000000 -0400
@@ -21,6 +21,7 @@
 #include "PinyinParser.h"
 
 #include <cstdio>
+#include <cstring>
 #include <string>
 #include <vector>
 


Index: dasher.spec
===================================================================
RCS file: /cvs/extras/rpms/dasher/F-9/dasher.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- dasher.spec	7 Apr 2008 23:44:49 -0000	1.76
+++ dasher.spec	6 May 2008 02:21:48 -0000	1.77
@@ -1,11 +1,14 @@
 Summary: GNOME Accessibility method
 Name: dasher
-Version: 4.7.3
+Version: 4.9.0
 Release: 1%{?dist} 
 License: GPLv2
 Group: Desktop/Accessibility
 URL: http://www.gnome.org/
-Source0: http://download.gnome.org/sources/dasher/4.7/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/dasher/4.9/%{name}-%{version}.tar.bz2
+
+# http://bugzilla.gnome.org/show_bug.cgi?id=529907
+Patch0: dasher-4.9.0-malloc.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: gnome-speech-devel
@@ -19,6 +22,7 @@
 BuildRequires: gettext
 BuildRequires: gnome-doc-utils
 BuildRequires: intltool
+BuildRequires: Canna-devel
 
 Requires(post):   GConf2
 Requires(post):   scrollkeeper >= 0.1.4
@@ -31,10 +35,11 @@
  
 %prep
 %setup -q
+%patch0 -p1 -b .malloc
 
 %build
 
-%configure --disable-scrollkeeper
+%configure --disable-scrollkeeper --enable-japanese --enable-chinese
 
 make
 
@@ -107,6 +112,10 @@
 %{_sysconfdir}/gconf/schemas/dasher.schemas
 
 %changelog
+* Fri Apr 25 2008 Matthias Clasen <mclasen at redhat.com> - 4.9.0-1
+- Update to 4.9.0
+- 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dasher/F-9/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	7 Apr 2008 23:24:53 -0000	1.33
+++ sources	6 May 2008 02:21:48 -0000	1.34
@@ -1 +1 @@
-f97dfd3c54f6d6c5f2873d4f82cb33c4  dasher-4.7.3.tar.bz2
+f6f024878f258a9506e62cf717446437  dasher-4.9.0.tar.bz2