File clutter-fixes-from-git.patch of Package clutter-gtk

Index: clutter-gtk-0.10.8/clutter-gtk/Makefile.am
===================================================================
--- clutter-gtk-0.10.8.orig/clutter-gtk/Makefile.am
+++ clutter-gtk-0.10.8/clutter-gtk/Makefile.am
@@ -48,7 +48,7 @@ GtkClutter-@CLUTTER_GTK_API_VERSION@.gir
 	$(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
 		--namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
 		--strip-prefix=GtkClutter \
-		$(INCLUDES) $(AM_CPPFLAGS) \
+		$(INCLUDES) $(AM_CPPFLAGS) $(GTK_CFLAGS) $(CLUTTER_CFLAGS) \
 		--add-include-path=$(srcdir) --add-include=path=. \
 		--include=Clutter-1.0 \
 		--include=GdkPixbuf-2.0 \
Index: clutter-gtk-0.10.8/clutter-gtk/Makefile.in
===================================================================
--- clutter-gtk-0.10.8.orig/clutter-gtk/Makefile.in
+++ clutter-gtk-0.10.8/clutter-gtk/Makefile.in
@@ -744,7 +744,7 @@ uninstall-am: uninstall-cluttergtkheader
 @HAVE_INTROSPECTION_TRUE@	$(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
 @HAVE_INTROSPECTION_TRUE@		--namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
 @HAVE_INTROSPECTION_TRUE@		--strip-prefix=GtkClutter \
-@HAVE_INTROSPECTION_TRUE@		$(INCLUDES) $(AM_CPPFLAGS) \
+@HAVE_INTROSPECTION_TRUE@		$(INCLUDES) $(AM_CPPFLAGS) $(GTK_CFLAGS) $(CLUTTER_CFLAGS) \
 @HAVE_INTROSPECTION_TRUE@		--add-include-path=$(srcdir) --add-include=path=. \
 @HAVE_INTROSPECTION_TRUE@		--include=Clutter-1.0 \
 @HAVE_INTROSPECTION_TRUE@		--include=GdkPixbuf-2.0 \
Index: clutter-gtk-0.10.8/clutter-gtk/gtk-clutter-util.c
===================================================================
--- clutter-gtk-0.10.8.orig/clutter-gtk/gtk-clutter-util.c
+++ clutter-gtk-0.10.8/clutter-gtk/gtk-clutter-util.c
@@ -603,8 +603,9 @@ gtk_clutter_texture_set_from_icon_name (
 
 /**
  * gtk_clutter_init:
- * @argc: pointer to the arguments count, or %NULL
- * @argv: pointer to the arguments vector, or %NULL
+ * @argc: (inout): pointer to the arguments count, or %NULL
+ * @argv: (array length=argc) (inout) (allow-none): pointer to the
+ *   arguments vector, or %NULL
  *
  * This function should be called instead of clutter_init() and
  * gtk_init().
@@ -633,17 +634,18 @@ gtk_clutter_init (int    *argc,
 
 /**
  * gtk_clutter_init_with_args:
- * @argc: a pointer to the number of command line arguments.
- * @argv: a pointer to the array of command line arguments.
- * @parameter_string: a string which is displayed in
- *    the first line of <option>--help</option> output, after
- *    <literal><replaceable>programname</replaceable> [OPTION...]</literal>
- * @entries: a %NULL-terminated array of #GOptionEntry<!-- -->s
- *    describing the options of your program
- * @translation_domain: a translation domain to use for translating
- *    the <option>--help</option> output for the options in @entries
- *    with gettext(), or %NULL
- * @error: a return location for errors
+ * @argc: (inout): a pointer to the number of command line arguments.
+ * @argv: (array length=argc) (inout) (allow-none): a pointer to the array
+ *   of command line arguments.
+ * @parameter_string: (allow-none): a string which is displayed in
+ *   the first line of <option>--help</option> output, after
+ *   <literal><replaceable>programname</replaceable> [OPTION...]</literal>
+ * @entries: (allow-none): a %NULL-terminated array of #GOptionEntry<!-- -->s
+ *   describing the options of your program, or %NULL
+ * @translation_domain: (allow-none): a translation domain to use for
+ *   translating the <option>--help</option> output for the options
+ *   in @entries with gettext(), or %NULL
+ * @error: (allow-none): a return location for errors, or %NULL
  *
  * This function should be called instead of clutter_init() and
  * gtk_init_with_args().