Bug#447372: stardict: FTBFS: stardict_espeak.cpp:89: error: at this point in file

[Andrew Lee]

Lucas Nussbaum wrote:
> During a rebuild of all packages in sid, your package failed to build on i386.

Strange, I can build the package without problem on my i386 sid even
with pbuilder.

Looks like I accidently enabled espeak in last upload. I think I should
actually disable it in next upload. But it still worth a try with the
attached patch from upstream author.

Could you please apply that attached dpatch and test a again for me?

Cheers,

-Andrew

#! /bin/sh /usr/share/dpatch/dpatch-run
## 05_espeak.dpatch by  <[EMAIL PROTECTED]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad stardict-3.0.0~/src/mainwin.cpp stardict-3.0.0/src/mainwin.cpp
--- stardict-3.0.0~/src/mainwin.cpp     2007-09-04 02:42:10.000000000 +0800
+++ stardict-3.0.0/src/mainwin.cpp      2007-10-23 16:49:30.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 -urNad stardict-3.0.0~/src/stardict.cpp stardict-3.0.0/src/stardict.cpp
--- stardict-3.0.0~/src/stardict.cpp    2007-09-04 02:42:10.000000000 +0800
+++ stardict-3.0.0/src/stardict.cpp     2007-10-23 16:49:30.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 -urNad 
stardict-3.0.0~/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~/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp 
    2007-09-04 02:42:10.000000000 +0800
+++ 
stardict-3.0.0/stardict-plugins/stardict-espeak-tts-plugin/stardict_espeak.cpp  
    2007-10-23 16:49:30.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);