diff --git a/0001-docs-Use-const-instead-G_CONST_RETURN.patch b/0001-docs-Use-const-instead-G_CONST_RETURN.patch new file mode 100644 index 0000000..ff8702c --- /dev/null +++ b/0001-docs-Use-const-instead-G_CONST_RETURN.patch @@ -0,0 +1,60 @@ +From 443d48907374d5f2e34fc492448e35d028428faa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Javier=20Jard=C3=B3n?= +Date: Wed, 8 Jun 2011 18:29:52 +0100 +Subject: [PATCH 1/4] docs: Use const instead G_CONST_RETURN + +https://bugzilla.gnome.org/show_bug.cgi?id=652129 +--- + doc/CODING_STYLE | 8 ++++---- + doc/cookbook/examples/cb-button.c | 2 +- + doc/cookbook/examples/cb-button.h | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/doc/CODING_STYLE b/doc/CODING_STYLE +index 9f0a15b..b8682c8 100644 +--- a/doc/CODING_STYLE ++++ b/doc/CODING_STYLE +@@ -406,10 +406,10 @@ definition should be vertically aligned in three columns: + The maximum width of each column is given by the longest element in the + column: + +- void clutter_type_set_property (ClutterType *type, +- const gchar *value, +- GError **error); +- G_CONST_RETURN gchar *clutter_type_get_property (ClutterType *type); ++ void clutter_type_set_property (ClutterType *type, ++ const gchar *value, ++ GError **error); ++ const gchar *clutter_type_get_property (ClutterType *type); + + It is also possible to align the columns to the next tab: + +diff --git a/doc/cookbook/examples/cb-button.c b/doc/cookbook/examples/cb-button.c +index 0260d14..e02416c 100644 +--- a/doc/cookbook/examples/cb-button.c ++++ b/doc/cookbook/examples/cb-button.c +@@ -429,7 +429,7 @@ cb_button_set_text_color (CbButton *self, + * + * Returns: the button's text. This must not be freed by the application. + */ +-G_CONST_RETURN gchar * ++const gchar * + cb_button_get_text (CbButton *self) + { + g_return_val_if_fail (CB_IS_BUTTON (self), NULL); +diff --git a/doc/cookbook/examples/cb-button.h b/doc/cookbook/examples/cb-button.h +index 9362a49..cf8adaf 100644 +--- a/doc/cookbook/examples/cb-button.h ++++ b/doc/cookbook/examples/cb-button.h +@@ -67,7 +67,7 @@ struct _CbButtonClass + ClutterActor *cb_button_new (void); + + /* getter */ +-G_CONST_RETURN gchar * cb_button_get_text (CbButton *self); ++const gchar * cb_button_get_text (CbButton *self); + + /* setters - these are wrappers round functions + * which change properties of the internal actors +-- +1.7.5.4 + diff --git a/0002-cogl-Use-const-instead-G_CONST_RETURN.patch b/0002-cogl-Use-const-instead-G_CONST_RETURN.patch new file mode 100644 index 0000000..adc00ff --- /dev/null +++ b/0002-cogl-Use-const-instead-G_CONST_RETURN.patch @@ -0,0 +1,68 @@ +From c97bacaae107a2f134a442adf27d7956c5b07217 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Javier=20Jard=C3=B3n?= +Date: Wed, 8 Jun 2011 18:31:00 +0100 +Subject: [PATCH 2/4] cogl: Use const instead G_CONST_RETURN + +https://bugzilla.gnome.org/show_bug.cgi?id=652129 +--- + clutter/cogl/cogl/cogl-material-compat.c | 2 +- + clutter/cogl/cogl/cogl-material-compat.h | 2 +- + clutter/cogl/cogl/cogl-matrix.h | 2 +- + clutter/cogl/cogl/cogl-pipeline-private.h | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/clutter/cogl/cogl/cogl-material-compat.c b/clutter/cogl/cogl/cogl-material-compat.c +index 94d07fc..de3038e 100644 +--- a/clutter/cogl/cogl/cogl-material-compat.c ++++ b/clutter/cogl/cogl/cogl-material-compat.c +@@ -279,7 +279,7 @@ cogl_material_set_layer_matrix (CoglMaterial *material, + layer_index, matrix); + } + +-G_CONST_RETURN GList * ++const GList * + cogl_material_get_layers (CoglMaterial *material) + { + return _cogl_pipeline_get_layers (COGL_PIPELINE (material)); +diff --git a/clutter/cogl/cogl/cogl-material-compat.h b/clutter/cogl/cogl/cogl-material-compat.h +index 34c6d29..00a85c7 100644 +--- a/clutter/cogl/cogl/cogl-material-compat.h ++++ b/clutter/cogl/cogl/cogl-material-compat.h +@@ -889,7 +889,7 @@ cogl_material_set_layer_matrix (CoglMaterial *material, + * cogl_material_layer_* functions. The list is owned by Cogl and it + * should not be modified or freed + */ +-G_CONST_RETURN GList * ++const GList * + cogl_material_get_layers (CoglMaterial *material); + + /** +diff --git a/clutter/cogl/cogl/cogl-matrix.h b/clutter/cogl/cogl/cogl-matrix.h +index 8e9f207..83392ed 100644 +--- a/clutter/cogl/cogl/cogl-matrix.h ++++ b/clutter/cogl/cogl/cogl-matrix.h +@@ -277,7 +277,7 @@ cogl_matrix_init_from_array (CoglMatrix *matrix, + * + * Return value: a pointer to the float array + */ +-G_CONST_RETURN float * ++const float * + cogl_matrix_get_array (const CoglMatrix *matrix); + + /** +diff --git a/clutter/cogl/cogl/cogl-pipeline-private.h b/clutter/cogl/cogl/cogl-pipeline-private.h +index 47007fb..3485582 100644 +--- a/clutter/cogl/cogl/cogl-pipeline-private.h ++++ b/clutter/cogl/cogl/cogl-pipeline-private.h +@@ -1174,7 +1174,7 @@ _cogl_pipeline_prune_to_n_layers (CoglPipeline *pipeline, int n); + * API to support the deprecate cogl_pipeline_layer_xyz functions... + */ + +-G_CONST_RETURN GList * ++const GList * + _cogl_pipeline_get_layers (CoglPipeline *pipeline); + + void +-- +1.7.5.4 + diff --git a/0003-cally-Use-const-instead-G_CONST_RETURN.patch b/0003-cally-Use-const-instead-G_CONST_RETURN.patch new file mode 100644 index 0000000..928eeea --- /dev/null +++ b/0003-cally-Use-const-instead-G_CONST_RETURN.patch @@ -0,0 +1,263 @@ +From b057ef89827301acef71f8348d3d95977abdda9f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Javier=20Jard=C3=B3n?= +Date: Wed, 8 Jun 2011 18:35:29 +0100 +Subject: [PATCH 3/4] cally: Use const instead G_CONST_RETURN + +https://bugzilla.gnome.org/show_bug.cgi?id=652129 +--- + clutter/cally/cally-actor.c | 18 +++++++++--------- + clutter/cally/cally-clone.c | 6 +++--- + clutter/cally/cally-rectangle.c | 6 +++--- + clutter/cally/cally-stage.c | 12 ++++++------ + clutter/cally/cally-text.c | 6 +++--- + clutter/cally/cally-texture.c | 6 +++--- + clutter/cally/cally-util.c | 8 ++++---- + 7 files changed, 31 insertions(+), 31 deletions(-) + +diff --git a/clutter/cally/cally-actor.c b/clutter/cally/cally-actor.c +index 920d964..7bc701f 100644 +--- a/clutter/cally/cally-actor.c ++++ b/clutter/cally/cally-actor.c +@@ -148,7 +148,7 @@ static void cally_actor_finalize (GObject *obj); + static AtkObject* cally_actor_get_parent (AtkObject *obj); + static gint cally_actor_get_index_in_parent (AtkObject *obj); + static AtkStateSet* cally_actor_ref_state_set (AtkObject *obj); +-static G_CONST_RETURN gchar* cally_actor_get_name (AtkObject *obj); ++static const gchar* cally_actor_get_name (AtkObject *obj); + static gint cally_actor_get_n_children (AtkObject *obj); + static AtkObject* cally_actor_ref_child (AtkObject *obj, + gint i); +@@ -195,11 +195,11 @@ static gboolean cally_actor_action_do_action (AtkAction *acti + gint i); + static gboolean idle_do_action (gpointer data); + static gint cally_actor_action_get_n_actions (AtkAction *action); +-static G_CONST_RETURN gchar* cally_actor_action_get_description (AtkAction *action, ++static const gchar* cally_actor_action_get_description (AtkAction *action, + gint i); +-static G_CONST_RETURN gchar* cally_actor_action_get_keybinding (AtkAction *action, ++static const gchar* cally_actor_action_get_keybinding (AtkAction *action, + gint i); +-static G_CONST_RETURN gchar* cally_actor_action_get_name (AtkAction *action, ++static const gchar* cally_actor_action_get_name (AtkAction *action, + gint i); + static gboolean cally_actor_action_set_description (AtkAction *action, + gint i, +@@ -420,10 +420,10 @@ cally_actor_finalize (GObject *obj) + + /* AtkObject */ + +-static G_CONST_RETURN gchar* ++static const gchar* + cally_actor_get_name (AtkObject *obj) + { +- G_CONST_RETURN gchar* name = NULL; ++ const gchar* name = NULL; + + g_return_val_if_fail (CALLY_IS_ACTOR (obj), NULL); + +@@ -1057,7 +1057,7 @@ cally_actor_action_get_n_actions (AtkAction *action) + return g_list_length (priv->action_list); + } + +-static G_CONST_RETURN gchar* ++static const gchar* + cally_actor_action_get_name (AtkAction *action, + gint i) + { +@@ -1074,7 +1074,7 @@ cally_actor_action_get_name (AtkAction *action, + return info->name; + } + +-static G_CONST_RETURN gchar* ++static const gchar* + cally_actor_action_get_description (AtkAction *action, + gint i) + { +@@ -1112,7 +1112,7 @@ cally_actor_action_set_description (AtkAction *action, + return TRUE; + } + +-static G_CONST_RETURN gchar* ++static const gchar* + cally_actor_action_get_keybinding (AtkAction *action, + gint i) + { +diff --git a/clutter/cally/cally-clone.c b/clutter/cally/cally-clone.c +index 4c59d08..4a040de 100644 +--- a/clutter/cally/cally-clone.c ++++ b/clutter/cally/cally-clone.c +@@ -81,7 +81,7 @@ static void cally_clone_init (CallyClone *clone); + /* AtkObject */ + static void cally_clone_real_initialize (AtkObject *obj, + gpointer data); +-static G_CONST_RETURN gchar *cally_clone_get_description (AtkObject *obj); ++static const gchar *cally_clone_get_description (AtkObject *obj); + + + G_DEFINE_TYPE (CallyClone, cally_clone, CALLY_TYPE_ACTOR) +@@ -138,10 +138,10 @@ cally_clone_real_initialize (AtkObject *obj, + obj->role = ATK_ROLE_IMAGE; + } + +-static G_CONST_RETURN gchar * ++static const gchar * + cally_clone_get_description (AtkObject *obj) + { +- G_CONST_RETURN gchar *description = NULL; ++ const gchar *description = NULL; + + g_return_val_if_fail (CALLY_IS_CLONE (obj), NULL); + +diff --git a/clutter/cally/cally-rectangle.c b/clutter/cally/cally-rectangle.c +index b0c10a4..401edae 100644 +--- a/clutter/cally/cally-rectangle.c ++++ b/clutter/cally/cally-rectangle.c +@@ -41,7 +41,7 @@ static void cally_rectangle_init (CallyRectangle *rectangle); + /* AtkObject */ + static void cally_rectangle_real_initialize (AtkObject *obj, + gpointer data); +-static G_CONST_RETURN gchar *cally_rectangle_get_description (AtkObject *obj); ++static const gchar *cally_rectangle_get_description (AtkObject *obj); + + + G_DEFINE_TYPE (CallyRectangle, cally_rectangle, CALLY_TYPE_ACTOR) +@@ -98,10 +98,10 @@ cally_rectangle_real_initialize (AtkObject *obj, + obj->role = ATK_ROLE_IMAGE; + } + +-static G_CONST_RETURN gchar * ++static const gchar * + cally_rectangle_get_description (AtkObject *obj) + { +- G_CONST_RETURN gchar *description = NULL; ++ const gchar *description = NULL; + + g_return_val_if_fail (CALLY_IS_RECTANGLE (obj), NULL); + +diff --git a/clutter/cally/cally-stage.c b/clutter/cally/cally-stage.c +index 75bc486..e00eaf8 100644 +--- a/clutter/cally/cally-stage.c ++++ b/clutter/cally/cally-stage.c +@@ -52,8 +52,8 @@ static void cally_stage_class_init (CallyStageClass *klass); + static void cally_stage_init (CallyStage *stage); + + /* AtkObject.h */ +-static G_CONST_RETURN gchar *cally_stage_get_name (AtkObject *obj); +-static G_CONST_RETURN gchar *cally_stage_get_description (AtkObject *obj); ++static const gchar *cally_stage_get_name (AtkObject *obj); ++static const gchar *cally_stage_get_description (AtkObject *obj); + static void cally_stage_real_initialize (AtkObject *obj, + gpointer data); + static AtkStateSet* cally_stage_ref_state_set (AtkObject *obj); +@@ -214,10 +214,10 @@ cally_stage_new (ClutterActor *actor) + } + + /* AtkObject.h */ +-static G_CONST_RETURN gchar * ++static const gchar * + cally_stage_get_name (AtkObject *obj) + { +- G_CONST_RETURN gchar *name = NULL; ++ const gchar *name = NULL; + + g_return_val_if_fail (CALLY_IS_STAGE (obj), NULL); + +@@ -230,10 +230,10 @@ cally_stage_get_name (AtkObject *obj) + return name; + } + +-static G_CONST_RETURN gchar * ++static const gchar * + cally_stage_get_description (AtkObject *obj) + { +- G_CONST_RETURN gchar *description = NULL; ++ const gchar *description = NULL; + + g_return_val_if_fail (CALLY_IS_STAGE (obj), NULL); + +diff --git a/clutter/cally/cally-text.c b/clutter/cally/cally-text.c +index 55b4ce7..ecaff6b 100644 +--- a/clutter/cally/cally-text.c ++++ b/clutter/cally/cally-text.c +@@ -80,7 +80,7 @@ static void cally_text_finalize (GObject *obj); + /* AtkObject */ + static void cally_text_real_initialize (AtkObject *obj, + gpointer data); +-static G_CONST_RETURN gchar * cally_text_get_name (AtkObject *obj); ++static const gchar * cally_text_get_name (AtkObject *obj); + static AtkStateSet* cally_text_ref_state_set (AtkObject *obj); + + /* atkaction */ +@@ -327,10 +327,10 @@ cally_text_real_initialize(AtkObject *obj, + obj->role = ATK_ROLE_TEXT; + } + +-static G_CONST_RETURN gchar * ++static const gchar * + cally_text_get_name (AtkObject *obj) + { +- G_CONST_RETURN gchar *name; ++ const gchar *name; + + g_return_val_if_fail (CALLY_IS_ACTOR (obj), NULL); + +diff --git a/clutter/cally/cally-texture.c b/clutter/cally/cally-texture.c +index 8b2508f..f1cd1b4 100644 +--- a/clutter/cally/cally-texture.c ++++ b/clutter/cally/cally-texture.c +@@ -42,7 +42,7 @@ static void cally_texture_init (CallyTexture *texture); + /* AtkObject */ + static void cally_texture_real_initialize (AtkObject *obj, + gpointer data); +-static G_CONST_RETURN gchar *cally_texture_get_description (AtkObject *obj); ++static const gchar *cally_texture_get_description (AtkObject *obj); + + + G_DEFINE_TYPE (CallyTexture, cally_texture, CALLY_TYPE_ACTOR) +@@ -100,10 +100,10 @@ cally_texture_real_initialize (AtkObject *obj, + obj->role = ATK_ROLE_IMAGE; + } + +-static G_CONST_RETURN gchar * ++static const gchar * + cally_texture_get_description (AtkObject *obj) + { +- G_CONST_RETURN gchar *description = NULL; ++ const gchar *description = NULL; + + g_return_val_if_fail (CALLY_IS_TEXTURE (obj), NULL); + +diff --git a/clutter/cally/cally-util.c b/clutter/cally/cally-util.c +index 25ba58a..2d371c4 100644 +--- a/clutter/cally/cally-util.c ++++ b/clutter/cally/cally-util.c +@@ -62,8 +62,8 @@ static guint cally_util_add_key_event_listener (AtkKeySnoopF + gpointer data); + static void cally_util_remove_key_event_listener (guint remove_listener); + static AtkObject* cally_util_get_root (void); +-static G_CONST_RETURN gchar *cally_util_get_toolkit_name (void); +-static G_CONST_RETURN gchar *cally_util_get_toolkit_version (void); ++static const gchar *cally_util_get_toolkit_name (void); ++static const gchar *cally_util_get_toolkit_version (void); + + /* private */ + static void _listener_info_destroy (gpointer data); +@@ -162,13 +162,13 @@ cally_util_get_root (void) + return root; + } + +-static G_CONST_RETURN gchar * ++static const gchar * + cally_util_get_toolkit_name (void) + { + return "CALLY"; + } + +-static G_CONST_RETURN gchar * ++static const gchar * + cally_util_get_toolkit_version (void) + { + /* +-- +1.7.5.4 + diff --git a/0004-clutter-Use-const-instead-G_CONST_RETURN.patch b/0004-clutter-Use-const-instead-G_CONST_RETURN.patch new file mode 100644 index 0000000..1c4f3cc --- /dev/null +++ b/0004-clutter-Use-const-instead-G_CONST_RETURN.patch @@ -0,0 +1,743 @@ +From a8af207ddcf535f9b1d0a2e99999a9d68b06ea60 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Javier=20Jard=C3=B3n?= +Date: Wed, 8 Jun 2011 18:45:52 +0100 +Subject: [PATCH 4/4] clutter: Use const instead G_CONST_RETURN + +https://bugzilla.gnome.org/show_bug.cgi?id=652129 +--- + clutter/clutter-actor-meta-private.h | 2 +- + clutter/clutter-actor-meta.c | 4 ++-- + clutter/clutter-actor-meta.h | 2 +- + clutter/clutter-actor-private.h | 2 +- + clutter/clutter-actor.c | 4 ++-- + clutter/clutter-actor.h | 2 +- + clutter/clutter-animator.c | 2 +- + clutter/clutter-animator.h | 2 +- + clutter/clutter-backend.c | 2 +- + clutter/clutter-backend.h | 2 +- + clutter/clutter-binding-pool.c | 2 +- + clutter/clutter-binding-pool.h | 2 +- + clutter/clutter-color.c | 4 ++-- + clutter/clutter-color.h | 4 ++-- + clutter/clutter-event.c | 2 +- + clutter/clutter-event.h | 2 +- + clutter/clutter-input-device.c | 2 +- + clutter/clutter-input-device.h | 2 +- + clutter/clutter-interval.c | 2 +- + clutter/clutter-interval.h | 2 +- + clutter/clutter-model.c | 2 +- + clutter/clutter-model.h | 2 +- + clutter/clutter-private.h | 2 +- + clutter/clutter-script.c | 2 +- + clutter/clutter-script.h | 2 +- + clutter/clutter-scriptable.c | 2 +- + clutter/clutter-scriptable.h | 2 +- + clutter/clutter-shader-types.c | 6 +++--- + clutter/clutter-shader-types.h | 6 +++--- + clutter/clutter-shader.c | 4 ++-- + clutter/clutter-shader.h | 4 ++-- + clutter/clutter-stage.c | 2 +- + clutter/clutter-stage.h | 2 +- + clutter/clutter-state.c | 8 ++++---- + clutter/clutter-state.h | 8 ++++---- + clutter/clutter-text.c | 4 ++-- + clutter/clutter-text.h | 4 ++-- + clutter/clutter-units.c | 2 +- + clutter/clutter-units.h | 2 +- + clutter/clutter-util.c | 2 +- + clutter/glx/clutter-backend-glx.c | 2 +- + clutter/x11/clutter-backend-x11.c | 2 +- + clutter/x11/clutter-x11.h | 2 +- + 43 files changed, 61 insertions(+), 61 deletions(-) + +diff --git a/clutter/clutter-actor-meta-private.h b/clutter/clutter-actor-meta-private.h +index e97d8f1..02396eb 100644 +--- a/clutter/clutter-actor-meta-private.h ++++ b/clutter/clutter-actor-meta-private.h +@@ -56,7 +56,7 @@ void _clutter_meta_group_add_meta (ClutterMetaGroup *group, + ClutterActorMeta *meta); + void _clutter_meta_group_remove_meta (ClutterMetaGroup *group, + ClutterActorMeta *meta); +-G_CONST_RETURN GList *_clutter_meta_group_peek_metas (ClutterMetaGroup *group); ++const GList * _clutter_meta_group_peek_metas (ClutterMetaGroup *group); + void _clutter_meta_group_clear_metas (ClutterMetaGroup *group); + ClutterActorMeta * _clutter_meta_group_get_meta (ClutterMetaGroup *group, + const gchar *name); +diff --git a/clutter/clutter-actor-meta.c b/clutter/clutter-actor-meta.c +index 9a6ac5e..f823268 100644 +--- a/clutter/clutter-actor-meta.c ++++ b/clutter/clutter-actor-meta.c +@@ -278,7 +278,7 @@ clutter_actor_meta_set_name (ClutterActorMeta *meta, + * + * Since: 1.4 + */ +-G_CONST_RETURN gchar * ++const gchar * + clutter_actor_meta_get_name (ClutterActorMeta *meta) + { + g_return_val_if_fail (CLUTTER_IS_ACTOR_META (meta), NULL); +@@ -467,7 +467,7 @@ _clutter_meta_group_remove_meta (ClutterMetaGroup *group, + * + * Return value: a const pointer to the #GList of #ClutterActorMeta + */ +-G_CONST_RETURN GList * ++const GList * + _clutter_meta_group_peek_metas (ClutterMetaGroup *group) + { + return group->meta; +diff --git a/clutter/clutter-actor-meta.h b/clutter/clutter-actor-meta.h +index 04ef717..db5f9d4 100644 +--- a/clutter/clutter-actor-meta.h ++++ b/clutter/clutter-actor-meta.h +@@ -92,7 +92,7 @@ GType clutter_actor_meta_get_type (void) G_GNUC_CONST; + + void clutter_actor_meta_set_name (ClutterActorMeta *meta, + const gchar *name); +-G_CONST_RETURN gchar *clutter_actor_meta_get_name (ClutterActorMeta *meta); ++const gchar * clutter_actor_meta_get_name (ClutterActorMeta *meta); + void clutter_actor_meta_set_enabled (ClutterActorMeta *meta, + gboolean is_enabled); + gboolean clutter_actor_meta_get_enabled (ClutterActorMeta *meta); +diff --git a/clutter/clutter-actor-private.h b/clutter/clutter-actor-private.h +index b598008..b2b182e 100644 +--- a/clutter/clutter-actor-private.h ++++ b/clutter/clutter-actor-private.h +@@ -157,7 +157,7 @@ gboolean _clutter_actor_set_default_paint_volume (ClutterActor *self, + GType check_gtype, + ClutterPaintVolume *volume); + +-G_CONST_RETURN gchar *_clutter_actor_get_debug_name (ClutterActor *self); ++const gchar *_clutter_actor_get_debug_name (ClutterActor *self); + + void _clutter_actor_push_clone_paint (void); + void _clutter_actor_pop_clone_paint (void); +diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c +index f113964..6d0f1b3 100644 +--- a/clutter/clutter-actor.c ++++ b/clutter/clutter-actor.c +@@ -674,7 +674,7 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE (ClutterActor, + G_IMPLEMENT_INTERFACE (ATK_TYPE_IMPLEMENTOR, + atk_implementor_iface_init)); + +-G_CONST_RETURN gchar * ++const gchar * + _clutter_actor_get_debug_name (ClutterActor *actor) + { + return actor->priv->name != NULL ? actor->priv->name +@@ -7158,7 +7158,7 @@ clutter_actor_set_name (ClutterActor *self, + * Return value: the name of the actor, or %NULL. The returned string is + * owned by the actor and should not be modified or freed. + */ +-G_CONST_RETURN gchar * ++const gchar * + clutter_actor_get_name (ClutterActor *self) + { + g_return_val_if_fail (CLUTTER_IS_ACTOR (self), NULL); +diff --git a/clutter/clutter-actor.h b/clutter/clutter-actor.h +index 6b05d13..83cf3c1 100644 +--- a/clutter/clutter-actor.h ++++ b/clutter/clutter-actor.h +@@ -426,7 +426,7 @@ gboolean clutter_actor_get_paint_visibility (ClutterActor + + void clutter_actor_set_name (ClutterActor *self, + const gchar *name); +-G_CONST_RETURN gchar *clutter_actor_get_name (ClutterActor *self); ++const gchar * clutter_actor_get_name (ClutterActor *self); + + guint32 clutter_actor_get_gid (ClutterActor *self); + void clutter_actor_set_clip (ClutterActor *self, +diff --git a/clutter/clutter-animator.c b/clutter/clutter-animator.c +index 0ba707c..5164a94 100644 +--- a/clutter/clutter-animator.c ++++ b/clutter/clutter-animator.c +@@ -2020,7 +2020,7 @@ clutter_animator_key_get_object (const ClutterAnimatorKey *key) + * + * Since: 1.2 + */ +-G_CONST_RETURN gchar * ++const gchar * + clutter_animator_key_get_property_name (const ClutterAnimatorKey *key) + { + g_return_val_if_fail (key != NULL, NULL); +diff --git a/clutter/clutter-animator.h b/clutter/clutter-animator.h +index 1f46799..bcba89f 100644 +--- a/clutter/clutter-animator.h ++++ b/clutter/clutter-animator.h +@@ -161,7 +161,7 @@ void clutter_animator_property_set_interpolation (ClutterAnimato + + GType clutter_animator_key_get_type (void) G_GNUC_CONST; + GObject * clutter_animator_key_get_object (const ClutterAnimatorKey *key); +-G_CONST_RETURN gchar *clutter_animator_key_get_property_name (const ClutterAnimatorKey *key); ++const gchar * clutter_animator_key_get_property_name (const ClutterAnimatorKey *key); + GType clutter_animator_key_get_property_type (const ClutterAnimatorKey *key); + gulong clutter_animator_key_get_mode (const ClutterAnimatorKey *key); + gdouble clutter_animator_key_get_progress (const ClutterAnimatorKey *key); +diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c +index e0a79bb..3e2f99f 100644 +--- a/clutter/clutter-backend.c ++++ b/clutter/clutter-backend.c +@@ -879,7 +879,7 @@ clutter_backend_set_font_name (ClutterBackend *backend, + * + * Deprecated: 1.4: Use #ClutterSettings:font-name instead + */ +-G_CONST_RETURN gchar * ++const gchar * + clutter_backend_get_font_name (ClutterBackend *backend) + { + ClutterBackendPrivate *priv; +diff --git a/clutter/clutter-backend.h b/clutter/clutter-backend.h +index 1d18b32..5d8288f 100644 +--- a/clutter/clutter-backend.h ++++ b/clutter/clutter-backend.h +@@ -71,7 +71,7 @@ void clutter_backend_set_double_click_distance (ClutterBa + guint clutter_backend_get_double_click_distance (ClutterBackend *backend); + void clutter_backend_set_font_name (ClutterBackend *backend, + const gchar *font_name); +-G_CONST_RETURN gchar * clutter_backend_get_font_name (ClutterBackend *backend); ++const gchar * clutter_backend_get_font_name (ClutterBackend *backend); + #endif /* CLUTTER_DISABLE_DEPRECATED */ + + gdouble clutter_backend_get_resolution (ClutterBackend *backend); +diff --git a/clutter/clutter-binding-pool.c b/clutter/clutter-binding-pool.c +index 11fbf18..fa2e9a2 100644 +--- a/clutter/clutter-binding-pool.c ++++ b/clutter/clutter-binding-pool.c +@@ -723,7 +723,7 @@ clutter_binding_pool_override_closure (ClutterBindingPool *pool, + * + * Since: 1.0 + */ +-G_CONST_RETURN gchar * ++const gchar * + clutter_binding_pool_find_action (ClutterBindingPool *pool, + guint key_val, + ClutterModifierType modifiers) +diff --git a/clutter/clutter-binding-pool.h b/clutter/clutter-binding-pool.h +index 7fc7408..77c425c 100644 +--- a/clutter/clutter-binding-pool.h ++++ b/clutter/clutter-binding-pool.h +@@ -98,7 +98,7 @@ void clutter_binding_pool_override_closure (ClutterBindingPool + ClutterModifierType modifiers, + GClosure *closure); + +-G_CONST_RETURN gchar *clutter_binding_pool_find_action (ClutterBindingPool *pool, ++const gchar * clutter_binding_pool_find_action (ClutterBindingPool *pool, + guint key_val, + ClutterModifierType modifiers); + void clutter_binding_pool_remove_action (ClutterBindingPool *pool, +diff --git a/clutter/clutter-color.c b/clutter/clutter-color.c +index 3944c89..e8ecf44 100644 +--- a/clutter/clutter-color.c ++++ b/clutter/clutter-color.c +@@ -115,7 +115,7 @@ static const ClutterColor const static_colors[] = { + * + * Since: 1.6 + */ +-G_CONST_RETURN ClutterColor * ++const ClutterColor * + clutter_color_get_static (ClutterStaticColor color) + { + g_return_val_if_fail (color >= CLUTTER_COLOR_WHITE && +@@ -1055,7 +1055,7 @@ clutter_value_set_color (GValue *value, + * + * Since: 0.8.4 + */ +-G_CONST_RETURN ClutterColor * ++const ClutterColor * + clutter_value_get_color (const GValue *value) + { + g_return_val_if_fail (CLUTTER_VALUE_HOLDS_COLOR (value), NULL); +diff --git a/clutter/clutter-color.h b/clutter/clutter-color.h +index 3649ce8..f36878d 100644 +--- a/clutter/clutter-color.h ++++ b/clutter/clutter-color.h +@@ -140,7 +140,7 @@ struct _ClutterParamSpecColor + + void clutter_value_set_color (GValue *value, + const ClutterColor *color); +-G_CONST_RETURN ClutterColor *clutter_value_get_color (const GValue *value); ++const ClutterColor *clutter_value_get_color (const GValue *value); + + GType clutter_param_color_get_type (void) G_GNUC_CONST; + GParamSpec *clutter_param_spec_color (const gchar *name, +@@ -254,7 +254,7 @@ typedef enum { /*< prefix=CLUTTER_COLOR >*/ + CLUTTER_COLOR_TRANSPARENT + } ClutterStaticColor; + +-G_CONST_RETURN ClutterColor *clutter_color_get_static (ClutterStaticColor color); ++const ClutterColor *clutter_color_get_static (ClutterStaticColor color); + + G_END_DECLS + +diff --git a/clutter/clutter-event.c b/clutter/clutter-event.c +index 1b0f563..ddb075b 100644 +--- a/clutter/clutter-event.c ++++ b/clutter/clutter-event.c +@@ -943,7 +943,7 @@ clutter_get_current_event_time (void) + * + * Since: 1.2 + */ +-G_CONST_RETURN ClutterEvent * ++const ClutterEvent * + clutter_get_current_event (void) + { + ClutterMainContext *context = _clutter_context_get_default (); +diff --git a/clutter/clutter-event.h b/clutter/clutter-event.h +index ebaa880..a6d5e10 100644 +--- a/clutter/clutter-event.h ++++ b/clutter/clutter-event.h +@@ -430,7 +430,7 @@ void clutter_event_set_device (ClutterEvent + guint32 clutter_keysym_to_unicode (guint keyval); + + guint32 clutter_get_current_event_time (void); +-G_CONST_RETURN ClutterEvent *clutter_get_current_event (void); ++const ClutterEvent * clutter_get_current_event (void); + + G_END_DECLS + +diff --git a/clutter/clutter-input-device.c b/clutter/clutter-input-device.c +index 3f44b97..135a487 100644 +--- a/clutter/clutter-input-device.c ++++ b/clutter/clutter-input-device.c +@@ -785,7 +785,7 @@ clutter_input_device_get_pointer_stage (ClutterInputDevice *device) + * + * Since: 1.2 + */ +-G_CONST_RETURN gchar * ++const gchar * + clutter_input_device_get_device_name (ClutterInputDevice *device) + { + g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device), NULL); +diff --git a/clutter/clutter-input-device.h b/clutter/clutter-input-device.h +index 6772a39..7b3a75b 100644 +--- a/clutter/clutter-input-device.h ++++ b/clutter/clutter-input-device.h +@@ -135,7 +135,7 @@ void clutter_input_device_get_device_coords (ClutterInputDev + gint *y); + ClutterActor * clutter_input_device_get_pointer_actor (ClutterInputDevice *device); + ClutterStage * clutter_input_device_get_pointer_stage (ClutterInputDevice *device); +-G_CONST_RETURN gchar * clutter_input_device_get_device_name (ClutterInputDevice *device); ++const gchar * clutter_input_device_get_device_name (ClutterInputDevice *device); + ClutterInputMode clutter_input_device_get_device_mode (ClutterInputDevice *device); + gboolean clutter_input_device_get_has_cursor (ClutterInputDevice *device); + void clutter_input_device_set_enabled (ClutterInputDevice *device, +diff --git a/clutter/clutter-interval.c b/clutter/clutter-interval.c +index 9d14601..2ae3c1c 100644 +--- a/clutter/clutter-interval.c ++++ b/clutter/clutter-interval.c +@@ -918,7 +918,7 @@ clutter_interval_compute_value (ClutterInterval *interval, + * + * Since: 1.4 + */ +-G_CONST_RETURN GValue * ++const GValue * + clutter_interval_compute (ClutterInterval *interval, + gdouble factor) + { +diff --git a/clutter/clutter-interval.h b/clutter/clutter-interval.h +index 9346c72..0cc6461 100644 +--- a/clutter/clutter-interval.h ++++ b/clutter/clutter-interval.h +@@ -154,7 +154,7 @@ gboolean clutter_interval_compute_value (ClutterInterval *interval, + gdouble factor, + GValue *value); + +-G_CONST_RETURN GValue *clutter_interval_compute (ClutterInterval *interval, ++const GValue *clutter_interval_compute (ClutterInterval *interval, + gdouble factor); + + void clutter_interval_register_progress_func (GType value_type, +diff --git a/clutter/clutter-model.c b/clutter/clutter-model.c +index 880b73a..644e55e 100644 +--- a/clutter/clutter-model.c ++++ b/clutter/clutter-model.c +@@ -1382,7 +1382,7 @@ clutter_model_remove (ClutterModel *model, + * + * Since: 0.6 + */ +-G_CONST_RETURN gchar * ++const gchar * + clutter_model_get_column_name (ClutterModel *model, + guint column) + { +diff --git a/clutter/clutter-model.h b/clutter/clutter-model.h +index a49ddbb..a8217ba 100644 +--- a/clutter/clutter-model.h ++++ b/clutter/clutter-model.h +@@ -226,7 +226,7 @@ void clutter_model_remove (ClutterModel *model, + + guint clutter_model_get_n_rows (ClutterModel *model); + guint clutter_model_get_n_columns (ClutterModel *model); +-G_CONST_RETURN gchar *clutter_model_get_column_name (ClutterModel *model, ++const gchar * clutter_model_get_column_name (ClutterModel *model, + guint column); + GType clutter_model_get_column_type (ClutterModel *model, + guint column); +diff --git a/clutter/clutter-private.h b/clutter/clutter-private.h +index ed64ae4..9939997 100644 +--- a/clutter/clutter-private.h ++++ b/clutter/clutter-private.h +@@ -195,7 +195,7 @@ ClutterActor * _clutter_context_peek_shader_stack (void); + guint32 _clutter_context_acquire_id (gpointer key); + void _clutter_context_release_id (guint32 id_); + +-G_CONST_RETURN gchar *_clutter_gettext (const gchar *str); ++const gchar *_clutter_gettext (const gchar *str); + + gboolean _clutter_feature_init (GError **error); + +diff --git a/clutter/clutter-script.c b/clutter/clutter-script.c +index 5ba91d6..2c9e5af 100644 +--- a/clutter/clutter-script.c ++++ b/clutter/clutter-script.c +@@ -799,7 +799,7 @@ clutter_script_get_type_from_name (ClutterScript *script, + * + * Since: 0.6 + */ +-G_CONST_RETURN gchar * ++const gchar * + clutter_get_script_id (GObject *gobject) + { + g_return_val_if_fail (G_IS_OBJECT (gobject), NULL); +diff --git a/clutter/clutter-script.h b/clutter/clutter-script.h +index 2b9fe79..58702dd 100644 +--- a/clutter/clutter-script.h ++++ b/clutter/clutter-script.h +@@ -168,7 +168,7 @@ void clutter_script_ensure_objects (ClutterScript *script); + GType clutter_script_get_type_from_name (ClutterScript *script, + const gchar *type_name); + +-G_CONST_RETURN gchar *clutter_get_script_id (GObject *gobject); ++const gchar * clutter_get_script_id (GObject *gobject); + + void clutter_script_connect_signals (ClutterScript *script, + gpointer user_data); +diff --git a/clutter/clutter-scriptable.c b/clutter/clutter-scriptable.c +index 501f1df..e4ffdc4 100644 +--- a/clutter/clutter-scriptable.c ++++ b/clutter/clutter-scriptable.c +@@ -104,7 +104,7 @@ clutter_scriptable_set_id (ClutterScriptable *scriptable, + * + * Since: 0.6 + */ +-G_CONST_RETURN gchar * ++const gchar * + clutter_scriptable_get_id (ClutterScriptable *scriptable) + { + ClutterScriptableIface *iface; +diff --git a/clutter/clutter-scriptable.h b/clutter/clutter-scriptable.h +index e2c5ff1..f47aac4 100644 +--- a/clutter/clutter-scriptable.h ++++ b/clutter/clutter-scriptable.h +@@ -91,7 +91,7 @@ GType clutter_scriptable_get_type (void) G_GNUC_CONST + + void clutter_scriptable_set_id (ClutterScriptable *scriptable, + const gchar *id_); +-G_CONST_RETURN gchar *clutter_scriptable_get_id (ClutterScriptable *scriptable); ++const gchar * clutter_scriptable_get_id (ClutterScriptable *scriptable); + gboolean clutter_scriptable_parse_custom_node (ClutterScriptable *scriptable, + ClutterScript *script, + GValue *value, +diff --git a/clutter/clutter-shader-types.c b/clutter/clutter-shader-types.c +index 9ed3998..f18e344 100644 +--- a/clutter/clutter-shader-types.c ++++ b/clutter/clutter-shader-types.c +@@ -485,7 +485,7 @@ clutter_value_set_shader_matrix (GValue *value, + * + * Since: 0.8 + */ +-G_CONST_RETURN gfloat * ++const gfloat * + clutter_value_get_shader_float (const GValue *value, + gsize *length) + { +@@ -517,7 +517,7 @@ clutter_value_get_shader_float (const GValue *value, + * + * Since: 0.8 + */ +-G_CONST_RETURN gint * ++const gint * + clutter_value_get_shader_int (const GValue *value, + gsize *length) + { +@@ -549,7 +549,7 @@ clutter_value_get_shader_int (const GValue *value, + * + * Since: 0.8 + */ +-G_CONST_RETURN gfloat * ++const gfloat * + clutter_value_get_shader_matrix (const GValue *value, + gsize *length) + { +diff --git a/clutter/clutter-shader-types.h b/clutter/clutter-shader-types.h +index 1b48426..c5d30d1 100644 +--- a/clutter/clutter-shader-types.h ++++ b/clutter/clutter-shader-types.h +@@ -84,11 +84,11 @@ void clutter_value_set_shader_int (GValue *value, + void clutter_value_set_shader_matrix (GValue *value, + gint size, + const gfloat *matrix); +-G_CONST_RETURN gfloat * clutter_value_get_shader_float (const GValue *value, ++const gfloat * clutter_value_get_shader_float (const GValue *value, + gsize *length); +-G_CONST_RETURN gint * clutter_value_get_shader_int (const GValue *value, ++const gint * clutter_value_get_shader_int (const GValue *value, + gsize *length); +-G_CONST_RETURN gfloat * clutter_value_get_shader_matrix (const GValue *value, ++const gfloat * clutter_value_get_shader_matrix (const GValue *value, + gsize *length); + + G_END_DECLS +diff --git a/clutter/clutter-shader.c b/clutter/clutter-shader.c +index e2109c7..d7a9867 100644 +--- a/clutter/clutter-shader.c ++++ b/clutter/clutter-shader.c +@@ -815,7 +815,7 @@ _clutter_shader_release_all (void) + * + * Since: 0.6 + */ +-G_CONST_RETURN gchar * ++const gchar * + clutter_shader_get_fragment_source (ClutterShader *shader) + { + g_return_val_if_fail (CLUTTER_IS_SHADER (shader), NULL); +@@ -835,7 +835,7 @@ clutter_shader_get_fragment_source (ClutterShader *shader) + * + * Since: 0.6 + */ +-G_CONST_RETURN gchar * ++const gchar * + clutter_shader_get_vertex_source (ClutterShader *shader) + { + g_return_val_if_fail (CLUTTER_IS_SHADER (shader), NULL); +diff --git a/clutter/clutter-shader.h b/clutter/clutter-shader.h +index ef72192..10011a7 100644 +--- a/clutter/clutter-shader.h ++++ b/clutter/clutter-shader.h +@@ -117,8 +117,8 @@ void clutter_shader_set_fragment_source (ClutterShader + const gchar *data, + gssize length); + +-G_CONST_RETURN gchar *clutter_shader_get_vertex_source (ClutterShader *shader); +-G_CONST_RETURN gchar *clutter_shader_get_fragment_source (ClutterShader *shader); ++const gchar *clutter_shader_get_vertex_source (ClutterShader *shader); ++const gchar *clutter_shader_get_fragment_source (ClutterShader *shader); + + void clutter_shader_set_uniform (ClutterShader *shader, + const gchar *name, +diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c +index de31aef..bc388b5 100644 +--- a/clutter/clutter-stage.c ++++ b/clutter/clutter-stage.c +@@ -2367,7 +2367,7 @@ clutter_stage_set_title (ClutterStage *stage, + * + * Since: 0.4 + **/ +-G_CONST_RETURN gchar * ++const gchar * + clutter_stage_get_title (ClutterStage *stage) + { + g_return_val_if_fail (CLUTTER_IS_STAGE (stage), NULL); +diff --git a/clutter/clutter-stage.h b/clutter/clutter-stage.h +index e9c8681..3098c79 100644 +--- a/clutter/clutter-stage.h ++++ b/clutter/clutter-stage.h +@@ -218,7 +218,7 @@ gboolean clutter_stage_event (ClutterStage *stage, + + void clutter_stage_set_title (ClutterStage *stage, + const gchar *title); +-G_CONST_RETURN gchar *clutter_stage_get_title (ClutterStage *stage); ++const gchar * clutter_stage_get_title (ClutterStage *stage); + void clutter_stage_set_user_resizable (ClutterStage *stage, + gboolean resizable); + gboolean clutter_stage_get_user_resizable (ClutterStage *stage); +diff --git a/clutter/clutter-state.c b/clutter/clutter-state.c +index fb875e3..0f38668 100644 +--- a/clutter/clutter-state.c ++++ b/clutter/clutter-state.c +@@ -1730,7 +1730,7 @@ clutter_state_key_get_object (const ClutterStateKey *state_key) + * + * Since: 1.4 + */ +-G_CONST_RETURN gchar * ++const gchar * + clutter_state_key_get_property_name (const ClutterStateKey *state_key) + { + g_return_val_if_fail (state_key, NULL); +@@ -1751,7 +1751,7 @@ clutter_state_key_get_property_name (const ClutterStateKey *state_key) + * + * Since: 1.4 + */ +-G_CONST_RETURN gchar * ++const gchar * + clutter_state_key_get_source_state_name (const ClutterStateKey *state_key) + { + g_return_val_if_fail (state_key, NULL); +@@ -1775,7 +1775,7 @@ clutter_state_key_get_source_state_name (const ClutterStateKey *state_key) + * + * Since: 1.4 + */ +-G_CONST_RETURN gchar * ++const gchar * + clutter_state_key_get_target_state_name (const ClutterStateKey *state_key) + { + g_return_val_if_fail (state_key, NULL); +@@ -1934,7 +1934,7 @@ clutter_state_get_duration (ClutterState *state, + * + * Since: 1.4 + */ +-G_CONST_RETURN gchar * ++const gchar * + clutter_state_get_state (ClutterState *state) + { + g_return_val_if_fail (CLUTTER_IS_STATE (state), NULL); +diff --git a/clutter/clutter-state.h b/clutter/clutter-state.h +index e885a40..79342c7 100644 +--- a/clutter/clutter-state.h ++++ b/clutter/clutter-state.h +@@ -138,7 +138,7 @@ void clutter_state_set_animator (ClutterState *state, + ClutterAnimator * clutter_state_get_animator (ClutterState *state, + const gchar *source_state_name, + const gchar *target_state_name); +-G_CONST_RETURN gchar *clutter_state_get_state (ClutterState *state); ++const gchar * clutter_state_get_state (ClutterState *state); + + /* + * ClutterStateKey +@@ -152,9 +152,9 @@ gboolean clutter_state_key_get_value (const ClutterStat + GValue *value); + GType clutter_state_key_get_property_type (const ClutterStateKey *key); + GObject * clutter_state_key_get_object (const ClutterStateKey *state_key); +-G_CONST_RETURN gchar *clutter_state_key_get_property_name (const ClutterStateKey *state_key); +-G_CONST_RETURN gchar *clutter_state_key_get_source_state_name (const ClutterStateKey *state_key); +-G_CONST_RETURN gchar *clutter_state_key_get_target_state_name (const ClutterStateKey *state_key); ++const gchar * clutter_state_key_get_property_name (const ClutterStateKey *state_key); ++const gchar * clutter_state_key_get_source_state_name (const ClutterStateKey *state_key); ++const gchar * clutter_state_key_get_target_state_name (const ClutterStateKey *state_key); + + G_END_DECLS + +diff --git a/clutter/clutter-text.c b/clutter/clutter-text.c +index 4566cc3..744b294 100644 +--- a/clutter/clutter-text.c ++++ b/clutter/clutter-text.c +@@ -4035,7 +4035,7 @@ clutter_text_get_font_description (ClutterText *self) + * + * Since: 1.0 + */ +-G_CONST_RETURN gchar * ++const gchar * + clutter_text_get_font_name (ClutterText *text) + { + g_return_val_if_fail (CLUTTER_IS_TEXT (text), NULL); +@@ -4140,7 +4140,7 @@ out: + * + * Since: 1.0 + */ +-G_CONST_RETURN gchar * ++const gchar * + clutter_text_get_text (ClutterText *self) + { + g_return_val_if_fail (CLUTTER_IS_TEXT (self), NULL); +diff --git a/clutter/clutter-text.h b/clutter/clutter-text.h +index 9edbbca..7430cc2 100644 +--- a/clutter/clutter-text.h ++++ b/clutter/clutter-text.h +@@ -103,7 +103,7 @@ ClutterActor * clutter_text_new_full (const gchar *f + ClutterActor * clutter_text_new_with_text (const gchar *font_name, + const gchar *text); + +-G_CONST_RETURN gchar *clutter_text_get_text (ClutterText *self); ++const gchar * clutter_text_get_text (ClutterText *self); + void clutter_text_set_text (ClutterText *self, + const gchar *text); + void clutter_text_set_markup (ClutterText *self, +@@ -114,7 +114,7 @@ void clutter_text_get_color (ClutterText *s + ClutterColor *color); + void clutter_text_set_font_name (ClutterText *self, + const gchar *font_name); +-G_CONST_RETURN gchar *clutter_text_get_font_name (ClutterText *self); ++const gchar *clutter_text_get_font_name (ClutterText *self); + void clutter_text_set_font_description (ClutterText *self, + PangoFontDescription *font_desc); + PangoFontDescription *clutter_text_get_font_description (ClutterText *self); +diff --git a/clutter/clutter-units.c b/clutter/clutter-units.c +index 422840a..808f830 100644 +--- a/clutter/clutter-units.c ++++ b/clutter/clutter-units.c +@@ -773,7 +773,7 @@ clutter_value_set_units (GValue *value, + * + * Since: 0.8 + */ +-G_CONST_RETURN ClutterUnits * ++const ClutterUnits * + clutter_value_get_units (const GValue *value) + { + g_return_val_if_fail (CLUTTER_VALUE_HOLDS_UNITS (value), NULL); +diff --git a/clutter/clutter-units.h b/clutter/clutter-units.h +index c75410c..8a29232 100644 +--- a/clutter/clutter-units.h ++++ b/clutter/clutter-units.h +@@ -181,7 +181,7 @@ GParamSpec * clutter_param_spec_units (const gchar *name, + + void clutter_value_set_units (GValue *value, + const ClutterUnits *units); +-G_CONST_RETURN ClutterUnits *clutter_value_get_units (const GValue *value); ++const ClutterUnits *clutter_value_get_units (const GValue *value); + + G_END_DECLS + +diff --git a/clutter/clutter-util.c b/clutter/clutter-util.c +index aa4056d..3713a24 100644 +--- a/clutter/clutter-util.c ++++ b/clutter/clutter-util.c +@@ -68,7 +68,7 @@ clutter_util_next_p2 (gint a) + * + * Return value: the translated string + */ +-G_CONST_RETURN gchar * ++const gchar * + _clutter_gettext (const gchar *str) + { + return g_dgettext (GETTEXT_PACKAGE, str); +diff --git a/clutter/glx/clutter-backend-glx.c b/clutter/glx/clutter-backend-glx.c +index 684ad29..18c3232 100644 +--- a/clutter/glx/clutter-backend-glx.c ++++ b/clutter/glx/clutter-backend-glx.c +@@ -59,7 +59,7 @@ static ClutterBackendGLX *backend_singleton = NULL; + + static gchar *clutter_vblank_name = NULL; + +-G_CONST_RETURN gchar* ++const gchar* + _clutter_backend_glx_get_vblank_method (void) + { + return clutter_vblank_name; +diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c +index c029500..e26c4a6 100644 +--- a/clutter/x11/clutter-backend-x11.c ++++ b/clutter/x11/clutter-backend-x11.c +@@ -1028,7 +1028,7 @@ clutter_x11_remove_filter (ClutterX11FilterFunc func, + * pointer to the internal list of input devices; the returned list is + * owned by Clutter and should not be modified or freed + */ +-G_CONST_RETURN GSList * ++const GSList * + clutter_x11_get_input_devices (void) + { + ClutterDeviceManager *manager; +diff --git a/clutter/x11/clutter-x11.h b/clutter/x11/clutter-x11.h +index 66611bd..262a546 100644 +--- a/clutter/x11/clutter-x11.h ++++ b/clutter/x11/clutter-x11.h +@@ -127,7 +127,7 @@ gboolean clutter_x11_has_event_retrieval (void); + ClutterStage *clutter_x11_get_stage_from_window (Window win); + + #ifndef CLUTTER_DISABLE_DEPRECATED +-G_CONST_RETURN GSList* clutter_x11_get_input_devices (void) G_GNUC_DEPRECATED; ++const GSList* clutter_x11_get_input_devices (void) G_GNUC_DEPRECATED; + #endif + + void clutter_x11_enable_xinput (void); +-- +1.7.5.4 + diff --git a/clutter.spec b/clutter.spec index 0e246ef..947e309 100644 --- a/clutter.spec +++ b/clutter.spec @@ -1,6 +1,6 @@ Name: clutter Version: 1.6.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Source software library for creating rich graphical user interfaces Group: Development/Libraries @@ -9,6 +9,11 @@ URL: http://www.clutter-project.org/ #VCS: git://git.clutter-project.org/clutter#master Source0: http://www.clutter-project.org/sources/%{name}/1.6/%{name}-%{version}.tar.bz2 +Patch1: 0001-docs-Use-const-instead-G_CONST_RETURN.patch +Patch2: 0002-cogl-Use-const-instead-G_CONST_RETURN.patch +Patch3: 0003-cally-Use-const-instead-G_CONST_RETURN.patch +Patch4: 0004-clutter-Use-const-instead-G_CONST_RETURN.patch + BuildRequires: glib2-devel mesa-libGL-devel pkgconfig pango-devel BuildRequires: cairo-gobject-devel gdk-pixbuf2-devel atk-devel BuildRequires: gobject-introspection-devel >= 0.9.6 @@ -53,6 +58,10 @@ This package contains documentation for clutter. %prep %setup -q +%patch1 -p1 -b .const-1 +%patch2 -p1 -b .const-2 +%patch3 -p1 -b .const-3 +%patch4 -p1 -b .const-4 %build (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; @@ -101,6 +110,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_datadir}/gtk-doc/html/cally %changelog +* Fri Jun 17 2011 Tomas Bzatek - 1.6.16-2 +- Fix G_CONST_RETURN usage + * Wed Jun 15 2011 Tomas Bzatek - 1.6.16-1 - Update to 1.6.16