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