clutter-gtk-1.0: switch to GIR

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 42b4ed5efaaefaef3e05025bc199407420479f79..05bde85cabb897ce73065f9f721f6299e246c00a 100644 (file)
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -270,7 +270,7 @@ clutter-gtk-0.10:
        $(GENVAPI) --library $(srcdir)/clutter-gtk-0.10 $(PACKAGESDIR)/clutter-gtk-0.10/clutter-gtk-0.10.gi
 
 clutter-gtk-1.0:
-       $(GENVAPI) --library $(srcdir)/clutter-gtk-1.0 $(PACKAGESDIR)/clutter-gtk-1.0/clutter-gtk-1.0.gi
+       $(GENVAPI) --library $(srcdir)/clutter-gtk-1.0 --metadatadir $(METADATADIR) $(METADATADIR)/GtkClutter-1.0-custom.vala --pkg clutter-1.0 --pkg gtk+-3.0 --pkg cogl-pango-1.0 $(GIRDIR)/GtkClutter-1.0.gir
 
 cogl-1.0:
        $(GENVAPI) --library $(srcdir)/cogl-1.0 $(PACKAGESDIR)/cogl-1.0/cogl-1.0-custom.vala $(PACKAGESDIR)/cogl-1.0/cogl-1.0.gi

diff --git a/vapi/clutter-gtk-1.0.vapi b/vapi/clutter-gtk-1.0.vapi
index 3d5800ef0ca36a0385f9be60541013f8a66713a5..07886ffc042e949b0050640e5de10de77e0c2c2c 100644 (file)
--- a/vapi/clutter-gtk-1.0.vapi
+++ b/vapi/clutter-gtk-1.0.vapi
@@ -1,8 +1,9 @@
 /* clutter-gtk-1.0.vapi generated by vapigen, do not modify. */
 
