[vala/wip/gobject-2.0: 5/8] metadata

[Rico Tzschichholz <ricotz src gnome org>]

commit 2310e4b96f62cdb10d5a843ec45e9bfaaff60fb1
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Sat Sep 21 10:18:58 2019 +0200

    metadata

 vapi/gobject-2.0.vapi              | 23 ++++++++++-------------
 vapi/metadata/GObject-2.0.metadata |  9 ++++++++-
 2 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/vapi/gobject-2.0.vapi b/vapi/gobject-2.0.vapi
index fff1b28f5..587f70339 100644
--- a/vapi/gobject-2.0.vapi
+++ b/vapi/gobject-2.0.vapi
@@ -435,6 +435,7 @@ namespace GLib {
                public ParamSpecUnichar (string name, string nick, string blurb, unichar default_value, 
GLib.ParamFlags flags);
        }
        [CCode (cheader_filename = "glib-object.h", type_id = "G_TYPE_PARAM_VALUE_ARRAY")]
+       [Version (deprecated = true, deprecated_since = "2.32")]
        public class ParamSpecValueArray : GLib.ParamSpec {
                public weak GLib.ParamSpec element_spec;
                public uint fixed_n_elements;
@@ -905,7 +906,10 @@ namespace GLib {
                STATIC_NICK,
                STATIC_BLURB,
                EXPLICIT_NOTIFY,
-               DEPRECATED
+               DEPRECATED;
+               public const uint MASK;
+               public const uint STATIC_STRINGS;
+               public const uint USER_SHIFT;
        }
        [CCode (cheader_filename = "glib-object.h", cprefix = "G_SIGNAL_", has_type_id = false)]
        [Flags]
@@ -919,7 +923,9 @@ namespace GLib {
                NO_HOOKS,
                MUST_COLLECT,
                DEPRECATED,
-               ACCUMULATOR_FIRST_RUN
+               ACCUMULATOR_FIRST_RUN;
+               [CCode (cname = "G_SIGNAL_FLAGS_MASK")]
+               public const uint MASK;
        }
        [CCode (cheader_filename = "glib-object.h", cprefix = "G_SIGNAL_MATCH_", has_type_id = false)]
        [Flags]
@@ -929,7 +935,8 @@ namespace GLib {
                CLOSURE,
                FUNC,
                DATA,
-               UNBLOCKED
+               UNBLOCKED;
+               public const uint MASK;
        }
        [CCode (cheader_filename = "glib-object.h", cprefix = "G_TYPE_DEBUG_", has_type_id = false)]
        [Flags]
@@ -1043,16 +1050,6 @@ namespace GLib {
        public delegate void ValueTransform (GLib.Value src_value, GLib.Value dest_value);
        [CCode (cheader_filename = "glib-object.h", has_target = false)]
        public delegate void WeakNotify (void* data, GLib.Object where_the_object_was);
-       [CCode (cheader_filename = "glib-object.h", cname = "G_PARAM_MASK")]
-       public const int PARAM_MASK;
-       [CCode (cheader_filename = "glib-object.h", cname = "G_PARAM_STATIC_STRINGS")]
-       public const int PARAM_STATIC_STRINGS;
-       [CCode (cheader_filename = "glib-object.h", cname = "G_PARAM_USER_SHIFT")]
-       public const int PARAM_USER_SHIFT;
-       [CCode (cheader_filename = "glib-object.h", cname = "G_SIGNAL_FLAGS_MASK")]
-       public const int SIGNAL_FLAGS_MASK;
-       [CCode (cheader_filename = "glib-object.h", cname = "G_SIGNAL_MATCH_MASK")]
-       public const int SIGNAL_MATCH_MASK;
        [CCode (cheader_filename = "glib-object.h", cname = "G_TYPE_FLAG_RESERVED_ID_BIT")]
        public const GLib.Type TYPE_FLAG_RESERVED_ID_BIT;
        [CCode (cheader_filename = "glib-object.h", cname = "G_TYPE_FUNDAMENTAL_MAX")]
diff --git a/vapi/metadata/GObject-2.0.metadata b/vapi/metadata/GObject-2.0.metadata
index 3e7ff3267..52fb5b604 100644
--- a/vapi/metadata/GObject-2.0.metadata
+++ b/vapi/metadata/GObject-2.0.metadata
@@ -59,7 +59,7 @@ ParamSpecUInt type_id="G_TYPE_PARAM_UINT"
 ParamSpecUInt64 type_id="G_TYPE_PARAM_UINT64"
 ParamSpecULong type_id="G_TYPE_PARAM_ULONG"
 ParamSpecUnichar type_id="G_TYPE_PARAM_UNICHAR"
-ParamSpecValueArray type_id="G_TYPE_PARAM_VALUE_ARRAY"
+ParamSpecValueArray type_id="G_TYPE_PARAM_VALUE_ARRAY" deprecated_since="2.32"
 ParamSpecVariant type_id="G_TYPE_PARAM_VARIANT"
 
 param_spec_boolean parent="GLib.ParamSpecBoolean" symbol_type="constructor" name="new"
@@ -93,6 +93,13 @@ TypeClass struct=false
 EnumClass struct=false base_type="GLib.TypeClass"
 FlagsClass struct=false base_type="GLib.TypeClass"
 
+// scattered constants
+PARAM_MASK parent="GLib.ParamFlags" name="MASK" type="uint"
+PARAM_STATIC_STRINGS parent="GLib.ParamFlags" name="STATIC_STRINGS" type="uint"
+PARAM_USER_SHIFT parent="GLib.ParamFlags" name="USER_SHIFT" type="uint"
+SIGNAL_FLAGS_MASK parent="GLib.SignalFlags" name="MASK" type="uint"
+SIGNAL_MATCH_MASK parent="GLib.SignalMatchType" name="MASK" type="uint"
+
 // GValue
 Value struct
 BindingTransformFunc.to_value ref