summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/atk
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2011-09-30 10:47:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-04 13:46:21 +0100
commit98d050dcb25eaf035b981cd62225fce7fccee368 (patch)
tree84bd8d2c329acf2a41b80598f95803be513b4823 /meta/recipes-support/atk
parentb35a8ae022704c2c9fbabd294bdf912da8a1acae (diff)
downloadpoky-98d050dcb25eaf035b981cd62225fce7fccee368.tar.gz
atk: add patch to replace G_CONST_RETURN with const
* otherwise build fails when glib is 2.30.0 or newer (and G_DISABLE_DEPRECATED is enabled - like in atk) (From OE-Core rev: e78446155df29daf85d1df70d5047d28a361a187) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/atk')
-rw-r--r--meta/recipes-support/atk/atk-1.32.0/remove.G_CONST_RETURN.patch628
-rw-r--r--meta/recipes-support/atk/atk_1.32.0.bb5
2 files changed, 632 insertions, 1 deletions
diff --git a/meta/recipes-support/atk/atk-1.32.0/remove.G_CONST_RETURN.patch b/meta/recipes-support/atk/atk-1.32.0/remove.G_CONST_RETURN.patch
new file mode 100644
index 0000000000..0cdf041f80
--- /dev/null
+++ b/meta/recipes-support/atk/atk-1.32.0/remove.G_CONST_RETURN.patch
@@ -0,0 +1,628 @@
1Upstream-Status: Accepted
2
3Similar patch is already included in 2.0.1 and newer
4http://ftp.gnome.org/pub/gnome/sources/atk/2.0/atk-2.0.1.news
5
6diff -uNr atk-1.32.0.orig/atk/atkaction.c atk-1.32.0/atk/atkaction.c
7--- atk-1.32.0.orig/atk/atkaction.c 2010-09-06 08:45:45.000000000 +0200
8+++ atk-1.32.0/atk/atkaction.c 2011-09-30 10:29:49.896997586 +0200
9@@ -101,7 +101,7 @@
10 * Returns a description string, or %NULL
11 * if @action does not implement this interface.
12 **/
13-G_CONST_RETURN gchar*
14+const gchar*
15 atk_action_get_description (AtkAction *obj,
16 gint i)
17 {
18@@ -140,7 +140,7 @@
19 * Returns a name string, or %NULL
20 * if @action does not implement this interface.
21 **/
22-G_CONST_RETURN gchar*
23+const gchar*
24 atk_action_get_name (AtkAction *obj,
25 gint i)
26 {
27@@ -166,7 +166,7 @@
28 * Returns a name string, or %NULL
29 * if @action does not implement this interface.
30 **/
31-G_CONST_RETURN gchar*
32+const gchar*
33 atk_action_get_localized_name (AtkAction *obj,
34 gint i)
35 {
36@@ -203,7 +203,7 @@
37 * if there is no keybinding for this action.
38 *
39 **/
40-G_CONST_RETURN gchar*
41+const gchar*
42 atk_action_get_keybinding (AtkAction *obj,
43 gint i)
44 {
45diff -uNr atk-1.32.0.orig/atk/atkaction.h atk-1.32.0/atk/atkaction.h
46--- atk-1.32.0.orig/atk/atkaction.h 2010-09-06 08:45:45.000000000 +0200
47+++ atk-1.32.0/atk/atkaction.h 2011-09-30 10:29:49.897997588 +0200
48@@ -55,16 +55,16 @@
49 gboolean (*do_action) (AtkAction *action,
50 gint i);
51 gint (*get_n_actions) (AtkAction *action);
52- G_CONST_RETURN gchar* (*get_description) (AtkAction *action,
53+ const gchar* (*get_description) (AtkAction *action,
54 gint i);
55- G_CONST_RETURN gchar* (*get_name) (AtkAction *action,
56+ const gchar* (*get_name) (AtkAction *action,
57 gint i);
58- G_CONST_RETURN gchar* (*get_keybinding) (AtkAction *action,
59+ const gchar* (*get_keybinding) (AtkAction *action,
60 gint i);
61 gboolean (*set_description) (AtkAction *action,
62 gint i,
63 const gchar *desc);
64- G_CONST_RETURN gchar* (*get_localized_name)(AtkAction *action,
65+ const gchar* (*get_localized_name)(AtkAction *action,
66 gint i);
67 AtkFunction pad2;
68 };
69@@ -85,11 +85,11 @@
70 gboolean atk_action_do_action (AtkAction *action,
71 gint i);
72 gint atk_action_get_n_actions (AtkAction *action);
73-G_CONST_RETURN gchar* atk_action_get_description (AtkAction *action,
74+const gchar* atk_action_get_description (AtkAction *action,
75 gint i);
76-G_CONST_RETURN gchar* atk_action_get_name (AtkAction *action,
77+const gchar* atk_action_get_name (AtkAction *action,
78 gint i);
79-G_CONST_RETURN gchar* atk_action_get_keybinding (AtkAction *action,
80+const gchar* atk_action_get_keybinding (AtkAction *action,
81 gint i);
82 gboolean atk_action_set_description (AtkAction *action,
83 gint i,
84@@ -97,7 +97,7 @@
85
86 /* NEW in ATK 1.1: */
87
88-G_CONST_RETURN gchar* atk_action_get_localized_name (AtkAction *action,
89+const gchar* atk_action_get_localized_name (AtkAction *action,
90 gint i);
91
92 /*
93diff -uNr atk-1.32.0.orig/atk/atkdocument.c atk-1.32.0/atk/atkdocument.c
94--- atk-1.32.0.orig/atk/atkdocument.c 2010-09-06 08:45:45.000000000 +0200
95+++ atk-1.32.0/atk/atkdocument.c 2011-09-30 10:29:49.898997588 +0200
96@@ -93,7 +93,7 @@
97 *
98 * Returns: a string indicating the document type
99 **/
100-G_CONST_RETURN gchar*
101+const gchar*
102 atk_document_get_document_type (AtkDocument *document)
103 {
104 AtkDocumentIface *iface;
105@@ -155,7 +155,7 @@
106 * locale of the document content as a whole, or NULL if
107 * the document content does not specify a locale.
108 **/
109-G_CONST_RETURN gchar *
110+const gchar *
111 atk_document_get_locale (AtkDocument *document)
112 {
113 AtkDocumentIface *iface;
114@@ -219,7 +219,7 @@
115 * document, or NULL if a value for #attribute_name has not been specified
116 * for this document.
117 */
118-G_CONST_RETURN gchar *
119+const gchar *
120 atk_document_get_attribute_value (AtkDocument *document,
121 const gchar *attribute_name)
122 {
123diff -uNr atk-1.32.0.orig/atk/atkdocument.h atk-1.32.0/atk/atkdocument.h
124--- atk-1.32.0.orig/atk/atkdocument.h 2010-09-06 08:45:45.000000000 +0200
125+++ atk-1.32.0/atk/atkdocument.h 2011-09-30 10:29:49.899997588 +0200
126@@ -49,12 +49,12 @@
127 struct _AtkDocumentIface
128 {
129 GTypeInterface parent;
130- G_CONST_RETURN gchar* ( *get_document_type) (AtkDocument *document);
131+ const gchar* ( *get_document_type) (AtkDocument *document);
132 gpointer ( *get_document) (AtkDocument *document);
133
134- G_CONST_RETURN gchar* ( *get_document_locale) (AtkDocument *document);
135+ const gchar* ( *get_document_locale) (AtkDocument *document);
136 AtkAttributeSet * ( *get_document_attributes) (AtkDocument *document);
137- G_CONST_RETURN gchar* ( *get_document_attribute_value) (AtkDocument *document,
138+ const gchar* ( *get_document_attribute_value) (AtkDocument *document,
139 const gchar *attribute_name);
140 gboolean ( *set_document_attribute) (AtkDocument *document,
141 const gchar *attribute_name,
142@@ -68,11 +68,11 @@
143
144 GType atk_document_get_type (void);
145
146-G_CONST_RETURN gchar* atk_document_get_document_type (AtkDocument *document);
147+const gchar* atk_document_get_document_type (AtkDocument *document);
148 gpointer atk_document_get_document (AtkDocument *document);
149-G_CONST_RETURN gchar* atk_document_get_locale (AtkDocument *document);
150+const gchar* atk_document_get_locale (AtkDocument *document);
151 AtkAttributeSet* atk_document_get_attributes (AtkDocument *document);
152-G_CONST_RETURN gchar* atk_document_get_attribute_value (AtkDocument *document,
153+const gchar* atk_document_get_attribute_value (AtkDocument *document,
154 const gchar *attribute_name);
155 gboolean atk_document_set_attribute_value (AtkDocument *document,
156 const gchar *attribute_name,
157diff -uNr atk-1.32.0.orig/atk/atkimage.c atk-1.32.0/atk/atkimage.c
158--- atk-1.32.0.orig/atk/atkimage.c 2010-09-06 08:45:45.000000000 +0200
159+++ atk-1.32.0/atk/atkimage.c 2011-09-30 10:29:49.900997587 +0200
160@@ -46,7 +46,7 @@
161 *
162 * Returns: a string representing the image description
163 **/
164-G_CONST_RETURN gchar*
165+const gchar*
166 atk_image_get_image_description (AtkImage *image)
167 {
168 AtkImageIface *iface;
169@@ -192,7 +192,7 @@
170 * Returns a string corresponding to the POSIX LC_MESSAGES locale used by the image description, or NULL if the image does not specify a locale.
171 *
172 */
173-G_CONST_RETURN gchar*
174+const gchar*
175 atk_image_get_image_locale (AtkImage *image)
176 {
177
178diff -uNr atk-1.32.0.orig/atk/atkimage.h atk-1.32.0/atk/atkimage.h
179--- atk-1.32.0.orig/atk/atkimage.h 2010-09-06 08:45:45.000000000 +0200
180+++ atk-1.32.0/atk/atkimage.h 2011-09-30 10:29:49.901997587 +0200
181@@ -53,13 +53,13 @@
182 gint *x,
183 gint *y,
184 AtkCoordType coord_type);
185- G_CONST_RETURN gchar* ( *get_image_description) (AtkImage *image);
186+ const gchar* ( *get_image_description) (AtkImage *image);
187 void ( *get_image_size) (AtkImage *image,
188 gint *width,
189 gint *height);
190 gboolean ( *set_image_description) (AtkImage *image,
191 const gchar *description);
192- G_CONST_RETURN gchar* ( *get_image_locale) (AtkImage *image);
193+ const gchar* ( *get_image_locale) (AtkImage *image);
194
195 AtkFunction pad1;
196
197@@ -67,7 +67,7 @@
198
199 GType atk_image_get_type (void);
200
201-G_CONST_RETURN gchar* atk_image_get_image_description (AtkImage *image);
202+const gchar* atk_image_get_image_description (AtkImage *image);
203
204 void atk_image_get_image_size (AtkImage *image,
205 gint *width,
206@@ -80,7 +80,7 @@
207 gint *y,
208 AtkCoordType coord_type);
209
210-G_CONST_RETURN gchar* atk_image_get_image_locale (AtkImage *image);
211+const gchar* atk_image_get_image_locale (AtkImage *image);
212
213 G_END_DECLS
214
215diff -uNr atk-1.32.0.orig/atk/atkobject.c atk-1.32.0/atk/atkobject.c
216--- atk-1.32.0.orig/atk/atkobject.c 2010-09-06 08:45:45.000000000 +0200
217+++ atk-1.32.0/atk/atkobject.c 2011-09-30 10:29:49.905997587 +0200
218@@ -285,9 +285,9 @@
219 GValue *value,
220 GParamSpec *pspec);
221 static void atk_object_finalize (GObject *object);
222-static G_CONST_RETURN gchar*
223+static const gchar*
224 atk_object_real_get_name (AtkObject *object);
225-static G_CONST_RETURN gchar*
226+static const gchar*
227 atk_object_real_get_description
228 (AtkObject *object);
229 static AtkObject* atk_object_real_get_parent (AtkObject *object);
230@@ -692,7 +692,7 @@
231 *
232 * Returns: a character string representing the accessible name of the object.
233 **/
234-G_CONST_RETURN gchar*
235+const gchar*
236 atk_object_get_name (AtkObject *accessible)
237 {
238 AtkObjectClass *klass;
239@@ -716,7 +716,7 @@
240 * of the accessible.
241 *
242 **/
243-G_CONST_RETURN gchar*
244+const gchar*
245 atk_object_get_description (AtkObject *accessible)
246 {
247 AtkObjectClass *klass;
248@@ -1123,7 +1123,7 @@
249 AtkState state,
250 gboolean value)
251 {
252- G_CONST_RETURN gchar* name;
253+ const gchar* name;
254
255 g_return_if_fail (ATK_IS_OBJECT (accessible));
256
257@@ -1319,13 +1319,13 @@
258 G_OBJECT_CLASS (parent_class)->finalize (object);
259 }
260
261-static G_CONST_RETURN gchar*
262+static const gchar*
263 atk_object_real_get_name (AtkObject *object)
264 {
265 return object->name;
266 }
267
268-static G_CONST_RETURN gchar*
269+static const gchar*
270 atk_object_real_get_description (AtkObject *object)
271 {
272 return object->description;
273@@ -1487,7 +1487,7 @@
274 *
275 * Returns: the string describing the AtkRole
276 */
277-G_CONST_RETURN gchar*
278+const gchar*
279 atk_role_get_name (AtkRole role)
280 {
281 if (role >= 0 && role < ATK_ROLE_LAST_DEFINED)
282@@ -1514,7 +1514,7 @@
283 *
284 * Returns: the localized string describing the AtkRole
285 **/
286-G_CONST_RETURN gchar*
287+const gchar*
288 atk_role_get_localized_name (AtkRole role)
289 {
290 gettext_initialization ();
291diff -uNr atk-1.32.0.orig/atk/atkobject.h atk-1.32.0/atk/atkobject.h
292--- atk-1.32.0.orig/atk/atkobject.h 2010-09-06 08:45:45.000000000 +0200
293+++ atk-1.32.0/atk/atkobject.h 2011-09-30 10:29:49.907997585 +0200
294@@ -381,11 +381,11 @@
295 /*
296 * Gets the accessible name of the object
297 */
298- G_CONST_RETURN gchar* (* get_name) (AtkObject *accessible);
299+ const gchar* (* get_name) (AtkObject *accessible);
300 /*
301 * Gets the accessible description of the object
302 */
303- G_CONST_RETURN gchar* (* get_description) (AtkObject *accessible);
304+ const gchar* (* get_description) (AtkObject *accessible);
305 /*
306 * Gets the accessible parent of the object
307 */
308@@ -535,8 +535,8 @@
309 * Properties directly supported by AtkObject
310 */
311
312-G_CONST_RETURN gchar* atk_object_get_name (AtkObject *accessible);
313-G_CONST_RETURN gchar* atk_object_get_description (AtkObject *accessible);
314+const gchar* atk_object_get_name (AtkObject *accessible);
315+const gchar* atk_object_get_description (AtkObject *accessible);
316 AtkObject* atk_object_get_parent (AtkObject *accessible);
317 gint atk_object_get_n_accessible_children (AtkObject *accessible);
318 AtkObject* atk_object_ref_accessible_child (AtkObject *accessible,
319@@ -571,7 +571,7 @@
320 void atk_object_initialize (AtkObject *accessible,
321 gpointer data);
322
323-G_CONST_RETURN gchar* atk_role_get_name (AtkRole role);
324+const gchar* atk_role_get_name (AtkRole role);
325 AtkRole atk_role_for_name (const gchar *name);
326
327
328@@ -582,7 +582,7 @@
329 gboolean atk_object_remove_relationship (AtkObject *object,
330 AtkRelationType relationship,
331 AtkObject *target);
332-G_CONST_RETURN gchar* atk_role_get_localized_name (AtkRole role);
333+const gchar* atk_role_get_localized_name (AtkRole role);
334
335 /* */
336
337diff -uNr atk-1.32.0.orig/atk/atkrelation.c atk-1.32.0/atk/atkrelation.c
338--- atk-1.32.0.orig/atk/atkrelation.c 2010-09-06 08:45:45.000000000 +0200
339+++ atk-1.32.0/atk/atkrelation.c 2011-09-30 10:29:49.908997585 +0200
340@@ -130,7 +130,7 @@
341 *
342 * Returns: the string describing the AtkRelationType
343 */
344-G_CONST_RETURN gchar*
345+const gchar*
346 atk_relation_type_get_name (AtkRelationType type)
347 {
348 GTypeClass *type_class;
349diff -uNr atk-1.32.0.orig/atk/atkrelation.h atk-1.32.0/atk/atkrelation.h
350--- atk-1.32.0.orig/atk/atkrelation.h 2010-09-06 08:45:45.000000000 +0200
351+++ atk-1.32.0/atk/atkrelation.h 2011-09-30 10:29:49.909997586 +0200
352@@ -61,7 +61,7 @@
353 GType atk_relation_get_type (void);
354
355 AtkRelationType atk_relation_type_register (const gchar *name);
356-G_CONST_RETURN gchar* atk_relation_type_get_name (AtkRelationType type);
357+const gchar* atk_relation_type_get_name (AtkRelationType type);
358 AtkRelationType atk_relation_type_for_name (const gchar *name);
359
360 /*
361diff -uNr atk-1.32.0.orig/atk/atkstate.c atk-1.32.0/atk/atkstate.c
362--- atk-1.32.0.orig/atk/atkstate.c 2010-09-06 08:45:45.000000000 +0200
363+++ atk-1.32.0/atk/atkstate.c 2011-09-30 10:29:49.910997587 +0200
364@@ -57,7 +57,7 @@
365 *
366 * Returns: the string describing the AtkStateType
367 */
368-G_CONST_RETURN gchar*
369+const gchar*
370 atk_state_type_get_name (AtkStateType type)
371 {
372 GTypeClass *type_class;
373diff -uNr atk-1.32.0.orig/atk/atkstate.h atk-1.32.0/atk/atkstate.h
374--- atk-1.32.0.orig/atk/atkstate.h 2010-09-06 08:45:45.000000000 +0200
375+++ atk-1.32.0/atk/atkstate.h 2011-09-30 10:29:49.911997587 +0200
376@@ -170,7 +170,7 @@
377
378 AtkStateType atk_state_type_register (const gchar *name);
379
380-G_CONST_RETURN gchar* atk_state_type_get_name (AtkStateType type);
381+const gchar* atk_state_type_get_name (AtkStateType type);
382 AtkStateType atk_state_type_for_name (const gchar *name);
383
384 G_END_DECLS
385diff -uNr atk-1.32.0.orig/atk/atkstreamablecontent.c atk-1.32.0/atk/atkstreamablecontent.c
386--- atk-1.32.0.orig/atk/atkstreamablecontent.c 2010-09-06 08:45:45.000000000 +0200
387+++ atk-1.32.0/atk/atkstreamablecontent.c 2011-09-30 10:29:49.912997587 +0200
388@@ -73,7 +73,7 @@
389 * Returns : a gchar* representing the specified mime type; the caller
390 * should not free the character string.
391 **/
392-G_CONST_RETURN gchar*
393+const gchar*
394 atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
395 gint i)
396 {
397diff -uNr atk-1.32.0.orig/atk/atkstreamablecontent.h atk-1.32.0/atk/atkstreamablecontent.h
398--- atk-1.32.0.orig/atk/atkstreamablecontent.h 2010-09-06 08:45:45.000000000 +0200
399+++ atk-1.32.0/atk/atkstreamablecontent.h 2011-09-30 10:29:49.913997587 +0200
400@@ -54,11 +54,11 @@
401 * at index 0 should be considered the "default" data type for the stream.
402 *
403 * This assumes that the strings for the mime types are stored in the
404- * AtkStreamableContent. Alternatively the G_CONST_RETURN could be removed
405+ * AtkStreamableContent. Alternatively the const could be removed
406 * and the caller would be responsible for calling g_free() on the
407 * returned value.
408 */
409- G_CONST_RETURN gchar* (* get_mime_type) (AtkStreamableContent *streamable,
410+ const gchar* (* get_mime_type) (AtkStreamableContent *streamable,
411 gint i);
412 /*
413 * One possible implementation for this method is that it constructs the
414@@ -80,7 +80,7 @@
415 * constructed. Note that it is possible for get_uri to return NULL but for
416 * get_stream to work nonetheless, since not all GIOChannels connect to URIs.
417 */
418- G_CONST_RETURN gchar* (* get_uri) (AtkStreamableContent *streamable,
419+ const gchar* (* get_uri) (AtkStreamableContent *streamable,
420 const gchar *mime_type);
421
422
423@@ -92,7 +92,7 @@
424
425 gint atk_streamable_content_get_n_mime_types (AtkStreamableContent *streamable);
426
427-G_CONST_RETURN gchar* atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
428+const gchar* atk_streamable_content_get_mime_type (AtkStreamableContent *streamable,
429 gint i);
430 GIOChannel* atk_streamable_content_get_stream (AtkStreamableContent *streamable,
431 const gchar *mime_type);
432diff -uNr atk-1.32.0.orig/atk/atktable.c atk-1.32.0/atk/atktable.c
433--- atk-1.32.0.orig/atk/atktable.c 2010-09-06 08:45:45.000000000 +0200
434+++ atk-1.32.0/atk/atktable.c 2011-09-30 10:29:49.915997586 +0200
435@@ -300,7 +300,7 @@
436 * Returns: a gchar* representing the column description, or %NULL
437 * if value does not implement this interface.
438 **/
439-G_CONST_RETURN gchar*
440+const gchar*
441 atk_table_get_column_description (AtkTable *table,
442 gint column)
443 {
444@@ -404,7 +404,7 @@
445 * Returns: a gchar* representing the row description, or %NULL
446 * if value does not implement this interface.
447 **/
448-G_CONST_RETURN gchar*
449+const gchar*
450 atk_table_get_row_description (AtkTable *table,
451 gint row)
452 {
453diff -uNr atk-1.32.0.orig/atk/atktable.h atk-1.32.0/atk/atktable.h
454--- atk-1.32.0.orig/atk/atktable.h 2010-09-06 08:45:45.000000000 +0200
455+++ atk-1.32.0/atk/atktable.h 2011-09-30 10:29:49.916997586 +0200
456@@ -69,12 +69,12 @@
457 gint column);
458 AtkObject*
459 (* get_caption) (AtkTable *table);
460- G_CONST_RETURN gchar*
461+ const gchar*
462 (* get_column_description) (AtkTable *table,
463 gint column);
464 AtkObject* (* get_column_header) (AtkTable *table,
465 gint column);
466- G_CONST_RETURN gchar*
467+ const gchar*
468 (* get_row_description) (AtkTable *table,
469 gint row);
470 AtkObject* (* get_row_header) (AtkTable *table,
471@@ -163,12 +163,12 @@
472 gint column);
473 AtkObject*
474 atk_table_get_caption (AtkTable *table);
475-G_CONST_RETURN gchar*
476+const gchar*
477 atk_table_get_column_description (AtkTable *table,
478 gint column);
479 AtkObject* atk_table_get_column_header (AtkTable *table,
480 gint column);
481-G_CONST_RETURN gchar*
482+const gchar*
483 atk_table_get_row_description (AtkTable *table,
484 gint row);
485 AtkObject* atk_table_get_row_header (AtkTable *table,
486diff -uNr atk-1.32.0.orig/atk/atktext.c atk-1.32.0/atk/atktext.c
487--- atk-1.32.0.orig/atk/atktext.c 2010-09-27 09:07:09.000000000 +0200
488+++ atk-1.32.0/atk/atktext.c 2011-09-30 10:29:49.919997586 +0200
489@@ -1054,7 +1054,7 @@
490 *
491 * Returns: a string containing the name; this string should not be freed
492 **/
493-G_CONST_RETURN gchar*
494+const gchar*
495 atk_text_attribute_get_name (AtkTextAttribute attr)
496 {
497 GTypeClass *type_class;
498@@ -1150,7 +1150,7 @@
499 * Returns: a string containing the value; this string should not be freed;
500 * NULL is returned if there are no values maintained for the attr value.
501 **/
502-G_CONST_RETURN gchar*
503+const gchar*
504 atk_text_attribute_get_value (AtkTextAttribute attr,
505 gint index)
506 {
507diff -uNr atk-1.32.0.orig/atk/atktext.h atk-1.32.0/atk/atktext.h
508--- atk-1.32.0.orig/atk/atktext.h 2010-09-27 09:07:09.000000000 +0200
509+++ atk-1.32.0/atk/atktext.h 2011-09-30 10:29:49.921997586 +0200
510@@ -355,9 +355,9 @@
511 AtkTextClipType y_clip_type);
512 void atk_text_free_ranges (AtkTextRange **ranges);
513 void atk_attribute_set_free (AtkAttributeSet *attrib_set);
514-G_CONST_RETURN gchar* atk_text_attribute_get_name (AtkTextAttribute attr);
515+const gchar* atk_text_attribute_get_name (AtkTextAttribute attr);
516 AtkTextAttribute atk_text_attribute_for_name (const gchar *name);
517-G_CONST_RETURN gchar* atk_text_attribute_get_value (AtkTextAttribute attr,
518+const gchar* atk_text_attribute_get_value (AtkTextAttribute attr,
519 gint index_);
520
521 G_END_DECLS
522diff -uNr atk-1.32.0.orig/atk/atkutil.c atk-1.32.0/atk/atkutil.c
523--- atk-1.32.0.orig/atk/atkutil.c 2010-09-06 08:45:45.000000000 +0200
524+++ atk-1.32.0/atk/atkutil.c 2011-09-30 10:29:49.922997586 +0200
525@@ -340,7 +340,7 @@
526 *
527 * Returns: name string for the GUI toolkit implementing ATK for this application
528 **/
529-G_CONST_RETURN gchar*
530+const gchar*
531 atk_get_toolkit_name (void)
532 {
533 const gchar *retval;
534@@ -365,7 +365,7 @@
535 *
536 * Returns: version string for the GUI toolkit implementing ATK for this application
537 **/
538-G_CONST_RETURN gchar*
539+const gchar*
540 atk_get_toolkit_version (void)
541 {
542 const gchar *retval;
543@@ -391,7 +391,7 @@
544 * Returns: version string for ATK
545 **/
546
547-G_CONST_RETURN gchar *
548+const gchar *
549 atk_get_version (void)
550 {
551 return VERSION;
552diff -uNr atk-1.32.0.orig/atk/atkutil.h atk-1.32.0/atk/atkutil.h
553--- atk-1.32.0.orig/atk/atkutil.h 2010-09-06 08:45:45.000000000 +0200
554+++ atk-1.32.0/atk/atkutil.h 2011-09-30 10:29:49.923997586 +0200
555@@ -147,8 +147,8 @@
556 gpointer data);
557 void (* remove_key_event_listener) (guint listener_id);
558 AtkObject* (* get_root) (void);
559- G_CONST_RETURN gchar* (* get_toolkit_name) (void);
560- G_CONST_RETURN gchar* (* get_toolkit_version) (void);
561+ const gchar* (* get_toolkit_name) (void);
562+ const gchar* (* get_toolkit_version) (void);
563 };
564 GType atk_util_get_type (void);
565
566@@ -229,17 +229,17 @@
567 /*
568 * Returns name string for the GUI toolkit.
569 */
570-G_CONST_RETURN gchar *atk_get_toolkit_name (void);
571+const gchar *atk_get_toolkit_name (void);
572
573 /*
574 * Returns version string for the GUI toolkit.
575 */
576-G_CONST_RETURN gchar *atk_get_toolkit_version (void);
577+const gchar *atk_get_toolkit_version (void);
578
579 /*
580 * Gets the current version of ATK
581 */
582-G_CONST_RETURN gchar *atk_get_version (void);
583+const gchar *atk_get_version (void);
584
585 /* --- GType boilerplate --- */
586 /* convenience macros for atk type implementations, which for a type GtkGadgetAccessible will:
587diff -uNr atk-1.32.0.orig/tests/testrelation.c atk-1.32.0/tests/testrelation.c
588--- atk-1.32.0.orig/tests/testrelation.c 2010-09-06 08:45:45.000000000 +0200
589+++ atk-1.32.0/tests/testrelation.c 2011-09-30 10:29:49.924997586 +0200
590@@ -28,7 +28,7 @@
591 test_relation (void)
592 {
593 AtkRelationType type1, type2;
594- G_CONST_RETURN gchar *name;
595+ const gchar *name;
596 AtkObject *obj;
597 gboolean ret_value;
598 AtkRelationSet *set;
599@@ -169,7 +169,7 @@
600 test_role (void)
601 {
602 AtkRole role1, role2;
603- G_CONST_RETURN gchar *name;
604+ const gchar *name;
605
606 name = atk_role_get_name (ATK_ROLE_PAGE_TAB);
607 g_return_val_if_fail (name, FALSE);
608@@ -230,7 +230,7 @@
609 test_text_attr (void)
610 {
611 AtkTextAttribute attr1, attr2;
612- G_CONST_RETURN gchar *name;
613+ const gchar *name;
614
615 name = atk_text_attribute_get_name (ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP);
616 g_return_val_if_fail (name, FALSE);
617diff -uNr atk-1.32.0.orig/tests/teststateset.c atk-1.32.0/tests/teststateset.c
618--- atk-1.32.0.orig/tests/teststateset.c 2010-09-06 08:45:45.000000000 +0200
619+++ atk-1.32.0/tests/teststateset.c 2011-09-30 10:29:49.926997586 +0200
620@@ -208,7 +208,7 @@
621 test_state (void)
622 {
623 AtkStateType type1, type2;
624- G_CONST_RETURN gchar *name;
625+ const gchar *name;
626
627 name = atk_state_type_get_name (ATK_STATE_VISIBLE);
628 g_return_val_if_fail (name, FALSE);
diff --git a/meta/recipes-support/atk/atk_1.32.0.bb b/meta/recipes-support/atk/atk_1.32.0.bb
index e6883ebefa..db8ca1f7f0 100644
--- a/meta/recipes-support/atk/atk_1.32.0.bb
+++ b/meta/recipes-support/atk/atk_1.32.0.bb
@@ -4,7 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
4 file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \ 4 file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \
5 file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7" 5 file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7"
6 6
7SRC_URI = "http://download.gnome.org/sources/atk/1.32/${BPN}-${PV}.tar.bz2" 7PR = "r1"
8SRC_URI = "http://download.gnome.org/sources/atk/1.32/${BPN}-${PV}.tar.bz2 \
9 file://remove.G_CONST_RETURN.patch \
10"
8 11
9SRC_URI[md5sum] = "b9a19a3e426cd9ca930f0108c4ee343f" 12SRC_URI[md5sum] = "b9a19a3e426cd9ca930f0108c4ee343f"
10SRC_URI[sha256sum] = "e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e" 13SRC_URI[sha256sum] = "e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 03:36:41 +0000