From d7dd578fa6bcb32ffacbc45205c5a811f21003d5 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Thu, 28 Mar 2019 00:02:59 +0100 Subject: [PATCH] gobject-introspection-1.0: Fix TypeInfo and TypeTag method references Fixes https://gitlab.gnome.org/GNOME/vala/issues/778 --- vapi/gobject-introspection-1.0.vapi | 5 +++-- vapi/metadata/GIRepository-2.0-custom.vala | 2 +- vapi/metadata/GIRepository-2.0.metadata | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/vapi/gobject-introspection-1.0.vapi b/vapi/gobject-introspection-1.0.vapi index a363a8e2d..2c65065dc 100644 --- a/vapi/gobject-introspection-1.0.vapi +++ b/vapi/gobject-introspection-1.0.vapi @@ -22,7 +22,7 @@ namespace GI { [CCode (cheader_filename = "girepository.h", lower_case_cprefix = "g_base_info_", lower_case_csuffix = "base_info_gtype", ref_function = "g_base_info_ref", type_id = "g_base_info_gtype_get_type ()", unref_function = "g_base_info_unref")] [Compact] public class BaseInfo { - [CCode (cname = "g_info_new")] + [CCode (cname = "g_info_new", has_construct_function = false)] public BaseInfo (GI.InfoType type, GI.BaseInfo container, GI.Typelib typelib, uint32 offset); public bool equal (GI.BaseInfo info2); public unowned string get_attribute (string name); @@ -228,7 +228,7 @@ namespace GI { public bool is_foreign (); public bool is_gtype_struct (); } - [CCode (cheader_filename = "girepository.h", type_id = "g_base_info_gtype_get_type ()")] + [CCode (cheader_filename = "girepository.h", lower_case_csuffix = "type_info", type_id = "g_base_info_gtype_get_type ()")] [Compact] public class TypeInfo : GI.BaseInfo { public int get_array_fixed_size (); @@ -404,6 +404,7 @@ namespace GI { GHASH, ERROR, UNICHAR; + [CCode (cname = "g_type_tag_to_string")] public unowned string to_string (); } [CCode (cheader_filename = "girepository.h", cprefix = "GI_VFUNC_", has_type_id = false)] diff --git a/vapi/metadata/GIRepository-2.0-custom.vala b/vapi/metadata/GIRepository-2.0-custom.vala index 34a8f7c14..3ebf7c868 100644 --- a/vapi/metadata/GIRepository-2.0-custom.vala +++ b/vapi/metadata/GIRepository-2.0-custom.vala @@ -2,7 +2,7 @@ namespace GI { [CCode (cheader_filename = "girepository.h", ref_function = "g_base_info_ref", unref_function = "g_base_info_unref", lower_case_cprefix = "g_base_info_", type_id = "g_base_info_gtype_get_type ()")] [Compact] public class BaseInfo { - [CCode (cname = "g_info_new")] + [CCode (cname = "g_info_new", has_construct_function = false)] public BaseInfo (GI.InfoType type, GI.BaseInfo container, GI.Typelib typelib, uint32 offset); } } diff --git a/vapi/metadata/GIRepository-2.0.metadata b/vapi/metadata/GIRepository-2.0.metadata index 2f1f9aef1..9d40c5889 100644 --- a/vapi/metadata/GIRepository-2.0.metadata +++ b/vapi/metadata/GIRepository-2.0.metadata @@ -18,5 +18,7 @@ Repository Typelib .symbol.symbol out -*_info_* symbol_type="method" instance_idx=0 -*_info_invoke throws="GI.InvokeError" +*_info_invoke symbol_type="method" instance_idx=0 throws="GI.InvokeError" +TypeInfo lower_case_csuffix="type_info" +type_info_* symbol_type="method" parent="GI.TypeInfo" instance_idx=0 name="type_info_(.+)" +type_tag_to_string parent="GI.TypeTag" symbol_type="method" instance_idx=0 name="to_string" -- 2.47.2