glib2 build fixes for gnome-speech-espeak.

26 files changed, 405 insertions, 1 deletions

diff --git a/audio/gnome-speech/distinfo b/audio/gnome-speech/distinfo
index 6ddd6937380..20e970f1a14 100644
--- a/audio/gnome-speech/distinfo
+++ b/audio/gnome-speech/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2009/02/24 15:04:15 wiz Exp $
+$NetBSD: distinfo,v 1.30 2012/05/06 19:49:36 dholland Exp $
 
 SHA1 (gnome-speech-0.4.25.tar.bz2) = c229af1583c522212e067990eafaf6a58df42966
 RMD160 (gnome-speech-0.4.25.tar.bz2) = 305f0e820ce77039776a1c3d3fa259d4f628b88e
@@ -6,3 +6,28 @@ Size (gnome-speech-0.4.25.tar.bz2) = 336706 bytes
 SHA1 (patch-aa) = d858b42547ff02b1ee47bfaee83ffc5230d4df31
 SHA1 (patch-ab) = 2a0212e0dab613371db44c278f96d88acd1f5b1c
 SHA1 (patch-ac) = 44c38746c51fc6dbf3e086532ed05f1b0c0c158c
+SHA1 (patch-drivers_dectalk_dectalkspeaker_c) = 82c3af75f2f8bd59a0118c4bc695d4cebbda5172
+SHA1 (patch-drivers_dectalk_dectalkspeaker_h) = 626662c439caf1d531138515c8af272a5472b1af
+SHA1 (patch-drivers_dectalk_dectalksynthesisdriver_c) = 638b94061077bc6b57b95c2d218a2f6463ee4e88
+SHA1 (patch-drivers_dectalk_dectalksynthesisdriver_h) = 671bc87a7145e78445d7e2fa9ff8ac1bc6b034ae
+SHA1 (patch-drivers_eloquence_eloquencespeaker_c) = 30437763bace4be2be5820a62067995e124b9a5d
+SHA1 (patch-drivers_eloquence_eloquencespeaker_h) = 6ec99b265ae453a3892db1b80570efb22a9617ad
+SHA1 (patch-drivers_eloquence_eloquencesynthesisdriver_c) = 3d8e6724a3d6d12a9438afa2ad703bb850ae7b8c
+SHA1 (patch-drivers_espeak_espeakspeaker_c) = cbb558528f2c17379480ad87464f995264bf8bce
+SHA1 (patch-drivers_espeak_espeakspeaker_h) = 5f2607762f4033677b95be3a28ee971de23e4e0c
+SHA1 (patch-drivers_espeak_espeaksynthesisdriver_c) = 9ec8b44e20c7255d4dd6fc7a9ebd724abdde1cdc
+SHA1 (patch-drivers_espeak_espeaksynthesisdriver_h) = f83955a1f5bd90e31340076858695309734daeb1
+SHA1 (patch-drivers_loquendo_loquendospeaker_c) = d0667787b00f8d1c23031de3ef4ec0bda4a893cb
+SHA1 (patch-drivers_loquendo_loquendospeaker_h) = ed42be11f999117c42c3fe60ad6f35230b77bdb5
+SHA1 (patch-drivers_loquendo_loquendosynthesisdriver_c) = 58465a7d4be2faf4d663802996324b69c2448dda
+SHA1 (patch-drivers_loquendo_loquendosynthesisdriver_h) = 31cf625fb1e3e4cfba1eb8130abbc6645ff29232
+SHA1 (patch-drivers_swift_swiftspeaker_c) = 2b35afdb12362a6377bbb017de3fb143959f70eb
+SHA1 (patch-drivers_swift_swiftspeaker_h) = e8dafc3b34a156ec2b4aadffb5fd39a49d87c45c
+SHA1 (patch-drivers_swift_swiftsynthesisdriver_c) = 78287b3adac07f80ac2118257c05dfb732f1c7db
+SHA1 (patch-drivers_theta_thetaspeaker_c) = 9d7876afec5b6c0e6950914b26c1a865fd617191
+SHA1 (patch-drivers_theta_thetaspeaker_h) = a240f76d9e69809df0103a8aed50deab38f085b5
+SHA1 (patch-drivers_theta_thetasynthesisdriver_c) = 77f2a9710aa501b999de101430797d90972432fc
+SHA1 (patch-drivers_viavoice_viavoicespeaker_c) = fc1183dd7b3e6b44fcb8d7cf1eb070391811456a
+SHA1 (patch-drivers_viavoice_viavoicespeaker_h) = aef307b3e2a95b00e15c17278136622f5ea5c528
+SHA1 (patch-drivers_viavoice_viavoicesynthesisdriver_c) = b8b87e6ac964b43887dfab579d43c773700a585e
+SHA1 (patch-drivers_viavoice_viavoicesynthesisdriver_h) = a836015f8b3f7df41e2b76f7aa3b99f54f8996d4
diff --git a/audio/gnome-speech/patches/patch-drivers_dectalk_dectalkspeaker_c b/audio/gnome-speech/patches/patch-drivers_dectalk_dectalkspeaker_c
new file mode 100644
index 00000000000..6995f83d371
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_dectalk_dectalkspeaker_c
@@ -0,0 +1,16 @@
+$NetBSD: patch-drivers_dectalk_dectalkspeaker_c,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/dectalk/dectalkspeaker.c~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/dectalk/dectalkspeaker.c
+@@ -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"
diff --git a/audio/gnome-speech/patches/patch-drivers_dectalk_dectalkspeaker_h b/audio/gnome-speech/patches/patch-drivers_dectalk_dectalkspeaker_h
new file mode 100644
index 00000000000..4e876ed1722
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_dectalk_dectalkspeaker_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_dectalk_dectalkspeaker_h,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/dectalk/dectalkspeaker.h~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/dectalk/dectalkspeaker.h
+@@ -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())
diff --git a/audio/gnome-speech/patches/patch-drivers_dectalk_dectalksynthesisdriver_c b/audio/gnome-speech/patches/patch-drivers_dectalk_dectalksynthesisdriver_c
new file mode 100644
index 00000000000..57bd1e4917d
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_dectalk_dectalksynthesisdriver_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_dectalk_dectalksynthesisdriver_c,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/dectalk/dectalksynthesisdriver.c~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/dectalk/dectalksynthesisdriver.c
+@@ -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>
diff --git a/audio/gnome-speech/patches/patch-drivers_dectalk_dectalksynthesisdriver_h b/audio/gnome-speech/patches/patch-drivers_dectalk_dectalksynthesisdriver_h
new file mode 100644
index 00000000000..6849df6c56c
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_dectalk_dectalksynthesisdriver_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_dectalk_dectalksynthesisdriver_h,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/dectalk/dectalksynthesisdriver.h~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/dectalk/dectalksynthesisdriver.h
+@@ -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>
diff --git a/audio/gnome-speech/patches/patch-drivers_eloquence_eloquencespeaker_c b/audio/gnome-speech/patches/patch-drivers_eloquence_eloquencespeaker_c
new file mode 100644
index 00000000000..99e9bda3239
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_eloquence_eloquencespeaker_c
@@ -0,0 +1,16 @@
+$NetBSD: patch-drivers_eloquence_eloquencespeaker_c,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/eloquence/eloquencespeaker.c~	2009-02-08 16:14:55.000000000 +0000
++++ drivers/eloquence/eloquencespeaker.c
+@@ -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"
+  
diff --git a/audio/gnome-speech/patches/patch-drivers_eloquence_eloquencespeaker_h b/audio/gnome-speech/patches/patch-drivers_eloquence_eloquencespeaker_h
new file mode 100644
index 00000000000..9881390d012
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_eloquence_eloquencespeaker_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_eloquence_eloquencespeaker_h,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/eloquence/eloquencespeaker.h~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/eloquence/eloquencespeaker.h
+@@ -34,7 +34,7 @@ extern "C" {
+ #endif /* __cplusplus */
+ 
+ #include <bonobo/bonobo-object.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <eci.h>
+ #include <gnome-speech/gnome-speech.h>
+ 
diff --git a/audio/gnome-speech/patches/patch-drivers_eloquence_eloquencesynthesisdriver_c b/audio/gnome-speech/patches/patch-drivers_eloquence_eloquencesynthesisdriver_c
new file mode 100644
index 00000000000..7e0a2901a20
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_eloquence_eloquencesynthesisdriver_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_eloquence_eloquencesynthesisdriver_c,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/eloquence/eloquencesynthesisdriver.c~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/eloquence/eloquencesynthesisdriver.c
+@@ -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"
diff --git a/audio/gnome-speech/patches/patch-drivers_espeak_espeakspeaker_c b/audio/gnome-speech/patches/patch-drivers_espeak_espeakspeaker_c
new file mode 100644
index 00000000000..da92ab30ae4
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_espeak_espeakspeaker_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_espeak_espeakspeaker_c,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/espeak/espeakspeaker.c~	2009-02-15 17:24:06.000000000 +0000
++++ drivers/espeak/espeakspeaker.c
+@@ -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"
diff --git a/audio/gnome-speech/patches/patch-drivers_espeak_espeakspeaker_h b/audio/gnome-speech/patches/patch-drivers_espeak_espeakspeaker_h
new file mode 100644
index 00000000000..7748d37b6c2
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_espeak_espeakspeaker_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_espeak_espeakspeaker_h,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/espeak/espeakspeaker.h~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/espeak/espeakspeaker.h
+@@ -34,7 +34,7 @@ extern "C" {
+ #endif /* __cplusplus */
+ 
+ #include <bonobo/bonobo-object.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <speak_lib.h>
+ #include <gnome-speech/gnome-speech.h>
+ 
diff --git a/audio/gnome-speech/patches/patch-drivers_espeak_espeaksynthesisdriver_c b/audio/gnome-speech/patches/patch-drivers_espeak_espeaksynthesisdriver_c
new file mode 100644
index 00000000000..d9017154c12
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_espeak_espeaksynthesisdriver_c
@@ -0,0 +1,14 @@
+$NetBSD: patch-drivers_espeak_espeaksynthesisdriver_c,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/espeak/espeaksynthesisdriver.c~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/espeak/espeaksynthesisdriver.c
+@@ -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"
diff --git a/audio/gnome-speech/patches/patch-drivers_espeak_espeaksynthesisdriver_h b/audio/gnome-speech/patches/patch-drivers_espeak_espeaksynthesisdriver_h
new file mode 100644
index 00000000000..43bdda207fe
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_espeak_espeaksynthesisdriver_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_espeak_espeaksynthesisdriver_h,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/espeak/espeaksynthesisdriver.h~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/espeak/espeaksynthesisdriver.h
+@@ -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"
diff --git a/audio/gnome-speech/patches/patch-drivers_loquendo_loquendospeaker_c b/audio/gnome-speech/patches/patch-drivers_loquendo_loquendospeaker_c
new file mode 100644
index 00000000000..eeac1e1dc46
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_loquendo_loquendospeaker_c
@@ -0,0 +1,16 @@
+$NetBSD: patch-drivers_loquendo_loquendospeaker_c,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/loquendo/loquendospeaker.c~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/loquendo/loquendospeaker.c
+@@ -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"
diff --git a/audio/gnome-speech/patches/patch-drivers_loquendo_loquendospeaker_h b/audio/gnome-speech/patches/patch-drivers_loquendo_loquendospeaker_h
new file mode 100644
index 00000000000..4a91cb14fbe
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_loquendo_loquendospeaker_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_loquendo_loquendospeaker_h,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/loquendo/loquendospeaker.h~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/loquendo/loquendospeaker.h
+@@ -34,7 +34,7 @@ extern "C" {
+ #endif /* __cplusplus */
+ 
+ #include <bonobo/bonobo-object.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <loqtts.h>
+ #include <gnome-speech/gnome-speech.h>
+ 
diff --git a/audio/gnome-speech/patches/patch-drivers_loquendo_loquendosynthesisdriver_c b/audio/gnome-speech/patches/patch-drivers_loquendo_loquendosynthesisdriver_c
new file mode 100644
index 00000000000..44af98ab588
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_loquendo_loquendosynthesisdriver_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_loquendo_loquendosynthesisdriver_c,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/loquendo/loquendosynthesisdriver.c~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/loquendo/loquendosynthesisdriver.c
+@@ -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"
diff --git a/audio/gnome-speech/patches/patch-drivers_loquendo_loquendosynthesisdriver_h b/audio/gnome-speech/patches/patch-drivers_loquendo_loquendosynthesisdriver_h
new file mode 100644
index 00000000000..966416b3626
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_loquendo_loquendosynthesisdriver_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_loquendo_loquendosynthesisdriver_h,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/loquendo/loquendosynthesisdriver.h~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/loquendo/loquendosynthesisdriver.h
+@@ -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"
+ 
diff --git a/audio/gnome-speech/patches/patch-drivers_swift_swiftspeaker_c b/audio/gnome-speech/patches/patch-drivers_swift_swiftspeaker_c
new file mode 100644
index 00000000000..ecd9d72d8c7
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_swift_swiftspeaker_c
@@ -0,0 +1,16 @@
+$NetBSD: patch-drivers_swift_swiftspeaker_c,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/swift/swiftspeaker.c~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/swift/swiftspeaker.c
+@@ -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"
diff --git a/audio/gnome-speech/patches/patch-drivers_swift_swiftspeaker_h b/audio/gnome-speech/patches/patch-drivers_swift_swiftspeaker_h
new file mode 100644
index 00000000000..90e59ef96ec
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_swift_swiftspeaker_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_swift_swiftspeaker_h,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/swift/swiftspeaker.h~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/swift/swiftspeaker.h
+@@ -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>
+ 
diff --git a/audio/gnome-speech/patches/patch-drivers_swift_swiftsynthesisdriver_c b/audio/gnome-speech/patches/patch-drivers_swift_swiftsynthesisdriver_c
new file mode 100644
index 00000000000..6e26d7b88fb
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_swift_swiftsynthesisdriver_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_swift_swiftsynthesisdriver_c,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/swift/swiftsynthesisdriver.c~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/swift/swiftsynthesisdriver.c
+@@ -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"
diff --git a/audio/gnome-speech/patches/patch-drivers_theta_thetaspeaker_c b/audio/gnome-speech/patches/patch-drivers_theta_thetaspeaker_c
new file mode 100644
index 00000000000..f203c5380ce
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_theta_thetaspeaker_c
@@ -0,0 +1,16 @@
+$NetBSD: patch-drivers_theta_thetaspeaker_c,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/theta/thetaspeaker.c~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/theta/thetaspeaker.c
+@@ -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"
diff --git a/audio/gnome-speech/patches/patch-drivers_theta_thetaspeaker_h b/audio/gnome-speech/patches/patch-drivers_theta_thetaspeaker_h
new file mode 100644
index 00000000000..732c429be0b
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_theta_thetaspeaker_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_theta_thetaspeaker_h,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/theta/thetaspeaker.h~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/theta/thetaspeaker.h
+@@ -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>
+ 
diff --git a/audio/gnome-speech/patches/patch-drivers_theta_thetasynthesisdriver_c b/audio/gnome-speech/patches/patch-drivers_theta_thetasynthesisdriver_c
new file mode 100644
index 00000000000..87d04806b31
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_theta_thetasynthesisdriver_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_theta_thetasynthesisdriver_c,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/theta/thetasynthesisdriver.c~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/theta/thetasynthesisdriver.c
+@@ -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"
diff --git a/audio/gnome-speech/patches/patch-drivers_viavoice_viavoicespeaker_c b/audio/gnome-speech/patches/patch-drivers_viavoice_viavoicespeaker_c
new file mode 100644
index 00000000000..d52f15c9442
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_viavoice_viavoicespeaker_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_viavoice_viavoicespeaker_c,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/viavoice/viavoicespeaker.c~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/viavoice/viavoicespeaker.c
+@@ -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"
diff --git a/audio/gnome-speech/patches/patch-drivers_viavoice_viavoicespeaker_h b/audio/gnome-speech/patches/patch-drivers_viavoice_viavoicespeaker_h
new file mode 100644
index 00000000000..c2d6563aa9c
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_viavoice_viavoicespeaker_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_viavoice_viavoicespeaker_h,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/viavoice/viavoicespeaker.h~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/viavoice/viavoicespeaker.h
+@@ -34,7 +34,7 @@ extern "C" {
+ #endif /* __cplusplus */
+ 
+ #include <bonobo/bonobo-object.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <eci.h>
+ #include <gnome-speech/gnome-speech.h>
+ 
diff --git a/audio/gnome-speech/patches/patch-drivers_viavoice_viavoicesynthesisdriver_c b/audio/gnome-speech/patches/patch-drivers_viavoice_viavoicesynthesisdriver_c
new file mode 100644
index 00000000000..1aec9ded9c6
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_viavoice_viavoicesynthesisdriver_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_viavoice_viavoicesynthesisdriver_c,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/viavoice/viavoicesynthesisdriver.c~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/viavoice/viavoicesynthesisdriver.c
+@@ -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"
diff --git a/audio/gnome-speech/patches/patch-drivers_viavoice_viavoicesynthesisdriver_h b/audio/gnome-speech/patches/patch-drivers_viavoice_viavoicesynthesisdriver_h
new file mode 100644
index 00000000000..203617b7146
--- /dev/null
+++ b/audio/gnome-speech/patches/patch-drivers_viavoice_viavoicesynthesisdriver_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-drivers_viavoice_viavoicesynthesisdriver_h,v 1.1 2012/05/06 19:49:37 dholland Exp $
+
+Fix build with latest glib2.
+
+--- drivers/viavoice/viavoicesynthesisdriver.h~	2008-12-10 13:36:00.000000000 +0000
++++ drivers/viavoice/viavoicesynthesisdriver.h
+@@ -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"