+[CCode (cprefix = "GtkClutter", gir_namespace = "GtkClutter", gir_version = "1.0", lower_case_cprefix = "gtk_clutter_")]
 namespace GtkClutter {
-       [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
-       public class Actor : Clutter.Actor, Clutter.Scriptable, Clutter.Animatable, Atk.Implementor, Clutter.Container {
+       [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h", type_id = "gtk_clutter_actor_get_type ()")]
+       public class Actor : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
                [CCode (has_construct_function = false, type = "ClutterActor*")]
                public Actor ();
                public unowned Gtk.Widget get_contents ();
@@ -12,30 +13,34 @@ namespace GtkClutter {
                [NoAccessorMethod]
                public Gtk.Widget contents { owned get; set construct; }
        }
-       [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
+       [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h", type_id = "gtk_clutter_embed_get_type ()")]
        public class Embed : Gtk.Container, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Embed ();
                public unowned Clutter.Actor get_stage ();
        }
-       [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
-       public class Texture : Clutter.Texture, Clutter.Scriptable, Clutter.Animatable, Atk.Implementor {
+       [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h", type_id = "gtk_clutter_texture_get_type ()")]
+       public class Texture : Clutter.Texture, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
                [CCode (has_construct_function = false, type = "ClutterActor*")]
                public Texture ();
                public static GLib.Quark error_quark ();
-               public bool set_from_icon_name (Gtk.Widget widget, string icon_name, Gtk.IconSize icon_size) throws GLib.Error;
+               public bool set_from_icon_name (Gtk.Widget? widget, string icon_name, Gtk.IconSize icon_size) throws GLib.Error;
                public bool set_from_pixbuf (Gdk.Pixbuf pixbuf) throws GLib.Error;
                public bool set_from_stock (Gtk.Widget widget, string stock_id, Gtk.IconSize icon_size) throws GLib.Error;
        }
-       [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
+       [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h", type_id = "gtk_clutter_window_get_type ()")]
        public class Window : Gtk.Window, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Window ();
                public unowned Clutter.Actor get_stage ();
        }
-       [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h", cprefix = "GTK_CLUTTER_TEXTURE_ERROR_INVALID_STOCK_", has_type_id = false)]
-       public enum TextureError {
-               ID
+       [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h", cprefix = "GTK_CLUTTER_TEXTURE_ERROR_INVALID_STOCK_")]
+       public errordomain TextureError {
+               [CCode (cname = "GTK_CLUTTER_TEXTURE_ERROR_INVALID_STOCK_ID")]
+               [Deprecated (replacement = "INVALID_STOCK_ID", since = "vala-0.16")]
+               ID,
+               [CCode (cname = "GTK_CLUTTER_TEXTURE_ERROR_INVALID_STOCK_ID")]
+               INVALID_STOCK_ID
        }
        [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
        public const int CLUTTER_GTK_MAJOR_VERSION;
@@ -52,7 +57,7 @@ namespace GtkClutter {
        [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
        public static GLib.OptionGroup get_option_group ();
        [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
-       public static Clutter.InitError init ([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
+       public static Clutter.InitError init ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv);
        [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
-       public static Clutter.InitError init_with_args ([CCode (array_length_pos = 0.9)] ref unowned string[] argv, string parameter_string, [CCode (array_length = false)] GLib.OptionEntry[] entries, string? translation_domain) throws GLib.Error;
+       public static Clutter.InitError init_with_args ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv, string? parameter_string, [CCode (array_length = false, array_null_terminated = true)] GLib.OptionEntry[]? entries, string? translation_domain) throws GLib.Error;
 }

diff --git a/vapi/metadata/GtkClutter-1.0-custom.vala b/vapi/metadata/GtkClutter-1.0-custom.vala
new file mode 100644 (file)
index 0000000..2785904
--- /dev/null
+++ b/vapi/metadata/GtkClutter-1.0-custom.vala
@@ -0,0 +1,14 @@
+namespace GtkClutter {
+       public errordomain TextureError {
+               [Deprecated (since = "vala-0.16", replacement = "INVALID_STOCK_ID")]
+               [CCode (cname = "GTK_CLUTTER_TEXTURE_ERROR_INVALID_STOCK_ID")]
+               ID
+       }
+
+       public const int CLUTTER_GTK_MAJOR_VERSION;
+       public const int CLUTTER_GTK_MICRO_VERSION;
+       public const int CLUTTER_GTK_MINOR_VERSION;
+       public const int CLUTTER_GTK_VERSION_HEX;
+       public const string CLUTTER_GTK_VERSION_S;
+       public static bool check_version (uint major, uint minor, uint micro);
+}
\ No newline at end of file

diff --git a/vapi/metadata/GtkClutter-1.0.metadata b/vapi/metadata/GtkClutter-1.0.metadata
new file mode 100644 (file)
index 0000000..99bbe7b
--- /dev/null
+++ b/vapi/metadata/GtkClutter-1.0.metadata
@@ -0,0 +1,4 @@
+TextureError errordomain
+  .texture_error_invalid_stock_id name="INVALID_STOCK_ID"
+get_option_group skip=false
+init*.argv unowned

diff --git a/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.defines b/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.defines
deleted file mode 100644 (file)
index 374eae0..0000000
--- a/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.defines
+++ /dev/null
@@ -1 +0,0 @@
--DCLUTTER_GTK_COMPILATION

diff --git a/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.files b/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.files
deleted file mode 100644 (file)
index 6573bfe..0000000
--- a/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.files
+++ /dev/null
@@ -1,2 +0,0 @@
-include/clutter-gtk-1.0/clutter-gtk
-lib/libclutter-gtk-1.0.so

diff --git a/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.gi b/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.gi
deleted file mode 100644 (file)
index 1106d16..0000000
--- a/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.gi
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-       <namespace name="GtkClutter">
-               <function name="check_version" symbol="gtk_clutter_check_version">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="major" type="guint"/>
-                               <parameter name="minor" type="guint"/>
-                               <parameter name="micro" type="guint"/>
-                       </parameters>
-               </function>
-               <function name="get_option_group" symbol="gtk_clutter_get_option_group">
-                       <return-type type="GOptionGroup*"/>
-               </function>
-               <function name="init" symbol="gtk_clutter_init">
-                       <return-type type="ClutterInitError"/>
-                       <parameters>
-                               <parameter name="argc" type="int*"/>
-                               <parameter name="argv" type="char***"/>
-                       </parameters>
-               </function>
-               <function name="init_with_args" symbol="gtk_clutter_init_with_args">
-                       <return-type type="ClutterInitError"/>
-                       <parameters>
-                               <parameter name="argc" type="int*"/>
-                               <parameter name="argv" type="char***"/>
-                               <parameter name="parameter_string" type="char*"/>
-                               <parameter name="entries" type="GOptionEntry*"/>
-                               <parameter name="translation_domain" type="char*"/>
-                               <parameter name="error" type="GError**"/>
-                       </parameters>
-               </function>
-               <enum name="GtkClutterTextureError">
-                       <member name="GTK_CLUTTER_TEXTURE_ERROR_INVALID_STOCK_ID" value="0"/>
-               </enum>
-               <object name="GtkClutterActor" parent="ClutterActor" type-name="GtkClutterActor" get-type="gtk_clutter_actor_get_type">
-                       <implements>
-                               <interface name="ClutterScriptable"/>
-                               <interface name="ClutterAnimatable"/>
-                               <interface name="AtkImplementor"/>
-                               <interface name="ClutterContainer"/>
-                       </implements>
-                       <method name="get_contents" symbol="gtk_clutter_actor_get_contents">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="actor" type="GtkClutterActor*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_widget" symbol="gtk_clutter_actor_get_widget">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="actor" type="GtkClutterActor*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_clutter_actor_new">
-                               <return-type type="ClutterActor*"/>
-                       </constructor>
-                       <constructor name="new_with_contents" symbol="gtk_clutter_actor_new_with_contents">
-                               <return-type type="ClutterActor*"/>
-                               <parameters>
-                                       <parameter name="contents" type="GtkWidget*"/>
-                               </parameters>
-                       </constructor>
-                       <property name="contents" type="GtkWidget*" readable="1" writable="1" construct="1" construct-only="0"/>
-               </object>
-               <object name="GtkClutterEmbed" parent="GtkContainer" type-name="GtkClutterEmbed" get-type="gtk_clutter_embed_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_stage" symbol="gtk_clutter_embed_get_stage">
-                               <return-type type="ClutterActor*"/>
-                               <parameters>
-                                       <parameter name="embed" type="GtkClutterEmbed*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_clutter_embed_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-               </object>
-               <object name="GtkClutterTexture" parent="ClutterTexture" type-name="GtkClutterTexture" get-type="gtk_clutter_texture_get_type">
-                       <implements>
-                               <interface name="ClutterScriptable"/>
-                               <interface name="ClutterAnimatable"/>
-                               <interface name="AtkImplementor"/>
-                       </implements>
-                       <method name="error_quark" symbol="gtk_clutter_texture_error_quark">
-                               <return-type type="GQuark"/>
-                       </method>
-                       <constructor name="new" symbol="gtk_clutter_texture_new">
-                               <return-type type="ClutterActor*"/>
-                       </constructor>
-                       <method name="set_from_icon_name" symbol="gtk_clutter_texture_set_from_icon_name">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="texture" type="GtkClutterTexture*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="icon_name" type="gchar*"/>
-                                       <parameter name="icon_size" type="GtkIconSize"/>
-                                       <parameter name="error" type="GError**"/>
-                               </parameters>
-                       </method>
-                       <method name="set_from_pixbuf" symbol="gtk_clutter_texture_set_from_pixbuf">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="texture" type="GtkClutterTexture*"/>
-                                       <parameter name="pixbuf" type="GdkPixbuf*"/>
-                                       <parameter name="error" type="GError**"/>
-                               </parameters>
-                       </method>
-                       <method name="set_from_stock" symbol="gtk_clutter_texture_set_from_stock">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="texture" type="GtkClutterTexture*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                                       <parameter name="stock_id" type="gchar*"/>
-                                       <parameter name="icon_size" type="GtkIconSize"/>
-                                       <parameter name="error" type="GError**"/>
-                               </parameters>
-                       </method>
-               </object>
-               <object name="GtkClutterWindow" parent="GtkWindow" type-name="GtkClutterWindow" get-type="gtk_clutter_window_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_stage" symbol="gtk_clutter_window_get_stage">
-                               <return-type type="ClutterActor*"/>
-                               <parameters>
-                                       <parameter name="window" type="GtkClutterWindow*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gtk_clutter_window_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-               </object>
-               <constant name="CLUTTER_GTK_MAJOR_VERSION" type="int" value="1"/>
-               <constant name="CLUTTER_GTK_MICRO_VERSION" type="int" value="0"/>
-               <constant name="CLUTTER_GTK_MINOR_VERSION" type="int" value="0"/>
-               <constant name="CLUTTER_GTK_VERSION_HEX" type="int" value="0"/>
-               <constant name="CLUTTER_GTK_VERSION_S" type="char*" value="1.0.0"/>
-       </namespace>
-</api>

diff --git a/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.metadata b/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.metadata
deleted file mode 100644 (file)
index c0e74bf..0000000
--- a/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.metadata
+++ /dev/null
@@ -1,8 +0,0 @@
-GtkClutter cheader_filename="clutter-gtk/clutter-gtk.h"
-gtk_clutter_init.argc hidden="1"
-gtk_clutter_init.argv is_array="1" is_ref="1" array_length_pos="0.9"
-gtk_clutter_init_with_args.argc hidden="1"
-gtk_clutter_init_with_args.argv is_array="1" is_ref="1" array_length_pos="0.9"
-gtk_clutter_init_with_args.entries is_array="1" no_array_length="1"
-gtk_clutter_init_with_args.translation_domain nullable="1"
-gtk_clutter_get_option_group transfer_ownership="1"

diff --git a/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.namespace b/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.namespace
deleted file mode 100644 (file)
index b15505d..0000000
--- a/vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.namespace
+++ /dev/null
@@ -1 +0,0 @@
-GtkClutter