r33522 - in /attic/gnome-speech/debian: changelog patches/02_glib-single-include.patch patches/series

Sun Mar 25 22:05:54 UTC 2012

Author: biebl
Date: Sun Mar 25 22:05:44 2012
New Revision: 33522

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33522
Log:
debian/patches/02_glib-single-include.patch: Fix build failure with
glib 2.32 where including individual glib headers is no longer allowed.
Closes: #665538

Added:
    attic/gnome-speech/debian/patches/02_glib-single-include.patch
    attic/gnome-speech/debian/patches/series
Modified:
    attic/gnome-speech/debian/changelog

Modified: attic/gnome-speech/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-speech/debian/changelog?rev=33522&op=diff
==============================================================================

--- attic/gnome-speech/debian/changelog [utf-8] (original)
+++ attic/gnome-speech/debian/changelog [utf-8] Sun Mar 25 22:05:44 2012
@@ -4,8 +4,11 @@
   * Re-enable uploaders.mk.
   * Switch to dpkg source format 3.0 (quilt).
   * Drop obsolete Conflicts.
-
- -- Michael Biebl <biebl at debian.org>  Sun, 25 Mar 2012 23:59:23 +0200
+  * debian/patches/02_glib-single-include.patch: Fix build failure with
+    glib 2.32 where including individual glib headers is no longer allowed.
+    Closes: #665538
+
+ -- Michael Biebl <biebl at debian.org>  Mon, 26 Mar 2012 00:04:25 +0200
 
 gnome-speech (1:0.4.25-4.1) unstable; urgency=low
 

