| 1 |
tetromino 12/04/07 21:30:37 |
| 2 |
|
| 3 |
Added: gnome-speech-0.4.25-glib-2.31.patch |
| 4 |
Log: |
| 5 |
Fix building with >=glib-2.31; thanks to biohazrd for reporting in bug #401437 comment #1. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha99/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-accessibility/gnome-speech/files/gnome-speech-0.4.25-glib-2.31.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/gnome-speech/files/gnome-speech-0.4.25-glib-2.31.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/gnome-speech/files/gnome-speech-0.4.25-glib-2.31.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gnome-speech-0.4.25-glib-2.31.patch |
| 16 |
=================================================================== |
| 17 |
Description: Fix build failure with glib 2.32 |
| 18 |
where including individual glib headers is no longer allowed. |
| 19 |
Author: Michael Biebl <biebl@××××××.org> |
| 20 |
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665538 |
| 21 |
Index: gnome-speech-0.4.25/drivers/dectalk/dectalkspeaker.c |
| 22 |
=================================================================== |
| 23 |
--- gnome-speech-0.4.25.orig/drivers/dectalk/dectalkspeaker.c 2008-12-10 14:36:00.000000000 +0100 |
| 24 |
+++ gnome-speech-0.4.25/drivers/dectalk/dectalkspeaker.c 2012-03-26 00:00:26.094898631 +0200 |
| 25 |
@@ -27,8 +27,7 @@ |
| 26 |
#include <string.h> |
| 27 |
#include <unistd.h> |
| 28 |
#include <libbonobo.h> |
| 29 |
-#include <glib/gmain.h> |
| 30 |
-#include <glib/gthread.h> |
| 31 |
+#include <glib.h> |
| 32 |
#include <gnome-speech/gnome-speech.h> |
| 33 |
#include <dtk/ttsapi.h> |
| 34 |
#include "dectalkspeaker.h" |
| 35 |
Index: gnome-speech-0.4.25/drivers/dectalk/dectalkspeaker.h |
| 36 |
=================================================================== |
| 37 |
--- gnome-speech-0.4.25.orig/drivers/dectalk/dectalkspeaker.h 2008-12-10 14:36:00.000000000 +0100 |
| 38 |
+++ gnome-speech-0.4.25/drivers/dectalk/dectalkspeaker.h 2012-03-26 00:00:26.230898631 +0200 |
| 39 |
@@ -30,7 +30,7 @@ |
| 40 |
#define __DECTALK_SPEAKER_H_ |
| 41 |
|
| 42 |
#include <bonobo/bonobo-object.h> |
| 43 |
-#include <glib/gthread.h> |
| 44 |
+#include <glib.h> |
| 45 |
#include <gnome-speech/gnome-speech.h> |
| 46 |
|
| 47 |
#define DECTALK_SPEAKER_TYPE (dectalk_speaker_get_type()) |
| 48 |
Index: gnome-speech-0.4.25/drivers/dectalk/dectalksynthesisdriver.c |
| 49 |
=================================================================== |
| 50 |
--- gnome-speech-0.4.25.orig/drivers/dectalk/dectalksynthesisdriver.c 2008-12-10 14:36:00.000000000 +0100 |
| 51 |
+++ gnome-speech-0.4.25/drivers/dectalk/dectalksynthesisdriver.c 2012-03-26 00:00:26.014898624 +0200 |
| 52 |
@@ -26,7 +26,7 @@ |
| 53 |
|
| 54 |
#include <string.h> |
| 55 |
#include <libbonobo.h> |
| 56 |
-#include <glib/gmain.h> |
| 57 |
+#include <glib.h> |
| 58 |
#include <gnome-speech/gnome-speech.h> |
| 59 |
#include "dectalksynthesisdriver.h" |
| 60 |
#include <dtk/ttsapi.h> |
| 61 |
Index: gnome-speech-0.4.25/drivers/dectalk/dectalksynthesisdriver.h |
| 62 |
=================================================================== |
| 63 |
--- gnome-speech-0.4.25.orig/drivers/dectalk/dectalksynthesisdriver.h 2008-12-10 14:36:00.000000000 +0100 |
| 64 |
+++ gnome-speech-0.4.25/drivers/dectalk/dectalksynthesisdriver.h 2012-03-26 00:00:26.158898631 +0200 |
| 65 |
@@ -28,7 +28,7 @@ |
| 66 |
#ifndef __DECTALK_SYNTHESIS_DRIVER_H_ |
| 67 |
#define __DECTALK_SYNTHESIS_DRIVER_H_ |
| 68 |
|
| 69 |
-#include <glib/gthread.h> |
| 70 |
+#include <glib.h> |
| 71 |
#include <bonobo/bonobo-object.h> |
| 72 |
#include <gnome-speech/gnome-speech.h> |
| 73 |
#include <dtk/ttsapi.h> |
| 74 |
Index: gnome-speech-0.4.25/drivers/eloquence/eloquencespeaker.c |
| 75 |
=================================================================== |
| 76 |
--- gnome-speech-0.4.25.orig/drivers/eloquence/eloquencespeaker.c 2009-02-08 17:14:55.000000000 +0100 |
| 77 |
+++ gnome-speech-0.4.25/drivers/eloquence/eloquencespeaker.c 2012-03-26 00:00:27.542898672 +0200 |
| 78 |
@@ -25,8 +25,7 @@ |
| 79 |
|
| 80 |
#include <unistd.h> |
| 81 |
#include <libbonobo.h> |
| 82 |
-#include <glib/gmain.h> |
| 83 |
-#include <glib/gthread.h> |
| 84 |
+#include <glib.h> |
| 85 |
#include <gnome-speech/gnome-speech.h> |
| 86 |
#include "eloquencespeaker.h" |
| 87 |
|
| 88 |
Index: gnome-speech-0.4.25/drivers/eloquence/eloquencespeaker.h |
| 89 |
=================================================================== |
| 90 |
--- gnome-speech-0.4.25.orig/drivers/eloquence/eloquencespeaker.h 2008-12-10 14:36:00.000000000 +0100 |
| 91 |
+++ gnome-speech-0.4.25/drivers/eloquence/eloquencespeaker.h 2012-03-26 00:00:27.462898668 +0200 |
| 92 |
@@ -34,7 +34,7 @@ |
| 93 |
#endif /* __cplusplus */ |
| 94 |
|
| 95 |
#include <bonobo/bonobo-object.h> |
| 96 |
-#include <glib/gthread.h> |
| 97 |
+#include <glib.h> |
| 98 |
#include <eci.h> |
| 99 |
#include <gnome-speech/gnome-speech.h> |
| 100 |
|
| 101 |
Index: gnome-speech-0.4.25/drivers/eloquence/eloquencesynthesisdriver.c |
| 102 |
=================================================================== |
| 103 |
--- gnome-speech-0.4.25.orig/drivers/eloquence/eloquencesynthesisdriver.c 2008-12-10 14:36:00.000000000 +0100 |
| 104 |
+++ gnome-speech-0.4.25/drivers/eloquence/eloquencesynthesisdriver.c 2012-03-26 00:00:27.566898672 +0200 |
| 105 |
@@ -24,7 +24,7 @@ |
| 106 |
*/ |
| 107 |
|
| 108 |
#include <libbonobo.h> |
| 109 |
-#include <glib/gmain.h> |
| 110 |
+#include <glib.h> |
| 111 |
#include <gnome-speech/gnome-speech.h> |
| 112 |
#include "eloquencesynthesisdriver.h" |
| 113 |
#include "eloquencespeaker.h" |
| 114 |
Index: gnome-speech-0.4.25/drivers/espeak/espeakspeaker.c |
| 115 |
=================================================================== |
| 116 |
--- gnome-speech-0.4.25.orig/drivers/espeak/espeakspeaker.c 2009-02-15 18:24:06.000000000 +0100 |
| 117 |
+++ gnome-speech-0.4.25/drivers/espeak/espeakspeaker.c 2012-03-26 00:00:26.886898652 +0200 |
| 118 |
@@ -26,7 +26,7 @@ |
| 119 |
#include <unistd.h> |
| 120 |
#include <string.h> |
| 121 |
#include <libbonobo.h> |
| 122 |
-#include <glib/gmain.h> |
| 123 |
+#include <glib.h> |
| 124 |
#include <gnome-speech/gnome-speech.h> |
| 125 |
#include <speak_lib.h> |
| 126 |
#include "espeaksynthesisdriver.h" |
| 127 |
Index: gnome-speech-0.4.25/drivers/espeak/espeakspeaker.h |
| 128 |
=================================================================== |
| 129 |
--- gnome-speech-0.4.25.orig/drivers/espeak/espeakspeaker.h 2008-12-10 14:36:00.000000000 +0100 |
| 130 |
+++ gnome-speech-0.4.25/drivers/espeak/espeakspeaker.h 2012-03-26 00:00:27.318898664 +0200 |
| 131 |
@@ -34,7 +34,7 @@ |
| 132 |
#endif /* __cplusplus */ |
| 133 |
|
| 134 |
#include <bonobo/bonobo-object.h> |
| 135 |
-#include <glib/gthread.h> |
| 136 |
+#include <glib.h> |
| 137 |
#include <speak_lib.h> |
| 138 |
#include <gnome-speech/gnome-speech.h> |
| 139 |
|
| 140 |
Index: gnome-speech-0.4.25/drivers/espeak/espeaksynthesisdriver.c |
| 141 |
=================================================================== |
| 142 |
--- gnome-speech-0.4.25.orig/drivers/espeak/espeaksynthesisdriver.c 2008-12-10 14:36:00.000000000 +0100 |
| 143 |
+++ gnome-speech-0.4.25/drivers/espeak/espeaksynthesisdriver.c 2012-03-26 00:00:27.246898659 +0200 |
| 144 |
@@ -28,7 +28,6 @@ |
| 145 |
#include <stdlib.h> |
| 146 |
#include <libbonobo.h> |
| 147 |
#include <glib.h> |
| 148 |
-#include <glib/gmain.h> |
| 149 |
#include <speak_lib.h> |
| 150 |
#include <gnome-speech/gnome-speech.h> |
| 151 |
#include "espeaksynthesisdriver.h" |
| 152 |
Index: gnome-speech-0.4.25/drivers/espeak/espeaksynthesisdriver.h |
| 153 |
=================================================================== |
| 154 |
--- gnome-speech-0.4.25.orig/drivers/espeak/espeaksynthesisdriver.h 2008-12-10 14:36:00.000000000 +0100 |
| 155 |
+++ gnome-speech-0.4.25/drivers/espeak/espeaksynthesisdriver.h 2012-03-26 00:00:27.390898668 +0200 |
| 156 |
@@ -29,7 +29,7 @@ |
| 157 |
#define __ESPEAK_SYNTHESIS_DRIVER_H_ |
| 158 |
|
| 159 |
#include <bonobo/bonobo-object.h> |
| 160 |
-#include <glib/gthread.h> |
| 161 |
+#include <glib.h> |
| 162 |
#include <gnome-speech/gnome-speech.h> |
| 163 |
#include <speak_lib.h> |
| 164 |
#include "espeakspeaker.h" |
| 165 |
Index: gnome-speech-0.4.25/drivers/loquendo/loquendospeaker.c |
| 166 |
=================================================================== |
| 167 |
--- gnome-speech-0.4.25.orig/drivers/loquendo/loquendospeaker.c 2008-12-10 14:36:00.000000000 +0100 |
| 168 |
+++ gnome-speech-0.4.25/drivers/loquendo/loquendospeaker.c 2012-03-26 00:00:26.442898637 +0200 |
| 169 |
@@ -27,8 +27,7 @@ |
| 170 |
#include <string.h> |
| 171 |
#include <unistd.h> |
| 172 |
#include <libbonobo.h> |
| 173 |
-#include <glib/gmain.h> |
| 174 |
-#include <glib/gthread.h> |
| 175 |
+#include <glib.h> |
| 176 |
#include <gnome-speech/gnome-speech.h> |
| 177 |
#include <loqtts.h> |
| 178 |
#include "loquendospeaker.h" |
| 179 |
Index: gnome-speech-0.4.25/drivers/loquendo/loquendospeaker.h |
| 180 |
=================================================================== |
| 181 |
--- gnome-speech-0.4.25.orig/drivers/loquendo/loquendospeaker.h 2008-12-10 14:36:00.000000000 +0100 |
| 182 |
+++ gnome-speech-0.4.25/drivers/loquendo/loquendospeaker.h 2012-03-26 00:00:26.366898638 +0200 |
| 183 |
@@ -34,7 +34,7 @@ |
| 184 |
#endif /* __cplusplus */ |
| 185 |
|
| 186 |
#include <bonobo/bonobo-object.h> |
| 187 |
-#include <glib/gthread.h> |
| 188 |
+#include <glib.h> |
| 189 |
#include <loqtts.h> |
| 190 |
#include <gnome-speech/gnome-speech.h> |
| 191 |
|
| 192 |
Index: gnome-speech-0.4.25/drivers/loquendo/loquendosynthesisdriver.c |
| 193 |
=================================================================== |
| 194 |
--- gnome-speech-0.4.25.orig/drivers/loquendo/loquendosynthesisdriver.c 2008-12-10 14:36:00.000000000 +0100 |
| 195 |
+++ gnome-speech-0.4.25/drivers/loquendo/loquendosynthesisdriver.c 2012-03-26 00:00:26.494898640 +0200 |
| 196 |
@@ -23,7 +23,7 @@ |
| 197 |
*/ |
| 198 |
|
| 199 |
#include <libbonobo.h> |
| 200 |
-#include <glib/gmain.h> |
| 201 |
+#include <glib.h> |
| 202 |
#include <loqtts.h> |
| 203 |
#include <gnome-speech/gnome-speech.h> |
| 204 |
#include "loquendosynthesisdriver.h" |
| 205 |
Index: gnome-speech-0.4.25/drivers/loquendo/loquendosynthesisdriver.h |
| 206 |
=================================================================== |
| 207 |
--- gnome-speech-0.4.25.orig/drivers/loquendo/loquendosynthesisdriver.h 2008-12-10 14:36:00.000000000 +0100 |
| 208 |
+++ gnome-speech-0.4.25/drivers/loquendo/loquendosynthesisdriver.h 2012-03-26 00:00:26.298898635 +0200 |
| 209 |
@@ -31,7 +31,7 @@ |
| 210 |
|
| 211 |
|
| 212 |
#include <bonobo/bonobo-object.h> |
| 213 |
-#include <glib/gthread.h> |
| 214 |
+#include <glib.h> |
| 215 |
#include <gnome-speech/gnome-speech.h> |
| 216 |
#include "loquendospeaker.h" |
| 217 |
|
| 218 |
Index: gnome-speech-0.4.25/drivers/swift/swiftspeaker.c |
| 219 |
=================================================================== |
| 220 |
--- gnome-speech-0.4.25.orig/drivers/swift/swiftspeaker.c 2008-12-10 14:36:00.000000000 +0100 |
| 221 |
+++ gnome-speech-0.4.25/drivers/swift/swiftspeaker.c 2012-03-26 00:00:25.862898620 +0200 |
| 222 |
@@ -28,8 +28,7 @@ |
| 223 |
#include <math.h> |
| 224 |
#include <unistd.h> |
| 225 |
#include <libbonobo.h> |
| 226 |
-#include <glib/gmain.h> |
| 227 |
-#include <glib/gthread.h> |
| 228 |
+#include <glib.h> |
| 229 |
#include <gnome-speech/gnome-speech.h> |
| 230 |
#include <swift.h> |
| 231 |
#include "swiftspeaker.h" |
| 232 |
Index: gnome-speech-0.4.25/drivers/swift/swiftspeaker.h |
| 233 |
=================================================================== |
| 234 |
--- gnome-speech-0.4.25.orig/drivers/swift/swiftspeaker.h 2008-12-10 14:36:00.000000000 +0100 |
| 235 |
+++ gnome-speech-0.4.25/drivers/swift/swiftspeaker.h 2012-03-26 00:00:25.930898624 +0200 |
| 236 |
@@ -28,7 +28,7 @@ |
| 237 |
#define __SWIFT_SPEAKER_H_ |
| 238 |
|
| 239 |
#include <bonobo/bonobo-object.h> |
| 240 |
-#include <glib/gthread.h> |
| 241 |
+#include <glib.h> |
| 242 |
#include <gnome-speech/gnome-speech.h> |
| 243 |
#include <swift.h> |
| 244 |
|
| 245 |
Index: gnome-speech-0.4.25/drivers/swift/swiftsynthesisdriver.c |
| 246 |
=================================================================== |
| 247 |
--- gnome-speech-0.4.25.orig/drivers/swift/swiftsynthesisdriver.c 2008-12-10 14:36:00.000000000 +0100 |
| 248 |
+++ gnome-speech-0.4.25/drivers/swift/swiftsynthesisdriver.c 2012-03-26 00:00:25.786898622 +0200 |
| 249 |
@@ -28,7 +28,7 @@ |
| 250 |
#include <unistd.h> |
| 251 |
#include <fcntl.h> |
| 252 |
#include <libbonobo.h> |
| 253 |
-#include <glib/gmain.h> |
| 254 |
+#include <glib.h> |
| 255 |
#include <gnome-speech/gnome-speech.h> |
| 256 |
#include <swift.h> |
| 257 |
#include "swiftsynthesisdriver.h" |
| 258 |
Index: gnome-speech-0.4.25/drivers/theta/thetaspeaker.c |
| 259 |
=================================================================== |
| 260 |
--- gnome-speech-0.4.25.orig/drivers/theta/thetaspeaker.c 2008-12-10 14:36:00.000000000 +0100 |
| 261 |
+++ gnome-speech-0.4.25/drivers/theta/thetaspeaker.c 2012-03-26 00:00:27.782898679 +0200 |
| 262 |
@@ -28,8 +28,7 @@ |
| 263 |
#include <math.h> |
| 264 |
#include <unistd.h> |
| 265 |
#include <libbonobo.h> |
| 266 |
-#include <glib/gmain.h> |
| 267 |
-#include <glib/gthread.h> |
| 268 |
+#include <glib.h> |
| 269 |
#include <gnome-speech/gnome-speech.h> |
| 270 |
#include <theta.h> |
| 271 |
#include "thetaspeaker.h" |
| 272 |
Index: gnome-speech-0.4.25/drivers/theta/thetaspeaker.h |
| 273 |
=================================================================== |
| 274 |
--- gnome-speech-0.4.25.orig/drivers/theta/thetaspeaker.h 2008-12-10 14:36:00.000000000 +0100 |
| 275 |
+++ gnome-speech-0.4.25/drivers/theta/thetaspeaker.h 2012-03-26 00:00:27.622898671 +0200 |
| 276 |
@@ -30,7 +30,7 @@ |
| 277 |
#define __THETA_SPEAKER_H_ |
| 278 |
|
| 279 |
#include <bonobo/bonobo-object.h> |
| 280 |
-#include <glib/gthread.h> |
| 281 |
+#include <glib.h> |
| 282 |
#include <gnome-speech/gnome-speech.h> |
| 283 |
#include <theta.h> |
| 284 |
|
| 285 |
Index: gnome-speech-0.4.25/drivers/theta/thetasynthesisdriver.c |
| 286 |
=================================================================== |
| 287 |
--- gnome-speech-0.4.25.orig/drivers/theta/thetasynthesisdriver.c 2008-12-10 14:36:00.000000000 +0100 |
| 288 |
+++ gnome-speech-0.4.25/drivers/theta/thetasynthesisdriver.c 2012-03-26 00:00:27.706898675 +0200 |
| 289 |
@@ -28,7 +28,7 @@ |
| 290 |
#include <unistd.h> |
| 291 |
#include <fcntl.h> |
| 292 |
#include <libbonobo.h> |
| 293 |
-#include <glib/gmain.h> |
| 294 |
+#include <glib.h> |
| 295 |
#include <gnome-speech/gnome-speech.h> |
| 296 |
#include <theta.h> |
| 297 |
#include "thetasynthesisdriver.h" |
| 298 |
Index: gnome-speech-0.4.25/drivers/viavoice/viavoicespeaker.c |
| 299 |
=================================================================== |
| 300 |
--- gnome-speech-0.4.25.orig/drivers/viavoice/viavoicespeaker.c 2008-12-10 14:36:00.000000000 +0100 |
| 301 |
+++ gnome-speech-0.4.25/drivers/viavoice/viavoicespeaker.c 2012-03-26 00:00:26.734898649 +0200 |
| 302 |
@@ -26,7 +26,7 @@ |
| 303 |
#include <unistd.h> |
| 304 |
#include <string.h> |
| 305 |
#include <libbonobo.h> |
| 306 |
-#include <glib/gmain.h> |
| 307 |
+#include <glib.h> |
| 308 |
#include <gnome-speech/gnome-speech.h> |
| 309 |
#include "viavoicesynthesisdriver.h" |
| 310 |
#include "viavoicespeaker.h" |
| 311 |
Index: gnome-speech-0.4.25/drivers/viavoice/viavoicespeaker.h |
| 312 |
=================================================================== |
| 313 |
--- gnome-speech-0.4.25.orig/drivers/viavoice/viavoicespeaker.h 2008-12-10 14:36:00.000000000 +0100 |
| 314 |
+++ gnome-speech-0.4.25/drivers/viavoice/viavoicespeaker.h 2012-03-26 00:00:26.578898644 +0200 |
| 315 |
@@ -34,7 +34,7 @@ |
| 316 |
#endif /* __cplusplus */ |
| 317 |
|
| 318 |
#include <bonobo/bonobo-object.h> |
| 319 |
-#include <glib/gthread.h> |
| 320 |
+#include <glib.h> |
| 321 |
#include <eci.h> |
| 322 |
#include <gnome-speech/gnome-speech.h> |
| 323 |
|
| 324 |
Index: gnome-speech-0.4.25/drivers/viavoice/viavoicesynthesisdriver.c |
| 325 |
=================================================================== |
| 326 |
--- gnome-speech-0.4.25.orig/drivers/viavoice/viavoicesynthesisdriver.c 2008-12-10 14:36:00.000000000 +0100 |
| 327 |
+++ gnome-speech-0.4.25/drivers/viavoice/viavoicesynthesisdriver.c 2012-03-26 00:00:26.654898643 +0200 |
| 328 |
@@ -24,7 +24,7 @@ |
| 329 |
*/ |
| 330 |
|
| 331 |
#include <libbonobo.h> |
| 332 |
-#include <glib/gmain.h> |
| 333 |
+#include <glib.h> |
| 334 |
#include <gnome-speech/gnome-speech.h> |
| 335 |
#include <string.h> |
| 336 |
#include "viavoicesynthesisdriver.h" |
| 337 |
Index: gnome-speech-0.4.25/drivers/viavoice/viavoicesynthesisdriver.h |
| 338 |
=================================================================== |
| 339 |
--- gnome-speech-0.4.25.orig/drivers/viavoice/viavoicesynthesisdriver.h 2008-12-10 14:36:00.000000000 +0100 |
| 340 |
+++ gnome-speech-0.4.25/drivers/viavoice/viavoicesynthesisdriver.h 2012-03-26 00:00:26.806898647 +0200 |
| 341 |
@@ -30,7 +30,7 @@ |
| 342 |
#define __VIAVOICE_SYNTHESIS_DRIVER_H_ |
| 343 |
|
| 344 |
#include <bonobo/bonobo-object.h> |
| 345 |
-#include <glib/gthread.h> |
| 346 |
+#include <glib.h> |
| 347 |
#include <gnome-speech/gnome-speech.h> |
| 348 |
#include <eci.h> |
| 349 |
#include "viavoicespeaker.h" |
Archives