Fix building with >=glib-2.31; thanks to biohazrd for reporting in bug #401437 comment #1.

Package-Manager: portage-2.2.0_alpha99/cvs/Linux x86_64

4 files changed, 351 insertions, 11 deletions

diff --git a/app-accessibility/gnome-speech/ChangeLog b/app-accessibility/gnome-speech/ChangeLog
index 64b897817975..493b9976ce33 100644
--- a/app-accessibility/gnome-speech/ChangeLog
+++ b/app-accessibility/gnome-speech/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/gnome-speech
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/ChangeLog,v 1.151 2011/10/23 16:49:03 armin76 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/ChangeLog,v 1.152 2012/04/07 21:30:37 tetromino Exp $
+
+  07 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-speech-0.4.25-r1.ebuild, +files/gnome-speech-0.4.25-glib-2.31.patch:
+  Fix building with >=glib-2.31; thanks to biohazrd for reporting in bug
+  #401437 comment #1.
 
   23 Oct 2011; Raúl Porcel <armin76@gentoo.org> gnome-speech-0.4.25-r1.ebuild:
   alpha stable
diff --git a/app-accessibility/gnome-speech/Manifest b/app-accessibility/gnome-speech/Manifest
index 3c6d55b42406..b4af367a6035 100644
--- a/app-accessibility/gnome-speech/Manifest
+++ b/app-accessibility/gnome-speech/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gnome-speech-0.4.25-disable-java.patch 704 RMD160 f695949a46a9895a28ce1d7b5e4c6e4eb5730c74 SHA1 a0936117f2b20a3534f7b72162b28a8b0fa097ab SHA256 99b56d68c907c5e2fb8d8b49584ad247d15efa9ba0a4a39913310cfffee64669
+AUX gnome-speech-0.4.25-glib-2.31.patch 13800 RMD160 4d8f21b5b797c125b7a33c6ecbe0f5c7c9866f90 SHA1 a340e4c77abb787bd6f5697fe7e3a7e296c94dc0 SHA256 21234e71b668ffcbc09dc0e6806df230e90f71bb673fa99c443721878af1ef68
 DIST gnome-speech-0.4.25.tar.bz2 336706 RMD160 305f0e820ce77039776a1c3d3fa259d4f628b88e SHA1 c229af1583c522212e067990eafaf6a58df42966 SHA256 1c0a38b30f58a7cb392ed2c46790045d1e2a7426fd9daed8bb1918cbdb95fad2
-EBUILD gnome-speech-0.4.25-r1.ebuild 1332 RMD160 00c8a3131c06f68b6ce49cc0e7cbbd0a0afdf135 SHA1 c5328acc378de3d5509b7a92e4d200558ae12e76 SHA256 dc79009772fb60a7ce4857daeae9b995e42c7e78a68ebfbcb6481b02812deb4f
+EBUILD gnome-speech-0.4.25-r1.ebuild 1377 RMD160 e7251a2ee28ab1a6e7ac2cfffca4189074609738 SHA1 1eed2af030403223ef499e4ac1a985761688a9d8 SHA256 af7427d202cb1e83235722453191ccf2a2f09de17862cc84ed7ef438661bf528
 EBUILD gnome-speech-0.4.25.ebuild 2127 RMD160 a71cb36c3d361df4d696bc7049ecb30a84f7d579 SHA1 9fa689d40c3240ece9983cf4bc8b8dcfd7bd4318 SHA256 fd550d45cb45cdadb968e75f7b3ac0d2da641ca11a27041d5b7be83e9db6c87a
-MISC ChangeLog 22057 RMD160 627ef8c931a99afa632b907fb4cbaa112d51ff5c SHA1 a6f9e803e7d7f3c622a1c552e900da09b4aa4ef0 SHA256 1f62bb0c9dd34786820d1e96b0c946e6258a74421acf4e128a8128069e71dd62
+MISC ChangeLog 22291 RMD160 7ae788b9e8cd078021c219af1d87bc3e05afcbc4 SHA1 e7bd1e5c5c115c7fe807e6c7e6e2ca0009a8a67a SHA256 500dc6a90773ee3efc5034dad70839cc2e7ef03d9722df04a5ddf3fcadb9b74f
 MISC metadata.xml 436 RMD160 c34b9639afc771b6996afcc45e5cd84cb05ce6a4 SHA1 d4f19b6deaa873b709f853b1b2784488bcc43703 SHA256 21ab4cf12e9c0716576f8b2291497df573100c6734dd342598e872e408f4db42
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk6kRYUACgkQuQc30/atMkAgpACfZO8h8fBwIi03xzzaamD3CPhE
-ZuwAn0EYj3ZQn18dKrN2vqkygpD9nO64
-=hrYk
+iF4EAREIAAYFAk+AsgIACgkQdjK8w9WeBnAzKgEAqhXslRlv72XgRbJhhNk7+WJq
+s/93Z+PLLnx/7MjPJikA/1YVUQcNzPIDPvJX/WHPTlluGWmqEPK+OxhjEB/eF+AM
+=od0/
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/gnome-speech/files/gnome-speech-0.4.25-glib-2.31.patch b/app-accessibility/gnome-speech/files/gnome-speech-0.4.25-glib-2.31.patch
new file mode 100644
index 000000000000..e1d260a090ee
--- /dev/null
+++ b/app-accessibility/gnome-speech/files/gnome-speech-0.4.25-glib-2.31.patch
@@ -0,0 +1,333 @@
+Description: Fix build failure with glib 2.32
+ where including individual glib headers is no longer allowed.
+Author: Michael Biebl <biebl@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"
diff --git a/app-accessibility/gnome-speech/gnome-speech-0.4.25-r1.ebuild b/app-accessibility/gnome-speech/gnome-speech-0.4.25-r1.ebuild
index 9c3c50d96c40..7c1bf70d3f10 100644
--- a/app-accessibility/gnome-speech/gnome-speech-0.4.25-r1.ebuild
+++ b/app-accessibility/gnome-speech/gnome-speech-0.4.25-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/gnome-speech-0.4.25-r1.ebuild,v 1.7 2011/10/23 16:49:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-speech/gnome-speech-0.4.25-r1.ebuild,v 1.8 2012/04/07 21:30:37 tetromino Exp $
 
 EAPI="4"
 GNOME_TARBALL_SUFFIX="bz2"
@@ -42,6 +42,7 @@ src_prepare() {
 	gnome2_src_prepare
 
 	epatch "${FILESDIR}/${P}-disable-java.patch"
+	epatch "${FILESDIR}/${P}-glib-2.31.patch"
 
 	sed -i \
 		-e 's:\(GNOME_SPEECH_JAR_DIR=\).*:\1"/usr/share/java-access-bridge/lib/":' \