[vala/staging] vapi: Update GIR-based bindings

[Rico Tzschichholz <ricotz src gnome org>]

commit b540b0aad4ae8ade4dede912ee145164b3ab5871
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Mon Feb 22 12:12:29 2021 +0100

    vapi: Update GIR-based bindings

 vapi/gdk-3.0.vapi                   |  2 +-
 vapi/gstreamer-1.0.vapi             |  3 ++-
 vapi/gtk4.vapi                      |  2 --
 vapi/metadata/Gst-1.0.metadata      |  2 ++
 vapi/metadata/Pango-1.0-custom.vala |  9 ---------
 vapi/pango.vapi                     | 16 ++++++++--------
 6 files changed, 13 insertions(+), 21 deletions(-)
---
diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi
index 095d0b04a..1004f35a1 100644
--- a/vapi/gdk-3.0.vapi
+++ b/vapi/gdk-3.0.vapi
@@ -5688,7 +5688,7 @@ namespace Gdk {
                [Version (since = "3.16")]
                public Gdk.GLContext create_gl_context () throws GLib.Error;
                [Version (since = "3.10")]
-               public Cairo.ImageSurface create_similar_image_surface (int format, int width, int height, 
int scale);
+               public Cairo.ImageSurface create_similar_image_surface (Cairo.Format format, int width, int 
height, int scale);
                [Version (since = "2.22")]
                public Cairo.Surface create_similar_surface (Cairo.Content content, int width, int height);
                public void deiconify ();
diff --git a/vapi/gstreamer-1.0.vapi b/vapi/gstreamer-1.0.vapi
index 786f2b539..db0ca527a 100644
--- a/vapi/gstreamer-1.0.vapi
+++ b/vapi/gstreamer-1.0.vapi
@@ -1012,7 +1012,7 @@ namespace Gst {
                [NoWrapper]
                public virtual void unschedule (Gst.ClockEntry entry);
                [NoWrapper]
-               public virtual Gst.ClockReturn wait (Gst.ClockEntry entry, Gst.ClockTimeDiff jitter);
+               public virtual Gst.ClockReturn wait (Gst.ClockEntry entry, out Gst.ClockTimeDiff jitter);
                [NoWrapper]
                public virtual Gst.ClockReturn wait_async (Gst.ClockEntry entry);
                [Version (since = "1.6")]
@@ -3177,6 +3177,7 @@ namespace Gst {
                CAN_DO_PERIODIC_ASYNC,
                CAN_SET_RESOLUTION,
                CAN_SET_MASTER,
+               [Version (since = "1.6")]
                NEEDS_STARTUP_SYNC,
                LAST
        }
diff --git a/vapi/gtk4.vapi b/vapi/gtk4.vapi
index 973379081..26a9fd81a 100644
--- a/vapi/gtk4.vapi
+++ b/vapi/gtk4.vapi
@@ -14264,8 +14264,6 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static void hsv_to_rgb (float h, float s, float v, out float r, out float g, out float b);
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public static void im_modules_init ();
-       [CCode (cheader_filename = "gtk/gtk.h")]
        public static void init ();
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static bool init_check ();
diff --git a/vapi/metadata/Gst-1.0.metadata b/vapi/metadata/Gst-1.0.metadata
index a2cabd7f9..a6f9c93b5 100644
--- a/vapi/metadata/Gst-1.0.metadata
+++ b/vapi/metadata/Gst-1.0.metadata
@@ -19,6 +19,8 @@ Bin
   .messages unowned=false
   .provided_clock unowned=false
 ClockEntry
+  .* skip=false
+  ._* skip
   .func unowned=false delegate_target_cname="user_data" destroy_notify_cname="destroy_data"
   .user_data skip
   .destroy_data skip
diff --git a/vapi/metadata/Pango-1.0-custom.vala b/vapi/metadata/Pango-1.0-custom.vala
index 2da616e77..e8474bcdc 100644
--- a/vapi/metadata/Pango-1.0-custom.vala
+++ b/vapi/metadata/Pango-1.0-custom.vala
@@ -73,13 +73,4 @@ namespace Pango {
 
        [CCode (cheader_filename = "pango/pango.h", has_target = false)]
        public delegate T AttrDataCopyFunc<T> (T data);
-
-       [CCode (cheader_filename = "pango/pango.h")]
-       public const int VERSION_MAJOR;
-       [CCode (cheader_filename = "pango/pango.h")]
-       public const int VERSION_MICRO;
-       [CCode (cheader_filename = "pango/pango.h")]
-       public const int VERSION_MINOR;
-       [CCode (cheader_filename = "pango/pango.h")]
-       public const string VERSION_STRING;
 }
diff --git a/vapi/pango.vapi b/vapi/pango.vapi
index 97b4f9151..528fed3da 100644
--- a/vapi/pango.vapi
+++ b/vapi/pango.vapi
@@ -1147,7 +1147,10 @@ namespace Pango {
        public const int ANALYSIS_FLAG_NEED_HYPHEN;
        [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_ATTR_INDEX_FROM_TEXT_BEGINNING")]
        [Version (since = "1.24")]
-       public const int ATTR_INDEX_FROM_TEXT_BEGINNING;
+       public const uint ATTR_INDEX_FROM_TEXT_BEGINNING;
+       [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_ATTR_INDEX_TO_TEXT_END")]
+       [Version (since = "1.24")]
+       public const uint ATTR_INDEX_TO_TEXT_END;
        [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_ENGINE_TYPE_LANG")]
        [Version (deprecated = true, deprecated_since = "1.38")]
        public const string ENGINE_TYPE_LANG;
@@ -1170,16 +1173,13 @@ namespace Pango {
        public const int UNKNOWN_GLYPH_HEIGHT;
        [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_UNKNOWN_GLYPH_WIDTH")]
        public const int UNKNOWN_GLYPH_WIDTH;
-       [CCode (cheader_filename = "pango/pango.h")]
+       [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_VERSION_MAJOR")]
        public const int VERSION_MAJOR;
-       [CCode (cheader_filename = "pango/pango.h")]
+       [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_VERSION_MICRO")]
        public const int VERSION_MICRO;
-       [CCode (cheader_filename = "pango/pango.h")]
+       [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_VERSION_MINOR")]
        public const int VERSION_MINOR;
-       [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_VERSION_MIN_REQUIRED")]
-       [Version (since = "1.42")]
-       public const int VERSION_MIN_REQUIRED;
-       [CCode (cheader_filename = "pango/pango.h")]
+       [CCode (cheader_filename = "pango/pango.h", cname = "PANGO_VERSION_STRING")]
        public const string VERSION_STRING;
        [CCode (cheader_filename = "pango/pango.h")]
        [Version (since = "1.44")]