Added: attic/gnome-speech/debian/patches/02_glib-single-include.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-speech/debian/patches/02_glib-single-include.patch?rev=33522&op=file
==============================================================================
--- attic/gnome-speech/debian/patches/02_glib-single-include.patch (added)
+++ attic/gnome-speech/debian/patches/02_glib-single-include.patch [utf-8] Sun Mar 25 22:05:44 2012
@@ -1,0 +1,333 @@
+Description: Fix build failure with glib 2.32
+ where including individual glib headers is no longer allowed.
+Author: Michael Biebl <biebl at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665538
+Index: gnome-speech-0.4.25/drivers/dectalk/dectalkspeaker.c
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/dectalk/dectalkspeaker.c	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/dectalk/dectalkspeaker.c	2012-03-26 00:00:26.094898631 +0200
+@@ -27,8 +27,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <libbonobo.h>
+-#include <glib/gmain.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include <dtk/ttsapi.h>
+ #include "dectalkspeaker.h"
+Index: gnome-speech-0.4.25/drivers/dectalk/dectalkspeaker.h
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/dectalk/dectalkspeaker.h	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/dectalk/dectalkspeaker.h	2012-03-26 00:00:26.230898631 +0200
+@@ -30,7 +30,7 @@
+ #define __DECTALK_SPEAKER_H_
+ 
+ #include <bonobo/bonobo-object.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <gnome-speech/gnome-speech.h>
+ 
+ #define DECTALK_SPEAKER_TYPE        (dectalk_speaker_get_type())
+Index: gnome-speech-0.4.25/drivers/dectalk/dectalksynthesisdriver.c
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/dectalk/dectalksynthesisdriver.c	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/dectalk/dectalksynthesisdriver.c	2012-03-26 00:00:26.014898624 +0200
+@@ -26,7 +26,7 @@
+ 
+ #include <string.h>
+ #include <libbonobo.h>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include "dectalksynthesisdriver.h"
+ #include <dtk/ttsapi.h>
+Index: gnome-speech-0.4.25/drivers/dectalk/dectalksynthesisdriver.h
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/dectalk/dectalksynthesisdriver.h	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/dectalk/dectalksynthesisdriver.h	2012-03-26 00:00:26.158898631 +0200
+@@ -28,7 +28,7 @@
+ #ifndef __DECTALK_SYNTHESIS_DRIVER_H_
+ #define __DECTALK_SYNTHESIS_DRIVER_H_
+ 
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <bonobo/bonobo-object.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include <dtk/ttsapi.h>
+Index: gnome-speech-0.4.25/drivers/eloquence/eloquencespeaker.c
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/eloquence/eloquencespeaker.c	2009-02-08 17:14:55.000000000 +0100
++++ gnome-speech-0.4.25/drivers/eloquence/eloquencespeaker.c	2012-03-26 00:00:27.542898672 +0200
+@@ -25,8 +25,7 @@
+ 
+ #include <unistd.h>
+ #include <libbonobo.h>
+-#include <glib/gmain.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include "eloquencespeaker.h"
+  
+Index: gnome-speech-0.4.25/drivers/eloquence/eloquencespeaker.h
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/eloquence/eloquencespeaker.h	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/eloquence/eloquencespeaker.h	2012-03-26 00:00:27.462898668 +0200
+@@ -34,7 +34,7 @@
+ #endif /* __cplusplus */
+ 
+ #include <bonobo/bonobo-object.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <eci.h>
+ #include <gnome-speech/gnome-speech.h>
+ 
+Index: gnome-speech-0.4.25/drivers/eloquence/eloquencesynthesisdriver.c
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/eloquence/eloquencesynthesisdriver.c	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/eloquence/eloquencesynthesisdriver.c	2012-03-26 00:00:27.566898672 +0200
+@@ -24,7 +24,7 @@
+  */
+ 
+ #include <libbonobo.h>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include "eloquencesynthesisdriver.h"
+ #include "eloquencespeaker.h"
+Index: gnome-speech-0.4.25/drivers/espeak/espeakspeaker.c
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/espeak/espeakspeaker.c	2009-02-15 18:24:06.000000000 +0100
++++ gnome-speech-0.4.25/drivers/espeak/espeakspeaker.c	2012-03-26 00:00:26.886898652 +0200
+@@ -26,7 +26,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <libbonobo.h>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include <speak_lib.h>
+ #include "espeaksynthesisdriver.h"
+Index: gnome-speech-0.4.25/drivers/espeak/espeakspeaker.h
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/espeak/espeakspeaker.h	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/espeak/espeakspeaker.h	2012-03-26 00:00:27.318898664 +0200
+@@ -34,7 +34,7 @@
+ #endif /* __cplusplus */
+ 
+ #include <bonobo/bonobo-object.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <speak_lib.h>
+ #include <gnome-speech/gnome-speech.h>
+ 
+Index: gnome-speech-0.4.25/drivers/espeak/espeaksynthesisdriver.c
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/espeak/espeaksynthesisdriver.c	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/espeak/espeaksynthesisdriver.c	2012-03-26 00:00:27.246898659 +0200
+@@ -28,7 +28,6 @@
+ #include <stdlib.h>
+ #include <libbonobo.h>
+ #include <glib.h>
+-#include <glib/gmain.h>
+ #include <speak_lib.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include "espeaksynthesisdriver.h"
+Index: gnome-speech-0.4.25/drivers/espeak/espeaksynthesisdriver.h
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/espeak/espeaksynthesisdriver.h	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/espeak/espeaksynthesisdriver.h	2012-03-26 00:00:27.390898668 +0200
+@@ -29,7 +29,7 @@
+ #define __ESPEAK_SYNTHESIS_DRIVER_H_
+ 
+ #include <bonobo/bonobo-object.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include <speak_lib.h>
+ #include "espeakspeaker.h"
+Index: gnome-speech-0.4.25/drivers/loquendo/loquendospeaker.c
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/loquendo/loquendospeaker.c	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/loquendo/loquendospeaker.c	2012-03-26 00:00:26.442898637 +0200
+@@ -27,8 +27,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <libbonobo.h>
+-#include <glib/gmain.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include <loqtts.h>
+ #include "loquendospeaker.h"
+Index: gnome-speech-0.4.25/drivers/loquendo/loquendospeaker.h
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/loquendo/loquendospeaker.h	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/loquendo/loquendospeaker.h	2012-03-26 00:00:26.366898638 +0200
+@@ -34,7 +34,7 @@
+ #endif /* __cplusplus */
+ 
+ #include <bonobo/bonobo-object.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <loqtts.h>
+ #include <gnome-speech/gnome-speech.h>
+ 
+Index: gnome-speech-0.4.25/drivers/loquendo/loquendosynthesisdriver.c
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/loquendo/loquendosynthesisdriver.c	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/loquendo/loquendosynthesisdriver.c	2012-03-26 00:00:26.494898640 +0200
+@@ -23,7 +23,7 @@
+  */
+ 
+ #include <libbonobo.h>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <loqtts.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include "loquendosynthesisdriver.h"
+Index: gnome-speech-0.4.25/drivers/loquendo/loquendosynthesisdriver.h
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/loquendo/loquendosynthesisdriver.h	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/loquendo/loquendosynthesisdriver.h	2012-03-26 00:00:26.298898635 +0200
+@@ -31,7 +31,7 @@
+ 
+ 
+ #include <bonobo/bonobo-object.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include "loquendospeaker.h"
+ 
+Index: gnome-speech-0.4.25/drivers/swift/swiftspeaker.c
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/swift/swiftspeaker.c	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/swift/swiftspeaker.c	2012-03-26 00:00:25.862898620 +0200
+@@ -28,8 +28,7 @@
+ #include <math.h>
+ #include <unistd.h>
+ #include <libbonobo.h>
+-#include <glib/gmain.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include <swift.h>
+ #include "swiftspeaker.h"
+Index: gnome-speech-0.4.25/drivers/swift/swiftspeaker.h
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/swift/swiftspeaker.h	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/swift/swiftspeaker.h	2012-03-26 00:00:25.930898624 +0200
+@@ -28,7 +28,7 @@
+ #define __SWIFT_SPEAKER_H_
+ 
+ #include <bonobo/bonobo-object.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include <swift.h>
+ 
+Index: gnome-speech-0.4.25/drivers/swift/swiftsynthesisdriver.c
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/swift/swiftsynthesisdriver.c	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/swift/swiftsynthesisdriver.c	2012-03-26 00:00:25.786898622 +0200
+@@ -28,7 +28,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <libbonobo.h>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include <swift.h>
+ #include "swiftsynthesisdriver.h"
+Index: gnome-speech-0.4.25/drivers/theta/thetaspeaker.c
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/theta/thetaspeaker.c	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/theta/thetaspeaker.c	2012-03-26 00:00:27.782898679 +0200
+@@ -28,8 +28,7 @@
+ #include <math.h>
+ #include <unistd.h>
+ #include <libbonobo.h>
+-#include <glib/gmain.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include <theta.h>
+ #include "thetaspeaker.h"
+Index: gnome-speech-0.4.25/drivers/theta/thetaspeaker.h
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/theta/thetaspeaker.h	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/theta/thetaspeaker.h	2012-03-26 00:00:27.622898671 +0200
+@@ -30,7 +30,7 @@
+ #define __THETA_SPEAKER_H_
+ 
+ #include <bonobo/bonobo-object.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include <theta.h>
+ 
+Index: gnome-speech-0.4.25/drivers/theta/thetasynthesisdriver.c
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/theta/thetasynthesisdriver.c	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/theta/thetasynthesisdriver.c	2012-03-26 00:00:27.706898675 +0200
+@@ -28,7 +28,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <libbonobo.h>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include <theta.h>
+ #include "thetasynthesisdriver.h"
+Index: gnome-speech-0.4.25/drivers/viavoice/viavoicespeaker.c
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/viavoice/viavoicespeaker.c	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/viavoice/viavoicespeaker.c	2012-03-26 00:00:26.734898649 +0200
+@@ -26,7 +26,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <libbonobo.h>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include "viavoicesynthesisdriver.h"
+ #include "viavoicespeaker.h"
+Index: gnome-speech-0.4.25/drivers/viavoice/viavoicespeaker.h
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/viavoice/viavoicespeaker.h	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/viavoice/viavoicespeaker.h	2012-03-26 00:00:26.578898644 +0200
+@@ -34,7 +34,7 @@
+ #endif /* __cplusplus */
+ 
+ #include <bonobo/bonobo-object.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <eci.h>
+ #include <gnome-speech/gnome-speech.h>
+ 
+Index: gnome-speech-0.4.25/drivers/viavoice/viavoicesynthesisdriver.c
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/viavoice/viavoicesynthesisdriver.c	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/viavoice/viavoicesynthesisdriver.c	2012-03-26 00:00:26.654898643 +0200
+@@ -24,7 +24,7 @@
+  */
+ 
+ #include <libbonobo.h>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include <string.h>
+ #include "viavoicesynthesisdriver.h"
+Index: gnome-speech-0.4.25/drivers/viavoice/viavoicesynthesisdriver.h
+===================================================================
+--- gnome-speech-0.4.25.orig/drivers/viavoice/viavoicesynthesisdriver.h	2008-12-10 14:36:00.000000000 +0100
++++ gnome-speech-0.4.25/drivers/viavoice/viavoicesynthesisdriver.h	2012-03-26 00:00:26.806898647 +0200
+@@ -30,7 +30,7 @@
+ #define __VIAVOICE_SYNTHESIS_DRIVER_H_
+ 
+ #include <bonobo/bonobo-object.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <gnome-speech/gnome-speech.h>
+ #include <eci.h>
+ #include "viavoicespeaker.h"

Added: attic/gnome-speech/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gnome-speech/debian/patches/series?rev=33522&op=file
==============================================================================
--- attic/gnome-speech/debian/patches/series (added)
+++ attic/gnome-speech/debian/patches/series [utf-8] Sun Mar 25 22:05:44 2012
@@ -1,0 +1,2 @@
+01_festival_eof.patch
+02_glib-single-include.patch


