r13194 - in /desktop/unstable/dasher/debian: changelog patches/02_speech-build.patch rules

[rfrancoise at users.alioth.debian.org]

Author: rfrancoise
Date: Fri Oct 19 11:56:41 2007
New Revision: 13194

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13194
Log:
* debian/patches/02_speech-build.patch: New patch by Ed Catmur, fixes
  build with --enable-speech.

Added:
    desktop/unstable/dasher/debian/patches/02_speech-build.patch
Modified:
    desktop/unstable/dasher/debian/changelog
    desktop/unstable/dasher/debian/rules

Modified: desktop/unstable/dasher/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/dasher/debian/changelog?rev=13194&op=diff
==============================================================================
--- desktop/unstable/dasher/debian/changelog (original)
+++ desktop/unstable/dasher/debian/changelog Fri Oct 19 11:56:41 2007
@@ -2,16 +2,17 @@
 
   [ Romain Francoise ]
   * New upstream release.
-  * debian/rules: Disable speech support as it's currently broken upstream.
   * debian/dasher.menu: Update for new menu policy (closes: #445041).
   * debian/patches/01_missing-includes.patch: Resync with new upstream.
+  * debian/patches/02_speech-build.patch: New patch by Ed Catmur, fixes
+    build with --enable-speech.
 
   [ Alan Baghumian ]
   * Updated debian/control*:
     - Bump gnome-doc-utils build-dep to 0.3.2
     - Changed libgnome-speech3-dev build dep to libgnome-speech-dev
 
- -- Romain Francoise <rfrancoise at debian.org>  Fri, 19 Oct 2007 13:32:34 +0200
+ -- Romain Francoise <rfrancoise at debian.org>  Fri, 19 Oct 2007 13:55:35 +0200
 
 dasher (4.4.2-2) unstable; urgency=low
 

Added: desktop/unstable/dasher/debian/patches/02_speech-build.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/dasher/debian/patches/02_speech-build.patch?rev=13194&op=file
==============================================================================
--- desktop/unstable/dasher/debian/patches/02_speech-build.patch (added)
+++ desktop/unstable/dasher/debian/patches/02_speech-build.patch Fri Oct 19 11:56:41 2007
@@ -1,0 +1,45 @@
+--- Src/Gtk2/dasher_action_speech.cpp	2007/09/25 22:31:10	1.1
++++ Src/Gtk2/dasher_action_speech.cpp	2007/09/25 22:33:16
+@@ -28,8 +28,8 @@ typedef struct _DasherActionSpeechPrivat
+ 
+ G_DEFINE_TYPE(DasherActionSpeech, dasher_action_speech, TYPE_DASHER_ACTION);
+ 
+-static gboolean dasher_action_speech_execute(DasherAction *pSelf, DasherEditorInternal *pEditor, int iIdx);
+-static gboolean dasher_action_speech_preview(DasherAction *pSelf, DasherEditorInternal *pEditor);
++static gboolean dasher_action_speech_execute(DasherAction *pSelf, DasherEditor *pEditor, int iIdx);
++static gboolean dasher_action_speech_preview(DasherAction *pSelf, DasherEditor *pEditor);
+ static const gchar *dasher_action_speech_get_name(DasherAction *pSelf);
+ static int dasher_action_speech_get_sub_count(DasherAction *pSelf);
+ static const gchar *dasher_action_speech_get_sub_name(DasherAction *pSelf, int iIdx);
+@@ -66,17 +66,17 @@ dasher_action_speech_new() {
+ }
+ 
+ static gboolean 
+-dasher_action_speech_execute(DasherAction *pSelf, DasherEditorInternal *pEditor, int iIdx) {
++dasher_action_speech_execute(DasherAction *pSelf, DasherEditor *pEditor, int iIdx) {
+   DasherActionSpeechPrivate *pDasherActionSpeechPrivate = DASHER_ACTION_SPEECH_GET_PRIVATE(pSelf);
+ 
+   const char *szData;
+ 
+   switch(iIdx) {
+   case 0:
+-    szData = dasher_editor_internal_get_all_text(pEditor);
++    szData = dasher_editor_get_all_text(pEditor);
+     break;
+   case 1:
+-    szData = dasher_editor_internal_get_new_text(pEditor);
++    szData = dasher_editor_get_new_text(pEditor);
+     break;
+   case 2:
+     szData = pDasherActionSpeechPrivate->szLast;
+@@ -107,8 +107,8 @@ dasher_action_speech_execute(DasherActio
+ }
+ 
+ static gboolean 
+-dasher_action_speech_preview(DasherAction *pSelf, DasherEditorInternal *pEditor) {
+-  const gchar *szData = dasher_editor_internal_get_all_text(pEditor);
++dasher_action_speech_preview(DasherAction *pSelf, DasherEditor *pEditor) {
++  const gchar *szData = dasher_editor_get_all_text(pEditor);
+ 
+   if(!szData)
+     return false;

Modified: desktop/unstable/dasher/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/dasher/debian/rules?rev=13194&op=diff
==============================================================================
--- desktop/unstable/dasher/debian/rules (original)
+++ desktop/unstable/dasher/debian/rules Fri Oct 19 11:56:41 2007
@@ -9,5 +9,6 @@
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
+	--enable-speech \
 	--without-cairo \
 	--enable-joystick