rpms/stardict/F-7 stardict-3.0.0-espeak.patch, NONE, 1.1 stardict.spec, 1.34, 1.35

[Hu Zheng (zhu)]

Author: zhu

Update of /cvs/pkgs/rpms/stardict/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14318

Modified Files:
	stardict.spec 
Added Files:
	stardict-3.0.0-espeak.patch 
Log Message:
3.0.0-3

stardict-3.0.0-espeak.patch:

--- NEW FILE stardict-3.0.0-espeak.patch ---
diff -ru stardict-3.0.0.orig/src/mainwin.cpp stardict-3.0.0/src/mainwin.cpp
--- stardict-3.0.0.orig/src/mainwin.cpp	2007-08-10 13:06:06.000000000 +0800
+++ stardict-3.0.0/src/mainwin.cpp	2007-08-23 17:04:57.000000000 +0800
@@ -2663,9 +2663,6 @@
 	oTextWin.Create(vbox1);
 	gtk_paned_pack2(GTK_PANED(hpaned), vbox1, TRUE, FALSE);
 
-	int pos=conf->get_int_at("main_window/hpaned_pos");
-	gtk_paned_set_position(GTK_PANED(hpaned), pos);
-
 	oTransWin.Create(notebook);
 }
 
diff -ru stardict-3.0.0.orig/src/stardict.cpp stardict-3.0.0/src/stardict.cpp
--- stardict-3.0.0.orig/src/stardict.cpp	2007-08-10 12:57:58.000000000 +0800
+++ stardict-3.0.0/src/stardict.cpp	2007-08-23 17:05:33.000000000 +0800
@@ -362,6 +362,8 @@
 		gtk_widget_realize(window);
 		gdk_notify_startup_complete();
 	}
+	int pos=conf->get_int_at("main_window/hpaned_pos");
+	gtk_paned_set_position(GTK_PANED(oMidWin.hpaned), pos);
 
 	if (oLibs.has_dict() || conf->get_bool_at("network/enable_netdict")) {
 		if (queryword) {
diff -ru stardict-3.0.0.orig/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp stardict-3.0.0/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp
--- stardict-3.0.0.orig/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp	2007-07-10 15:16:15.000000000 +0800
+++ stardict-3.0.0/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp	2007-08-23 11:09:02.000000000 +0800
@@ -86,7 +86,7 @@
 
 bool stardict_tts_plugin_init(StarDictTtsPlugInObject *obj)
 {
-	espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 0, NULL);
+	espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 0, NULL, 0);
 	std::string res = get_cfg_filename();
 	if (!g_file_test(res.c_str(), G_FILE_TEST_EXISTS)) {
 		g_file_set_contents(res.c_str(), "[espeak]\nvoice=\n", -1, NULL);


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/F-7/stardict.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- stardict.spec	23 Aug 2007 02:37:59 -0000	1.34
+++ stardict.spec	27 Aug 2007 02:38:46 -0000	1.35
@@ -5,12 +5,13 @@
 Name:		%{name}
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:	%{version}
-Release:	2%{?dist}
+Release:	3%{?dist}
 Group: 		Applications/System
 License: 	GPL
 URL: 		http://stardict.sourceforge.net
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		stardict-3.0.0-floatwin.patch
+Patch1:		stardict-3.0.0-espeak.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: libgnome >= 2.2.0
@@ -41,6 +42,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .floatwin
+%patch1 -p1 -b .espeak
 
 %build
 
@@ -80,8 +82,8 @@
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
-* Thu Aug 23 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-2
-- Add floatwin patch.
+* Thu Aug 23 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-3
+- Add floatwin and espeak patch.
 
 * Mon Aug 13 2007 Hu Zheng <zhu at redhat.com> - 3.0.0-1
 - Update to upstream.