[vala/staging: 2/2] Regenerate GIR-based bindings for improved instance method detection




commit 9d5708923f64b3914aa213ca780973be853a03b7
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Thu Aug 5 15:16:50 2021 +0200

    Regenerate GIR-based bindings for improved instance method detection
    
    Fixes https://gitlab.gnome.org/GNOME/vala/issues/1210

 vapi/atk.vapi                       |  65 ++++--
 vapi/atspi-2.vapi                   |   9 +
 vapi/clutter-1.0.vapi               |  42 ++++
 vapi/clutter-gst-2.0.vapi           |   2 +-
 vapi/gdk-3.0.vapi                   |  24 +++
 vapi/gdk-pixbuf-2.0.vapi            |   3 +
 vapi/geocode-glib-1.0.vapi          |   3 +
 vapi/gio-2.0.vapi                   |  91 +++++---
 vapi/gmodule-2.0.vapi               |   9 +
 vapi/graphene-gobject-1.0.vapi      |  76 +++++++
 vapi/gst-editing-services-1.0.vapi  |   9 +
 vapi/gstreamer-1.0.vapi             | 166 ++++++++++++++-
 vapi/gstreamer-audio-1.0.vapi       |  41 +++-
 vapi/gstreamer-base-1.0.vapi        |   6 +
 vapi/gstreamer-check-1.0.vapi       |   4 +-
 vapi/gstreamer-net-1.0.vapi         |   7 +
 vapi/gstreamer-pbutils-1.0.vapi     |   5 +-
 vapi/gstreamer-play-1.0.vapi        |  56 +++--
 vapi/gstreamer-player-1.0.vapi      |  12 ++
 vapi/gstreamer-rtp-1.0.vapi         |  81 +++++++-
 vapi/gstreamer-rtsp-1.0.vapi        |  38 +++-
 vapi/gstreamer-rtsp-server-1.0.vapi |   2 +
 vapi/gstreamer-sdp-1.0.vapi         |  18 +-
 vapi/gstreamer-video-1.0.vapi       | 183 ++++++++++++----
 vapi/gstreamer-webrtc-1.0.vapi      |   5 +-
 vapi/gtk+-3.0.vapi                  |  81 ++++++--
 vapi/gtk4.vapi                      |  98 ++++++---
 vapi/harfbuzz-gobject.vapi          | 401 ++++++++++++++++++------------------
 vapi/json-glib-1.0.vapi             |   9 +
 vapi/libgeoclue-2.0.vapi            |   6 +
 vapi/libpeas-1.0.vapi               |   2 +
 vapi/libsoup-2.4.vapi               |  43 +++-
 vapi/metadata/Gio-2.0.metadata      |   1 -
 vapi/metadata/GstNet-1.0.metadata   |   1 -
 vapi/metadata/GstRtp-1.0.metadata   |  11 +-
 vapi/packagekit-glib2.vapi          | 157 ++++++++++++--
 vapi/pango.vapi                     |  50 +++++
 vapi/pangocairo.vapi                |   6 +-
 vapi/polkit-gobject-1.vapi          |  11 +
 vapi/poppler-glib.vapi              |   3 +
 vapi/rest-0.7.vapi                  |   6 +
 vapi/udisks2.vapi                   |  29 ++-
 vapi/webkit2gtk-4.0.vapi            |  30 +++
 43 files changed, 1495 insertions(+), 407 deletions(-)
---
diff --git a/vapi/atk.vapi b/vapi/atk.vapi
index 857eb797c..325c7c43b 100644
--- a/vapi/atk.vapi
+++ b/vapi/atk.vapi
@@ -571,6 +571,7 @@ namespace Atk {
        public struct Attribute {
                public string name;
                public string value;
+               public static void set_free (Atk.AttributeSet attrib_set);
        }
        [CCode (cheader_filename = "atk/atk.h", has_type_id = false)]
        public struct KeyEventStruct {
@@ -659,11 +660,8 @@ namespace Atk {
                ERROR_MESSAGE,
                ERROR_FOR,
                LAST_DEFINED;
-               [CCode (cheader_filename = "atk/atk.h")]
                public static Atk.RelationType for_name (string name);
-               [CCode (cheader_filename = "atk/atk.h")]
                public unowned string get_name ();
-               [CCode (cheader_filename = "atk/atk.h")]
                public static Atk.RelationType register (string name);
        }
        [CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_ROLE_", type_id = "atk_role_get_type ()")]
@@ -797,13 +795,9 @@ namespace Atk {
                MARK,
                SUGGESTION,
                LAST_DEFINED;
-               [CCode (cheader_filename = "atk/atk.h")]
                public static Atk.Role for_name (string name);
-               [CCode (cheader_filename = "atk/atk.h")]
                public unowned string get_localized_name ();
-               [CCode (cheader_filename = "atk/atk.h")]
                public unowned string get_name ();
-               [CCode (cheader_filename = "atk/atk.h")]
                [Version (deprecated = true)]
                public static Atk.Role register (string name);
        }
@@ -865,11 +859,8 @@ namespace Atk {
                READ_ONLY,
                COLLAPSED,
                LAST_DEFINED;
-               [CCode (cheader_filename = "atk/atk.h")]
                public static Atk.StateType for_name (string name);
-               [CCode (cheader_filename = "atk/atk.h")]
                public unowned string get_name ();
-               [CCode (cheader_filename = "atk/atk.h")]
                public static Atk.StateType register (string name);
        }
        [CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_TEXT_ATTR_", type_id = 
"atk_text_attribute_get_type ()")]
@@ -904,13 +895,9 @@ namespace Atk {
                STYLE,
                TEXT_POSITION,
                LAST_DEFINED;
-               [CCode (cheader_filename = "atk/atk.h")]
                public static Atk.TextAttribute for_name (string name);
-               [CCode (cheader_filename = "atk/atk.h")]
                public unowned string get_name ();
-               [CCode (cheader_filename = "atk/atk.h")]
                public unowned string? get_value (int index_);
-               [CCode (cheader_filename = "atk/atk.h")]
                public static Atk.TextAttribute register (string name);
        }
        [CCode (cheader_filename = "atk/atk.h", cprefix = "ATK_TEXT_BOUNDARY_", type_id = 
"atk_text_boundary_get_type ()")]
@@ -956,9 +943,7 @@ namespace Atk {
                VERY_GOOD,
                BEST,
                LAST_DEFINED;
-               [CCode (cheader_filename = "atk/atk.h")]
                public unowned string get_localized_name ();
-               [CCode (cheader_filename = "atk/atk.h")]
                public unowned string get_name ();
        }
        [CCode (cheader_filename = "atk/atk.h", has_target = false)]
@@ -1008,4 +993,52 @@ namespace Atk {
        [CCode (cheader_filename = "atk/atk.h")]
        [Version (since = "2.8")]
        public static uint get_minor_version ();
+       [CCode (cheader_filename = "atk/atk.h")]
+       [Version (replacement = "RelationType.for_name")]
+       public static Atk.RelationType relation_type_for_name (string name);
+       [CCode (cheader_filename = "atk/atk.h")]
+       [Version (replacement = "RelationType.get_name")]
+       public static unowned string relation_type_get_name (Atk.RelationType type);
+       [CCode (cheader_filename = "atk/atk.h")]
+       [Version (replacement = "RelationType.register")]
+       public static Atk.RelationType relation_type_register (string name);
+       [CCode (cheader_filename = "atk/atk.h")]
+       [Version (replacement = "Role.for_name")]
+       public static Atk.Role role_for_name (string name);
+       [CCode (cheader_filename = "atk/atk.h")]
+       [Version (replacement = "Role.get_localized_name")]
+       public static unowned string role_get_localized_name (Atk.Role role);
+       [CCode (cheader_filename = "atk/atk.h")]
+       [Version (replacement = "Role.get_name")]
+       public static unowned string role_get_name (Atk.Role role);
+       [CCode (cheader_filename = "atk/atk.h")]
+       [Version (deprecated = true, replacement = "Role.register")]
+       public static Atk.Role role_register (string name);
+       [CCode (cheader_filename = "atk/atk.h")]
+       [Version (replacement = "StateType.for_name")]
+       public static Atk.StateType state_type_for_name (string name);
+       [CCode (cheader_filename = "atk/atk.h")]
+       [Version (replacement = "StateType.get_name")]
+       public static unowned string state_type_get_name (Atk.StateType type);
+       [CCode (cheader_filename = "atk/atk.h")]
+       [Version (replacement = "StateType.register")]
+       public static Atk.StateType state_type_register (string name);
+       [CCode (cheader_filename = "atk/atk.h")]
+       [Version (replacement = "TextAttribute.for_name")]
+       public static Atk.TextAttribute text_attribute_for_name (string name);
+       [CCode (cheader_filename = "atk/atk.h")]
+       [Version (replacement = "TextAttribute.get_name")]
+       public static unowned string text_attribute_get_name (Atk.TextAttribute attr);
+       [CCode (cheader_filename = "atk/atk.h")]
+       [Version (replacement = "TextAttribute.get_value")]
+       public static unowned string? text_attribute_get_value (Atk.TextAttribute attr, int index_);
+       [CCode (cheader_filename = "atk/atk.h")]
+       [Version (replacement = "TextAttribute.register")]
+       public static Atk.TextAttribute text_attribute_register (string name);
+       [CCode (cheader_filename = "atk/atk.h")]
+       [Version (replacement = "ValueType.get_localized_name")]
+       public static unowned string value_type_get_localized_name (Atk.ValueType value_type);
+       [CCode (cheader_filename = "atk/atk.h")]
+       [Version (replacement = "ValueType.get_name")]
+       public static unowned string value_type_get_name (Atk.ValueType value_type);
 }
diff --git a/vapi/atspi-2.vapi b/vapi/atspi-2.vapi
index f9a482c79..9b6c67ccf 100644
--- a/vapi/atspi-2.vapi
+++ b/vapi/atspi-2.vapi
@@ -924,6 +924,12 @@ namespace Atspi {
        [CCode (cheader_filename = "atspi/atspi.h")]
        public static bool deregister_keystroke_listener (Atspi.DeviceListener listener, 
GLib.Array<Atspi.KeyDefinition>? key_set, Atspi.KeyMaskType modmask, Atspi.KeyEventMask event_types) throws 
GLib.Error;
        [CCode (cheader_filename = "atspi/atspi.h")]
+       [Version (replacement = "Event.main")]
+       public static void event_main ();
+       [CCode (cheader_filename = "atspi/atspi.h")]
+       [Version (replacement = "Event.quit")]
+       public static void event_quit ();
+       [CCode (cheader_filename = "atspi/atspi.h")]
        public static int exit ();
        [CCode (cheader_filename = "atspi/atspi.h")]
        public static bool generate_keyboard_event (long keyval, string? keystring, Atspi.KeySynthType 
synth_type) throws GLib.Error;
@@ -944,6 +950,9 @@ namespace Atspi {
        [CCode (cheader_filename = "atspi/atspi.h")]
        public static bool register_keystroke_listener (Atspi.DeviceListener listener, 
GLib.Array<Atspi.KeyDefinition>? key_set, Atspi.KeyMaskType modmask, Atspi.KeyEventMask event_types, 
Atspi.KeyListenerSyncType sync_type) throws GLib.Error;
        [CCode (cheader_filename = "atspi/atspi.h")]
+       [Version (replacement = "Role.get_name")]
+       public static string role_get_name (Atspi.Role role);
+       [CCode (cheader_filename = "atspi/atspi.h")]
        public static void set_main_context (GLib.MainContext cnx);
        [CCode (cheader_filename = "atspi/atspi.h")]
        public static void set_reference_window (Atspi.Accessible accessible);
diff --git a/vapi/clutter-1.0.vapi b/vapi/clutter-1.0.vapi
index 80a1fc36a..c49ee3696 100644
--- a/vapi/clutter-1.0.vapi
+++ b/vapi/clutter-1.0.vapi
@@ -9060,6 +9060,9 @@ namespace Clutter {
        [CCode (cheader_filename = "clutter/clutter.h", cname = "CLUTTER_VERSION_S")]
        public const string VERSION_S;
        [CCode (cheader_filename = "clutter/clutter.h")]
+       [Version (replacement = "ActorBox.alloc", since = "1.12")]
+       public static Clutter.ActorBox? actor_box_alloc ();
+       [CCode (cheader_filename = "clutter/clutter.h")]
        public static void base_init ();
        [CCode (cheader_filename = "clutter/clutter.h")]
        [Version (since = "1.12")]
@@ -9077,12 +9080,27 @@ namespace Clutter {
        [Version (deprecated = true, deprecated_since = "1.10", since = "0.8")]
        public static void clear_glyph_cache ();
        [CCode (cheader_filename = "clutter/clutter.h")]
+       [Version (replacement = "Color.get_static", since = "1.6")]
+       public static unowned Clutter.Color? color_get_static (Clutter.StaticColor color);
+       [CCode (cheader_filename = "clutter/clutter.h")]
        [Version (since = "1.14")]
        public static void disable_accessibility ();
        [CCode (cheader_filename = "clutter/clutter.h")]
        [Version (since = "0.4")]
        public static void do_event (Clutter.Event event);
        [CCode (cheader_filename = "clutter/clutter.h")]
+       [Version (replacement = "Event.add_filter", since = "1.18")]
+       public static uint event_add_filter (Clutter.Stage? stage, [CCode (delegate_target_pos = 2.2, 
destroy_notify_pos = 2.1)] owned Clutter.EventFilterFunc func);
+       [CCode (cheader_filename = "clutter/clutter.h")]
+       [Version (replacement = "Event.get", since = "0.4")]
+       public static Clutter.Event event_get ();
+       [CCode (cheader_filename = "clutter/clutter.h")]
+       [Version (replacement = "Event.peek", since = "0.4")]
+       public static unowned Clutter.Event event_peek ();
+       [CCode (cheader_filename = "clutter/clutter.h")]
+       [Version (replacement = "Event.remove_filter", since = "1.18")]
+       public static void event_remove_filter (uint id);
+       [CCode (cheader_filename = "clutter/clutter.h")]
        [Version (since = "0.4")]
        public static bool events_pending ();
        [CCode (cheader_filename = "clutter/clutter.h")]
@@ -9146,8 +9164,14 @@ namespace Clutter {
        [Version (deprecated = true, deprecated_since = "1.10", since = "0.8")]
        public static void grab_pointer_for_device (Clutter.Actor actor, int id_);
        [CCode (cheader_filename = "clutter/clutter.h")]
+       [Version (replacement = "ImageError.quark")]
+       public static GLib.Quark image_error_quark ();
+       [CCode (cheader_filename = "clutter/clutter.h")]
        public static Clutter.InitError init ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] 
ref unowned string[]? argv);
        [CCode (cheader_filename = "clutter/clutter.h")]
+       [Version (replacement = "InitError.quark")]
+       public static GLib.Quark init_error_quark ();
+       [CCode (cheader_filename = "clutter/clutter.h")]
        [Version (since = "0.2")]
        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)] 
GLib.OptionEntry[]? entries, string? translation_domain) throws GLib.Error;
        [CCode (cheader_filename = "clutter/clutter.h")]
@@ -9159,6 +9183,18 @@ namespace Clutter {
        [CCode (cheader_filename = "clutter/clutter.h")]
        public static void main_quit ();
        [CCode (cheader_filename = "clutter/clutter.h")]
+       [Version (replacement = "Matrix.alloc", since = "1.12")]
+       public static Clutter.Matrix? matrix_alloc ();
+       [CCode (cheader_filename = "clutter/clutter.h")]
+       [Version (replacement = "Point.zero", since = "1.12")]
+       public static unowned Clutter.Point? point_zero ();
+       [CCode (cheader_filename = "clutter/clutter.h")]
+       [Version (replacement = "Rect.zero", since = "1.12")]
+       public static unowned Clutter.Rect? rect_zero ();
+       [CCode (cheader_filename = "clutter/clutter.h")]
+       [Version (replacement = "ScriptError.quark")]
+       public static GLib.Quark script_error_quark ();
+       [CCode (cheader_filename = "clutter/clutter.h")]
        [Version (deprecated = true, deprecated_since = "1.10", since = "0.6")]
        public static void set_default_frame_rate (uint frames_per_sec);
        [CCode (cheader_filename = "clutter/clutter.h")]
@@ -9171,6 +9207,9 @@ namespace Clutter {
        [Version (since = "1.16")]
        public static void set_windowing_backend (string backend_type);
        [CCode (cheader_filename = "clutter/clutter.h")]
+       [Version (replacement = "ShaderError.quark")]
+       public static GLib.Quark shader_error_quark ();
+       [CCode (cheader_filename = "clutter/clutter.h")]
        [Version (since = "1.18")]
        public static void test_add_data_full (string test_path, owned GLib.TestDataFunc test_func);
        [CCode (cheader_filename = "clutter/clutter.h")]
@@ -9188,6 +9227,9 @@ namespace Clutter {
        [Version (since = "1.18")]
        public static int test_run ();
        [CCode (cheader_filename = "clutter/clutter.h")]
+       [Version (replacement = "TextureError.quark")]
+       public static GLib.Quark texture_error_quark ();
+       [CCode (cheader_filename = "clutter/clutter.h")]
        [Version (since = "0.6")]
        public static void ungrab_keyboard ();
        [CCode (cheader_filename = "clutter/clutter.h")]
diff --git a/vapi/clutter-gst-2.0.vapi b/vapi/clutter-gst-2.0.vapi
index d84489cfd..ccb7ad0a3 100644
--- a/vapi/clutter-gst-2.0.vapi
+++ b/vapi/clutter-gst-2.0.vapi
@@ -90,6 +90,6 @@ namespace ClutterGst {
        [Version (since = "1.0")]
        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, type = 
"GOptionEntry*")] GLib.OptionEntry[]? entries = null, string? translation_domain = null) throws GLib.Error;
        [CCode (cheader_filename = "clutter-gst/clutter-gst.h")]
-       [Version (since = "1.4")]
+       [Version (replacement = "Player.class_init", since = "1.4")]
        public static void player_class_init (GLib.ObjectClass object_class);
 }
diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi
index 1004f35a1..9acb2df88 100644
--- a/vapi/gdk-3.0.vapi
+++ b/vapi/gdk-3.0.vapi
@@ -6682,6 +6682,12 @@ namespace Gdk {
        [Version (deprecated = true, deprecated_since = "3.16")]
        public static void add_option_entries_libgtk_only (GLib.OptionGroup group);
        [CCode (cheader_filename = "gdk/gdk.h")]
+       [Version (replacement = "Atom.intern")]
+       public static Gdk.Atom atom_intern (string atom_name, bool only_if_exists);
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       [Version (replacement = "Atom.intern_static_string", since = "2.10")]
+       public static Gdk.Atom atom_intern_static_string (string atom_name);
+       [CCode (cheader_filename = "gdk/gdk.h")]
        public static void beep ();
        [CCode (cheader_filename = "gdk/gdk.h")]
        [Version (deprecated = true, deprecated_since = "3.22", since = "2.8")]
@@ -6718,6 +6724,9 @@ namespace Gdk {
        [Version (since = "3.10")]
        public static Cairo.Surface cairo_surface_create_from_pixbuf (Gdk.Pixbuf pixbuf, int scale, 
Gdk.Window? for_window);
        [CCode (cheader_filename = "gdk/gdk.h")]
+       [Version (deprecated = true, deprecated_since = "3.14", replacement = "Color.parse")]
+       public static bool color_parse (string spec, out Gdk.Color color);
+       [CCode (cheader_filename = "gdk/gdk.h")]
        [Version (since = "3.0")]
        public static void disable_multidevice ();
        [CCode (cheader_filename = "gdk/gdk.h")]
@@ -6758,6 +6767,18 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static void error_trap_push ();
        [CCode (cheader_filename = "gdk/gdk.h")]
+       [Version (replacement = "Event.get")]
+       public static Gdk.Event? event_get ();
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       [Version (replacement = "Event.handler_set")]
+       public static void event_handler_set (owned Gdk.EventFunc func);
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       [Version (replacement = "Event.peek")]
+       public static Gdk.Event? event_peek ();
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       [Version (replacement = "Event.request_motions", since = "2.12")]
+       public static void event_request_motions (Gdk.EventMotion event);
+       [CCode (cheader_filename = "gdk/gdk.h")]
        [Version (since = "3.0")]
        public static bool events_get_angle (Gdk.Event event1, Gdk.Event event2, out double angle);
        [CCode (cheader_filename = "gdk/gdk.h")]
@@ -6783,6 +6804,9 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static bool get_show_events ();
        [CCode (cheader_filename = "gdk/gdk.h")]
+       [Version (replacement = "GLError.quark")]
+       public static GLib.Quark gl_error_quark ();
+       [CCode (cheader_filename = "gdk/gdk.h")]
        public static void init ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned 
string[] argv);
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static bool init_check ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref 
unowned string[] argv);
diff --git a/vapi/gdk-pixbuf-2.0.vapi b/vapi/gdk-pixbuf-2.0.vapi
index daabef10b..79d0c4888 100644
--- a/vapi/gdk-pixbuf-2.0.vapi
+++ b/vapi/gdk-pixbuf-2.0.vapi
@@ -411,4 +411,7 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h", cname = "GDK_PIXDATA_HEADER_LENGTH")]
        [Version (deprecated = true, deprecated_since = "2.32")]
        public const int PIXDATA_HEADER_LENGTH;
+       [CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h")]
+       [Version (replacement = "PixbufError.quark")]
+       public static GLib.Quark pixbuf_error_quark ();
 }
diff --git a/vapi/geocode-glib-1.0.vapi b/vapi/geocode-glib-1.0.vapi
index 6b3e5a7c5..285270e47 100644
--- a/vapi/geocode-glib-1.0.vapi
+++ b/vapi/geocode-glib-1.0.vapi
@@ -264,4 +264,7 @@ namespace Geocode {
                INTERNAL_SERVER;
                public static GLib.Quark quark ();
        }
+       [CCode (cheader_filename = "geocode-glib/geocode-glib.h")]
+       [Version (replacement = "Error.quark")]
+       public static GLib.Quark error_quark ();
 }
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index b5e4aef87..9b343e1f5 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -82,9 +82,36 @@ namespace GLib {
                [Version (since = "2.26")]
                public static GLib.IOStream address_get_stream_sync (string address, out string? out_guid, 
GLib.Cancellable? cancellable = null) throws GLib.Error;
                [CCode (cheader_filename = "gio/gio.h")]
-               [Version (since = "2.26")]
+               [Version (replacement = "DBusAnnotationInfo.lookup", since = "2.26")]
                public static unowned string? annotation_info_lookup ([CCode (array_length = false, 
array_null_terminated = true)] GLib.DBusAnnotationInfo[]? annotations, string name);
                [CCode (cheader_filename = "gio/gio.h")]
+               [Version (replacement = "DBusError.encode_gerror", since = "2.26")]
+               public static string error_encode_gerror (GLib.Error error);
+               [CCode (cheader_filename = "gio/gio.h")]
+               [Version (replacement = "DBusError.get_remote_error", since = "2.26")]
+               public static string? error_get_remote_error (GLib.Error error);
+               [CCode (cheader_filename = "gio/gio.h")]
+               [Version (replacement = "DBusError.is_remote_error", since = "2.26")]
+               public static bool error_is_remote_error (GLib.Error error);
+               [CCode (cheader_filename = "gio/gio.h")]
+               [Version (replacement = "DBusError.new_for_dbus_error", since = "2.26")]
+               public static GLib.Error error_new_for_dbus_error (string dbus_error_name, string 
dbus_error_message);
+               [CCode (cheader_filename = "gio/gio.h")]
+               [Version (replacement = "DBusError.quark")]
+               public static GLib.Quark error_quark ();
+               [CCode (cheader_filename = "gio/gio.h")]
+               [Version (replacement = "DBusError.register_error", since = "2.26")]
+               public static bool error_register_error (GLib.Quark error_domain, int error_code, string 
dbus_error_name);
+               [CCode (cheader_filename = "gio/gio.h")]
+               [Version (replacement = "DBusError.register_error_domain", since = "2.26")]
+               public static void error_register_error_domain (string error_domain_quark_name, size_t 
quark_volatile, [CCode (array_length_cname = "num_entries", array_length_pos = 3.1, array_length_type = 
"guint")] GLib.DBusErrorEntry[] entries);
+               [CCode (cheader_filename = "gio/gio.h")]
+               [Version (replacement = "DBusError.strip_remote_error", since = "2.26")]
+               public static bool error_strip_remote_error (GLib.Error error);
+               [CCode (cheader_filename = "gio/gio.h")]
+               [Version (replacement = "DBusError.unregister_error", since = "2.26")]
+               public static bool error_unregister_error (GLib.Quark error_domain, int error_code, string 
dbus_error_name);
+               [CCode (cheader_filename = "gio/gio.h")]
                [Version (since = "2.68")]
                public static string escape_object_path (string s);
                [CCode (cheader_filename = "gio/gio.h")]
@@ -632,6 +659,7 @@ namespace GLib {
                public string key;
                public int ref_count;
                public string value;
+               public static unowned string? lookup ([CCode (array_length = false, array_null_terminated = 
true)] GLib.DBusAnnotationInfo[]? annotations, string name);
                public unowned GLib.DBusAnnotationInfo @ref ();
                public void unref ();
        }
@@ -1486,11 +1514,8 @@ namespace GLib {
                public unowned GLib.IOExtension get_extension_by_name (string name);
                public unowned GLib.List<GLib.IOExtension> get_extensions ();
                public GLib.Type get_required_type ();
-               [CCode (cheader_filename = "gio/gio.h")]
                public static unowned GLib.IOExtension implement (string extension_point_name, GLib.Type 
type, string extension_name, int priority);
-               [CCode (cheader_filename = "gio/gio.h")]
                public static unowned GLib.IOExtensionPoint lookup (string name);
-               [CCode (cheader_filename = "gio/gio.h")]
                public static unowned GLib.IOExtensionPoint register (string name);
                public void set_required_type (GLib.Type type);
        }
@@ -2161,15 +2186,16 @@ namespace GLib {
        [Version (since = "2.32")]
        public class Resource {
                [CCode (cname = "g_resources_register")]
+               [Version (replacement = "resources_register", since = "2.32")]
                public void _register ();
                [CCode (cname = "g_resources_unregister")]
+               [Version (replacement = "resources_unregister", since = "2.32")]
                public void _unregister ();
                [CCode (array_length = false, array_null_terminated = true)]
                public string[] enumerate_children (string path, GLib.ResourceLookupFlags lookup_flags) 
throws GLib.Error;
                [CCode (has_construct_function = false)]
                public Resource.from_data (GLib.Bytes data) throws GLib.Error;
                public bool get_info (string path, GLib.ResourceLookupFlags lookup_flags, out size_t size, 
out uint32 flags) throws GLib.Error;
-               [CCode (cheader_filename = "gio/gio.h")]
                public static GLib.Resource load (string filename) throws GLib.Error;
                public GLib.Bytes lookup_data (string path, GLib.ResourceLookupFlags lookup_flags) throws 
GLib.Error;
                public GLib.InputStream open_stream (string path, GLib.ResourceLookupFlags lookup_flags) 
throws GLib.Error;
@@ -2414,7 +2440,6 @@ namespace GLib {
        public class SettingsSchemaSource {
                [CCode (has_construct_function = false)]
                public SettingsSchemaSource.from_directory (string directory, GLib.SettingsSchemaSource? 
parent, bool trusted) throws GLib.Error;
-               [CCode (cheader_filename = "gio/gio.h")]
                public static unowned GLib.SettingsSchemaSource? get_default ();
                [Version (since = "2.40")]
                public void list_schemas (bool recursive, [CCode (array_length = false, array_null_terminated 
= true)] out string[] non_relocatable, [CCode (array_length = false, array_null_terminated = true)] out 
string[] relocatable);
@@ -2817,7 +2842,7 @@ namespace GLib {
                [Version (since = "2.22")]
                public uint16 get_weight ();
                [CCode (cheader_filename = "gio/gio.h")]
-               [Version (since = "2.22")]
+               [Version (replacement = "SrvTarget.list_sort", since = "2.22")]
                public static GLib.List<GLib.SrvTarget> list_sort (owned GLib.List<GLib.SrvTarget> targets);
        }
        [CCode (cheader_filename = "gio/gio.h", type_id = "g_subprocess_get_type ()")]
@@ -4211,7 +4236,7 @@ namespace GLib {
                SYSTEM,
                SESSION;
                [CCode (cheader_filename = "gio/gio.h", cname = "g_dbus_address_get_for_bus_sync")]
-               public static string get_address_sync (GLib.BusType bus_type, GLib.Cancellable? cancellable = 
null) throws GLib.Error;
+               public string get_address_sync (GLib.Cancellable? cancellable = null) throws GLib.Error;
        }
        [CCode (cheader_filename = "gio/gio.h", cprefix = "G_CONVERTER_", type_id = 
"g_converter_flags_get_type ()")]
        [Flags]
@@ -4840,23 +4865,14 @@ namespace GLib {
                UNKNOWN_INTERFACE,
                UNKNOWN_PROPERTY,
                PROPERTY_READ_ONLY;
-               [CCode (cheader_filename = "gio/gio.h")]
                public static string encode_gerror (GLib.Error error);
-               [CCode (cheader_filename = "gio/gio.h")]
                public static string? get_remote_error (GLib.Error error);
-               [CCode (cheader_filename = "gio/gio.h")]
                public static bool is_remote_error (GLib.Error error);
-               [CCode (cheader_filename = "gio/gio.h")]
                public static GLib.Error new_for_dbus_error (string dbus_error_name, string 
dbus_error_message);
-               [CCode (cheader_filename = "gio/gio.h")]
                public static GLib.Quark quark ();
-               [CCode (cheader_filename = "gio/gio.h")]
                public static bool register_error (GLib.Quark error_domain, int error_code, string 
dbus_error_name);
-               [CCode (cheader_filename = "gio/gio.h")]
                public static void register_error_domain (string error_domain_quark_name, size_t 
quark_volatile, [CCode (array_length_cname = "num_entries", array_length_pos = 3.1, array_length_type = 
"guint")] GLib.DBusErrorEntry[] entries);
-               [CCode (cheader_filename = "gio/gio.h")]
                public static bool strip_remote_error (GLib.Error error);
-               [CCode (cheader_filename = "gio/gio.h")]
                public static bool unregister_error (GLib.Quark error_domain, int error_code, string 
dbus_error_name);
        }
        [CCode (cheader_filename = "gio/gio.h", cname = "GIOErrorEnum", cprefix = "G_IO_ERROR_")]
@@ -4931,7 +4947,6 @@ namespace GLib {
                NOT_FOUND,
                TEMPORARY_FAILURE,
                INTERNAL;
-               [CCode (cheader_filename = "gio/gio.h")]
                public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gio/gio.h", cprefix = "G_RESOURCE_ERROR_")]
@@ -4939,7 +4954,6 @@ namespace GLib {
        public errordomain ResourceError {
                NOT_FOUND,
                INTERNAL;
-               [CCode (cheader_filename = "gio/gio.h")]
                public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_CHANNEL_BINDING_ERROR_")]
@@ -4949,7 +4963,8 @@ namespace GLib {
                INVALID_STATE,
                NOT_AVAILABLE,
                NOT_SUPPORTED,
-               GENERAL_ERROR
+               GENERAL_ERROR;
+               public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_ERROR_")]
        [Version (since = "2.28")]
@@ -4961,7 +4976,8 @@ namespace GLib {
                HANDSHAKE,
                CERTIFICATE_REQUIRED,
                EOF,
-               INAPPROPRIATE_FALLBACK
+               INAPPROPRIATE_FALLBACK;
+               public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gio/gio.h", instance_pos = 2.9)]
        public delegate void AsyncReadyCallback (GLib.Object? source_object, GLib.AsyncResult res);
@@ -5068,22 +5084,31 @@ namespace GLib {
        [Version (since = "2.58")]
        public const string DRIVE_IDENTIFIER_KIND_UNIX_DEVICE;
        [CCode (cheader_filename = "gio/gio.h")]
-       [Version (since = "2.38")]
+       [Version (replacement = "Action.name_is_valid", since = "2.38")]
        public static bool action_name_is_valid (string action_name);
        [CCode (cheader_filename = "gio/gio.h")]
-       [Version (since = "2.38")]
+       [Version (replacement = "Action.parse_detailed_name", since = "2.38")]
        public static bool action_parse_detailed_name (string detailed_name, out string action_name, out 
GLib.Variant target_value) throws GLib.Error;
        [CCode (cheader_filename = "gio/gio.h")]
-       [Version (since = "2.38")]
+       [Version (replacement = "Action.print_detailed_name", since = "2.38")]
        public static string action_print_detailed_name (string action_name, GLib.Variant? target_value);
        [CCode (cheader_filename = "gio/gio.h")]
-       [Version (since = "2.48")]
+       [Version (replacement = "DtlsClientConnection.new", since = "2.48")]
        public static GLib.DtlsClientConnection dtls_client_connection_new (GLib.DatagramBased base_socket, 
GLib.SocketConnectable? server_identity) throws GLib.Error;
        [CCode (cheader_filename = "gio/gio.h")]
-       [Version (since = "2.48")]
+       [Version (replacement = "DtlsServerConnection.new", since = "2.48")]
        public static GLib.DtlsServerConnection dtls_server_connection_new (GLib.DatagramBased base_socket, 
GLib.TlsCertificate? certificate) throws GLib.Error;
        [CCode (cheader_filename = "gio/gio.h")]
-       [Version (since = "2.64")]
+       [Version (replacement = "IOExtensionPoint.implement")]
+       public static unowned GLib.IOExtension io_extension_point_implement (string extension_point_name, 
GLib.Type type, string extension_name, int priority);
+       [CCode (cheader_filename = "gio/gio.h")]
+       [Version (replacement = "IOExtensionPoint.lookup")]
+       public static unowned GLib.IOExtensionPoint io_extension_point_lookup (string name);
+       [CCode (cheader_filename = "gio/gio.h")]
+       [Version (replacement = "IOExtensionPoint.register")]
+       public static unowned GLib.IOExtensionPoint io_extension_point_register (string name);
+       [CCode (cheader_filename = "gio/gio.h")]
+       [Version (replacement = "MemoryMonitor.dup_default", since = "2.64")]
        public static GLib.MemoryMonitor memory_monitor_dup_default ();
        [CCode (cheader_filename = "gio/gio.h")]
        [Version (since = "2.36")]
@@ -5097,6 +5122,15 @@ namespace GLib {
        [CCode (cheader_filename = "gio/gio.h")]
        [Version (since = "2.34")]
        public static bool pollable_stream_write_all (GLib.OutputStream stream, [CCode (array_length_cname = 
"count", array_length_pos = 2.5, array_length_type = "gsize")] uint8[] buffer, bool blocking, out size_t 
bytes_written, GLib.Cancellable? cancellable = null) throws GLib.Error;
+       [CCode (cheader_filename = "gio/gio.h")]
+       [Version (replacement = "ResolverError.quark", since = "2.22")]
+       public static GLib.Quark resolver_error_quark ();
+       [CCode (cheader_filename = "gio/gio.h")]
+       [Version (replacement = "ResourceError.quark", since = "2.32")]
+       public static GLib.Quark resource_error_quark ();
+       [CCode (cheader_filename = "gio/gio.h")]
+       [Version (replacement = "Resource.load", since = "2.32")]
+       public static GLib.Resource resource_load (string filename) throws GLib.Error;
        [CCode (array_length = false, array_null_terminated = true, cheader_filename = "gio/gio.h")]
        [Version (since = "2.32")]
        public static string[] resources_enumerate_children (string path, GLib.ResourceLookupFlags 
lookup_flags) throws GLib.Error;
@@ -5115,4 +5149,7 @@ namespace GLib {
        [CCode (cheader_filename = "gio/gio.h")]
        [Version (since = "2.32")]
        public static void resources_unregister (GLib.Resource resource);
+       [CCode (cheader_filename = "gio/gio.h")]
+       [Version (replacement = "SettingsSchemaSource.get_default", since = "2.32")]
+       public static unowned GLib.SettingsSchemaSource? settings_schema_source_get_default ();
 }
diff --git a/vapi/gmodule-2.0.vapi b/vapi/gmodule-2.0.vapi
index f1798c677..680a33464 100644
--- a/vapi/gmodule-2.0.vapi
+++ b/vapi/gmodule-2.0.vapi
@@ -35,4 +35,13 @@ namespace GLib {
        public delegate unowned string ModuleCheckInit (GLib.Module module);
        [CCode (cheader_filename = "gmodule.h", has_target = false)]
        public delegate void ModuleUnload (GLib.Module module);
+       [CCode (cheader_filename = "gmodule.h")]
+       [Version (replacement = "Module.build_path")]
+       public static string module_build_path (string? directory, string module_name);
+       [CCode (cheader_filename = "gmodule.h")]
+       [Version (replacement = "Module.error")]
+       public static unowned string module_error ();
+       [CCode (cheader_filename = "gmodule.h")]
+       [Version (replacement = "Module.supported")]
+       public static bool module_supported ();
 }
diff --git a/vapi/graphene-gobject-1.0.vapi b/vapi/graphene-gobject-1.0.vapi
index 8ae0721d7..97dd479fe 100644
--- a/vapi/graphene-gobject-1.0.vapi
+++ b/vapi/graphene-gobject-1.0.vapi
@@ -339,6 +339,7 @@ namespace Graphene {
        public struct Rect {
                public Graphene.Point origin;
                public Graphene.Size size;
+               [Version (replacement = "Rect.alloc", since = "1.0")]
                public static Graphene.Rect? alloc ();
                public bool contains_point (Graphene.Point p);
                public bool contains_rect (Graphene.Rect b);
@@ -676,4 +677,79 @@ namespace Graphene {
        [CCode (cheader_filename = "graphene-gobject.h", cname = "GRAPHENE_VEC4_LEN")]
        [Version (since = "1.0")]
        public const int VEC4_LEN;
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Box.empty", since = "1.2")]
+       public static unowned Graphene.Box? box_empty ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Box.infinite", since = "1.2")]
+       public static unowned Graphene.Box? box_infinite ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Box.minus_one", since = "1.2")]
+       public static unowned Graphene.Box? box_minus_one ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Box.one", since = "1.2")]
+       public static unowned Graphene.Box? box_one ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Box.one_minus_one", since = "1.2")]
+       public static unowned Graphene.Box? box_one_minus_one ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Box.zero", since = "1.2")]
+       public static unowned Graphene.Box? box_zero ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Point3D.zero", since = "1.0")]
+       public static unowned Graphene.Point3D? point3d_zero ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Point.zero", since = "1.0")]
+       public static unowned Graphene.Point? point_zero ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Rect.zero", since = "1.4")]
+       public static unowned Graphene.Rect? rect_zero ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Size.zero", since = "1.0")]
+       public static unowned Graphene.Size? size_zero ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Vec2.one", since = "1.0")]
+       public static unowned Graphene.Vec2? vec2_one ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Vec2.x_axis", since = "1.0")]
+       public static unowned Graphene.Vec2? vec2_x_axis ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Vec2.y_axis", since = "1.0")]
+       public static unowned Graphene.Vec2? vec2_y_axis ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Vec2.zero", since = "1.0")]
+       public static unowned Graphene.Vec2? vec2_zero ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Vec3.one", since = "1.0")]
+       public static unowned Graphene.Vec3? vec3_one ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Vec3.x_axis", since = "1.0")]
+       public static unowned Graphene.Vec3? vec3_x_axis ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Vec3.y_axis", since = "1.0")]
+       public static unowned Graphene.Vec3? vec3_y_axis ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Vec3.z_axis", since = "1.0")]
+       public static unowned Graphene.Vec3? vec3_z_axis ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Vec3.zero", since = "1.0")]
+       public static unowned Graphene.Vec3? vec3_zero ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Vec4.one", since = "1.0")]
+       public static unowned Graphene.Vec4? vec4_one ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Vec4.w_axis", since = "1.0")]
+       public static unowned Graphene.Vec4? vec4_w_axis ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Vec4.x_axis", since = "1.0")]
+       public static unowned Graphene.Vec4? vec4_x_axis ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Vec4.y_axis", since = "1.0")]
+       public static unowned Graphene.Vec4? vec4_y_axis ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Vec4.z_axis", since = "1.0")]
+       public static unowned Graphene.Vec4? vec4_z_axis ();
+       [CCode (cheader_filename = "graphene-gobject.h")]
+       [Version (replacement = "Vec4.zero", since = "1.0")]
+       public static unowned Graphene.Vec4? vec4_zero ();
 }
diff --git a/vapi/gst-editing-services-1.0.vapi b/vapi/gst-editing-services-1.0.vapi
index df798325f..464ca1553 100644
--- a/vapi/gst-editing-services-1.0.vapi
+++ b/vapi/gst-editing-services-1.0.vapi
@@ -1280,6 +1280,12 @@ namespace GES {
        [CCode (cheader_filename = "ges/ges.h")]
        public static void deinit ();
        [CCode (cheader_filename = "ges/ges.h")]
+       [Version (replacement = "Edge.name", since = "1.16")]
+       public static unowned string edge_name (GES.Edge edge);
+       [CCode (cheader_filename = "ges/ges.h")]
+       [Version (replacement = "EditMode.name", since = "1.18")]
+       public static unowned string edit_mode_name (GES.EditMode mode);
+       [CCode (cheader_filename = "ges/ges.h")]
        [Version (since = "1.18")]
        public static unowned GES.Asset find_formatter_for_uri (string uri);
        [CCode (cheader_filename = "ges/ges.h")]
@@ -1297,6 +1303,9 @@ namespace GES {
        [CCode (cheader_filename = "ges/ges.h")]
        public static uint pspec_hash (void* key_spec);
        [CCode (cheader_filename = "ges/ges.h")]
+       [Version (replacement = "TrackType.name")]
+       public static unowned string track_type_name (GES.TrackType type);
+       [CCode (cheader_filename = "ges/ges.h")]
        public static bool validate_register_action_types ();
        [CCode (cheader_filename = "ges/ges.h")]
        public static void version (out uint major, out uint minor, out uint micro, out uint nano);
diff --git a/vapi/gstreamer-1.0.vapi b/vapi/gstreamer-1.0.vapi
index 074b43f5b..daf4ae57e 100644
--- a/vapi/gstreamer-1.0.vapi
+++ b/vapi/gstreamer-1.0.vapi
@@ -43,6 +43,7 @@ namespace Gst {
                [CCode (cheader_filename = "gst/gst.h")]
                public static bool is_colored ();
                [CCode (cheader_filename = "gst/gst.h")]
+               [Version (replacement = "DebugLevel.get_name")]
                public static unowned string level_get_name (Gst.DebugLevel level);
                [CCode (cheader_filename = "gst/gst.h")]
                [PrintfFormat]
@@ -366,6 +367,7 @@ namespace Gst {
                [CCode (cheader_filename = "gst/gst.h", cname = "gst_tag_is_fixed")]
                public static bool is_fixed (string tag);
                [CCode (cheader_filename = "gst/gst.h", cname = "gst_tag_list_copy_value")]
+               [Version (replacement = "TagList.copy_value")]
                public static bool list_copy_value (out GLib.Value dest, Gst.TagList list, string tag);
                [CCode (cheader_filename = "gst/gst.h", cname = "gst_tag_merge_strings_with_comma")]
                public static void merge_strings_with_comma (out GLib.Value dest, GLib.Value src);
@@ -378,30 +380,37 @@ namespace Gst {
        }
        namespace URI {
                [CCode (cheader_filename = "gst/gst.h")]
-               [Version (deprecated = true)]
+               [Version (deprecated = true, replacement = "Uri.construct")]
                public static string @construct (string protocol, string location);
                [CCode (cheader_filename = "gst/gst.h")]
+               [Version (replacement = "URIError.quark")]
                public static GLib.Quark error_quark ();
                [CCode (cheader_filename = "gst/gst.h")]
-               [Version (since = "1.6")]
+               [Version (replacement = "Uri.from_string", since = "1.6")]
                public static Gst.Uri? from_string (string uri);
                [CCode (cheader_filename = "gst/gst.h")]
-               [Version (since = "1.18")]
+               [Version (replacement = "Uri.from_string_escaped", since = "1.18")]
                public static Gst.Uri? from_string_escaped (string uri);
                [CCode (cheader_filename = "gst/gst.h")]
+               [Version (replacement = "Uri.get_location")]
                public static string? get_location (string uri);
                [CCode (cheader_filename = "gst/gst.h")]
+               [Version (replacement = "Uri.get_protocol")]
                public static string? get_protocol (string uri);
                [CCode (cheader_filename = "gst/gst.h")]
+               [Version (replacement = "Uri.has_protocol")]
                public static bool has_protocol (string uri, string protocol);
                [CCode (cheader_filename = "gst/gst.h")]
+               [Version (replacement = "Uri.is_valid")]
                public static bool is_valid (string uri);
                [CCode (cheader_filename = "gst/gst.h")]
-               [Version (since = "1.6")]
+               [Version (replacement = "Uri.join_strings", since = "1.6")]
                public static string join_strings (string base_uri, string ref_uri);
                [CCode (cheader_filename = "gst/gst.h")]
+               [Version (replacement = "Uri.protocol_is_supported")]
                public static bool protocol_is_supported (Gst.URIType type, string protocol);
                [CCode (cheader_filename = "gst/gst.h")]
+               [Version (replacement = "Uri.protocol_is_valid")]
                public static bool protocol_is_valid (string protocol);
        }
        namespace Util {
@@ -2136,6 +2145,7 @@ namespace Gst {
        [Compact]
        public class Poll {
                [CCode (has_construct_function = false)]
+               [Version (replacement = "Poll.new")]
                public Poll (bool controllable);
                public bool add_fd (Gst.PollFD fd);
                public bool fd_can_read (Gst.PollFD fd);
@@ -2158,6 +2168,7 @@ namespace Gst {
                public bool set_controllable (bool controllable);
                public void set_flushing (bool flushing);
                [CCode (has_construct_function = false)]
+               [Version (replacement = "Poll.new_timer")]
                public Poll.timer ();
                public int wait (Gst.ClockTime timeout);
                public bool write_control ();
@@ -2552,6 +2563,7 @@ namespace Gst {
                public void add_value (Gst.TagMergeMode mode, string tag, GLib.Value value);
                public void add_values (Gst.TagMergeMode mode, string tag, ...);
                public Gst.TagList copy ();
+               public static bool copy_value (out GLib.Value dest, Gst.TagList list, string tag);
                [CCode (has_construct_function = false)]
                public TagList.empty ();
                public void @foreach (Gst.TagForeachFunc func);
@@ -2715,14 +2727,21 @@ namespace Gst {
                public bool append_path (string relative_path);
                [Version (since = "1.6")]
                public bool append_path_segment (string path_segment);
+               [Version (deprecated = true)]
+               public static string @construct (string protocol, string location);
                [Version (since = "1.6")]
                public bool equal (Gst.Uri second);
                [Version (since = "1.6")]
+               public static Gst.Uri? from_string (string uri);
+               [Version (since = "1.18")]
+               public static Gst.Uri? from_string_escaped (string uri);
+               [Version (since = "1.6")]
                public Gst.Uri from_string_with_base (string uri);
                [Version (since = "1.6")]
                public unowned string? get_fragment ();
                [Version (since = "1.6")]
                public unowned string? get_host ();
+               public static string? get_location (string uri);
                [Version (since = "1.12")]
                public GLib.HashTable<string,string>? get_media_fragment_table ();
                [Version (since = "1.6")]
@@ -2733,6 +2752,7 @@ namespace Gst {
                public string? get_path_string ();
                [Version (since = "1.6")]
                public uint get_port ();
+               public static string? get_protocol (string uri);
                [Version (since = "1.6")]
                public GLib.List<weak string> get_query_keys ();
                [Version (since = "1.6")]
@@ -2744,12 +2764,16 @@ namespace Gst {
                public unowned string? get_scheme ();
                [Version (since = "1.6")]
                public unowned string? get_userinfo ();
+               public static bool has_protocol (string uri, string protocol);
                [Version (since = "1.6")]
                public bool is_normalized ();
+               public static bool is_valid (string uri);
                [Version (since = "1.6")]
                public bool is_writable ();
                [Version (since = "1.6")]
                public Gst.Uri? join (Gst.Uri? ref_uri);
+               [Version (since = "1.6")]
+               public static string join_strings (string base_uri, string ref_uri);
                [DestroysInstance]
                [ReturnsModifiedPointer]
                [Version (since = "1.6")]
@@ -2758,6 +2782,8 @@ namespace Gst {
                public Gst.Uri new_with_base (string? scheme, string? userinfo, string? host, uint port, 
string? path, string? query, string? fragment);
                [Version (since = "1.6")]
                public bool normalize ();
+               public static bool protocol_is_supported (Gst.URIType type, string protocol);
+               public static bool protocol_is_valid (string protocol);
                [Version (since = "1.6")]
                public bool query_has_key (string query_key);
                [Version (since = "1.6")]
@@ -3263,7 +3289,8 @@ namespace Gst {
                LOG,
                TRACE,
                MEMDUMP,
-               COUNT
+               COUNT;
+               public unowned string get_name ();
        }
        [CCode (cheader_filename = "gst/gst.h", cprefix = "GST_ELEMENT_FLAG_", type_id = 
"gst_element_flags_get_type ()")]
        [Flags]
@@ -3349,14 +3376,14 @@ namespace Gst {
                TIME,
                BUFFERS,
                PERCENT;
-               [CCode (cname = "gst_formats_contains")]
-               public static bool contains ([CCode (array_length = false, array_null_terminated = true)] 
Gst.Format[] formats, Gst.Format format);
                public static Gst.Format get_by_nick (string nick);
                public unowned Gst.FormatDefinition? get_details ();
                public unowned string? get_name ();
                public static Gst.Iterator iterate_definitions ();
                public static Gst.Format register (string nick, string description);
                public GLib.Quark to_quark ();
+               [CCode (cname = "gst_formats_contains")]
+               public static bool contains ([CCode (array_length = false, array_null_terminated = true)] 
Gst.Format[] formats, Gst.Format format);
        }
        [CCode (cheader_filename = "gst/gst.h", cprefix = "GST_GAP_FLAG_MISSING_", type_id = 
"gst_gap_flags_get_type ()")]
        [Flags]
@@ -3972,7 +3999,8 @@ namespace Gst {
                UNSUPPORTED_PROTOCOL,
                BAD_URI,
                BAD_STATE,
-               BAD_REFERENCE
+               BAD_REFERENCE;
+               public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gst/gst.h", instance_pos = 2.9)]
        public delegate bool BufferForeachMetaFunc (Gst.Buffer buffer, out Gst.Meta? meta);
@@ -4253,6 +4281,18 @@ namespace Gst {
        [CCode (cheader_filename = "gst/gst.h", cname = "GST_TIME_ARGS", use_inplace = true)]
        public static uint TIME_ARGS (Gst.ClockTime t);
        [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "Buffer.get_max_memory", since = "1.2")]
+       public static uint buffer_get_max_memory ();
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "CapsFeatures.from_string", since = "1.2")]
+       public static Gst.CapsFeatures? caps_features_from_string (string features);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "Caps.from_string")]
+       public static Gst.Caps? caps_from_string (string string);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "CoreError.quark")]
+       public static GLib.Quark core_error_quark ();
+       [CCode (cheader_filename = "gst/gst.h")]
        public static void deinit ();
        [CCode (cheader_filename = "gst/gst.h")]
        [Version (since = "1.12")]
@@ -4260,10 +4300,37 @@ namespace Gst {
        [CCode (cheader_filename = "gst/gst.h")]
        public static string error_get_message (GLib.Quark domain, int code);
        [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "EventType.get_flags")]
+       public static Gst.EventTypeFlags event_type_get_flags (Gst.EventType type);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "EventType.get_name")]
+       public static unowned string event_type_get_name (Gst.EventType type);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "EventType.to_quark")]
+       public static GLib.Quark event_type_to_quark (Gst.EventType type);
+       [CCode (cheader_filename = "gst/gst.h")]
        public static string filename_to_uri (string filename) throws GLib.Error;
        [CCode (cheader_filename = "gst/gst.h")]
        public static GLib.Quark flow_to_quark (Gst.FlowReturn ret);
        [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "Format.get_by_nick")]
+       public static Gst.Format format_get_by_nick (string nick);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "Format.get_details")]
+       public static unowned Gst.FormatDefinition? format_get_details (Gst.Format format);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "Format.get_name")]
+       public static unowned string? format_get_name (Gst.Format format);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "Format.iterate_definitions")]
+       public static Gst.Iterator format_iterate_definitions ();
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "Format.register")]
+       public static Gst.Format format_register (string nick, string description);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "Format.to_quark")]
+       public static GLib.Quark format_to_quark (Gst.Format format);
+       [CCode (cheader_filename = "gst/gst.h")]
        [Version (since = "1.14")]
        public static unowned string? get_main_executable_path ();
        [CCode (cheader_filename = "gst/gst.h")]
@@ -4277,37 +4344,120 @@ namespace Gst {
        [CCode (cheader_filename = "gst/gst.h")]
        public static bool is_initialized ();
        [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "LibraryError.quark")]
+       public static GLib.Quark library_error_quark ();
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "MessageType.get_name")]
+       public static unowned string message_type_get_name (Gst.MessageType type);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "MessageType.to_quark")]
+       public static GLib.Quark message_type_to_quark (Gst.MessageType type);
+       [CCode (array_length = false, array_null_terminated = true, cheader_filename = "gst/gst.h")]
+       [Version (replacement = "Meta.api_type_get_tags", since = "1.2")]
+       public static unowned string[] meta_api_type_get_tags (GLib.Type api);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "Meta.api_type_has_tag")]
+       public static bool meta_api_type_has_tag (GLib.Type api, GLib.Quark tag);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "Meta.api_type_register")]
+       public static GLib.Type meta_api_type_register (string api, [CCode (array_length = false, 
array_null_terminated = true)] string[] tags);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "Meta.get_info")]
+       public static unowned Gst.MetaInfo? meta_get_info (string impl);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "Meta.register")]
+       public static unowned Gst.MetaInfo? meta_register (GLib.Type api, string impl, size_t size, [CCode 
(scope = "async")] Gst.MetaInitFunction init_func, [CCode (scope = "async")] Gst.MetaFreeFunction free_func, 
[CCode (scope = "async")] Gst.MetaTransformFunction transform_func);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "Meta.register_custom", since = "1.20")]
+       public static unowned Gst.MetaInfo? meta_register_custom (string name, [CCode (array_length = false, 
array_null_terminated = true)] string[] tags, owned Gst.CustomMetaTransformFunction? transform_func);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "MiniObject.replace")]
+       public static bool mini_object_replace (ref Gst.MiniObject? olddata, Gst.MiniObject? newdata);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "MiniObject.take")]
+       public static bool mini_object_take (ref Gst.MiniObject olddata, Gst.MiniObject newdata);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "PadMode.get_name")]
+       public static unowned string pad_mode_get_name (Gst.PadMode mode);
+       [CCode (cheader_filename = "gst/gst.h")]
        [Version (since = "1.14")]
        public static GLib.ParamSpec param_spec_array (string name, string nick, string blurb, GLib.ParamSpec 
element_spec, GLib.ParamFlags flags);
        [CCode (cheader_filename = "gst/gst.h")]
        public static GLib.ParamSpec? param_spec_fraction (string name, string nick, string blurb, int 
min_num, int min_denom, int max_num, int max_denom, int default_num, int default_denom, GLib.ParamFlags 
flags);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "ParentBufferMeta.get_info", since = "1.6")]
+       public static unowned Gst.MetaInfo? parent_buffer_meta_get_info ();
        [CCode (cheader_filename = "gst/gst.h", cname = "gst_parse_bin_from_description_full", 
returns_floating_reference = true)]
        public static Gst.Element parse_bin_from_description (string bin_description, bool 
ghost_unlinked_pads, Gst.ParseContext? context = null, Gst.ParseFlags flags = Gst.ParseFlags.NONE) throws 
GLib.Error;
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "ParseError.quark")]
+       public static GLib.Quark parse_error_quark ();
        [CCode (cheader_filename = "gst/gst.h", cname = "gst_parse_launch_full", returns_floating_reference = 
true)]
        public static Gst.Element parse_launch (string pipeline_description, Gst.ParseContext? context = 
null, Gst.ParseFlags flags = Gst.ParseFlags.NONE) throws GLib.Error;
        [CCode (cheader_filename = "gst/gst.h", cname = "gst_parse_launchv_full", returns_floating_reference 
= true)]
        public static Gst.Element parse_launchv ([CCode (array_length = false, array_null_terminated = true)] 
string[] argv, Gst.ParseContext? context = null, Gst.ParseFlags flags = Gst.ParseFlags.NONE) throws 
GLib.Error;
        [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "PluginError.quark")]
+       public static GLib.Quark plugin_error_quark ();
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "Preset.get_app_dir")]
        public static unowned string? preset_get_app_dir ();
        [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "Preset.set_app_dir")]
        public static bool preset_set_app_dir (string app_dir);
        [CCode (array_length = false, array_null_terminated = true, cheader_filename = "gst/gst.h")]
        [Version (since = "1.14")]
        public static string[]? protection_filter_systems_by_available_decryptors ([CCode (array_length = 
false, array_null_terminated = true)] string[] system_identifiers);
        [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "ProtectionMeta.get_info")]
+       public static unowned Gst.MetaInfo? protection_meta_get_info ();
+       [CCode (cheader_filename = "gst/gst.h")]
        [Version (since = "1.6")]
        public static unowned string? protection_select_system ([CCode (array_length = false, 
array_null_terminated = true)] string[] system_identifiers);
        [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "QueryType.get_flags")]
+       public static Gst.QueryTypeFlags query_type_get_flags (Gst.QueryType type);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "QueryType.get_name")]
+       public static unowned string query_type_get_name (Gst.QueryType type);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "QueryType.to_quark")]
+       public static GLib.Quark query_type_to_quark (Gst.QueryType type);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "ReferenceTimestampMeta.get_info", since = "1.14")]
+       public static unowned Gst.MetaInfo? reference_timestamp_meta_get_info ();
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "ResourceError.quark")]
+       public static GLib.Quark resource_error_quark ();
+       [CCode (cheader_filename = "gst/gst.h")]
        public static bool segtrap_is_enabled ();
        [CCode (cheader_filename = "gst/gst.h")]
        public static void segtrap_set_enabled (bool enabled);
        [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "StateChange.get_name", since = "1.14")]
+       public static unowned string state_change_get_name (Gst.StateChange transition);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "StreamError.quark")]
+       public static GLib.Quark stream_error_quark ();
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "StreamType.get_name", since = "1.10")]
+       public static unowned string stream_type_get_name (Gst.StreamType stype);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "Structure.take", since = "1.18")]
+       public static bool structure_take (ref Gst.Structure? oldstr_ptr, owned Gst.Structure? newstr);
+       [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "TocEntryType.get_nick")]
+       public static unowned string toc_entry_type_get_nick (Gst.TocEntryType type);
+       [CCode (cheader_filename = "gst/gst.h")]
        [Version (since = "1.18")]
        public static GLib.List<Gst.Tracer> tracing_get_active_tracers ();
        [CCode (cheader_filename = "gst/gst.h")]
        [Version (since = "1.8")]
        public static void tracing_register_hook (Gst.Tracer tracer, string detail, [CCode (scope = "async")] 
GLib.Callback func);
        [CCode (cheader_filename = "gst/gst.h")]
+       [Version (replacement = "TypeFind.register")]
+       public static bool type_find_register (Gst.Plugin? plugin, string name, uint rank, [CCode 
(delegate_target_pos = 6.1, destroy_notify_pos = 6.2)] owned Gst.TypeFindFunction func, string? extensions, 
Gst.Caps? possible_caps);
+       [CCode (cheader_filename = "gst/gst.h")]
        [Version (since = "1.18")]
        public static bool type_is_plugin_api (GLib.Type type, out Gst.PluginAPIFlags? flags);
        [CCode (cheader_filename = "gst/gst.h")]
diff --git a/vapi/gstreamer-audio-1.0.vapi b/vapi/gstreamer-audio-1.0.vapi
index a98c6211f..4d8192f67 100644
--- a/vapi/gstreamer-audio-1.0.vapi
+++ b/vapi/gstreamer-audio-1.0.vapi
@@ -366,6 +366,8 @@ namespace Gst {
                        public bool convert (Gst.Format src_fmt, int64 src_val, Gst.Format dest_fmt, out 
int64 dest_val);
                        public Gst.Audio.Info copy ();
                        public void free ();
+                       public bool from_caps (Gst.Caps caps);
+                       public void init ();
                        [Version (since = "1.2")]
                        public bool is_equal (Gst.Audio.Info other);
                        public void set_format (Gst.Audio.Format format, int rate, int channels, [CCode 
(array_length = false)] Gst.Audio.ChannelPosition position[64]);
@@ -385,11 +387,13 @@ namespace Gst {
                [Version (since = "1.10")]
                public class Resampler {
                        [CCode (has_construct_function = false)]
+                       [Version (replacement = "AudioResampler.new")]
                        public Resampler (Gst.Audio.ResamplerMethod method, Gst.Audio.ResamplerFlags flags, 
Gst.Audio.Format format, int channels, int in_rate, int out_rate, Gst.Structure options);
                        public void free ();
                        public size_t get_in_frames (size_t out_frames);
                        public size_t get_max_latency ();
                        public size_t get_out_frames (size_t in_frames);
+                       public static void options_set_quality (Gst.Audio.ResamplerMethod method, uint 
quality, int in_rate, int out_rate, Gst.Structure options);
                        public void resample (void* @in, size_t in_frames, void* @out, size_t out_frames);
                        public void reset ();
                        public bool update (int in_rate, int out_rate, Gst.Structure options);
@@ -537,6 +541,10 @@ namespace Gst {
                        public int n_planes;
                        public void* planes;
                        public weak Gst.Buffer buffer;
+                       public static Gst.Buffer clip (owned Gst.Buffer buffer, Gst.Segment segment, int 
rate, int bpf);
+                       public bool map (Gst.Audio.Info info, Gst.Buffer gstbuffer, Gst.MapFlags flags);
+                       public static bool reorder_channels (Gst.Buffer buffer, Gst.Audio.Format format, 
[CCode (array_length_cname = "channels", array_length_pos = 2.5)] Gst.Audio.ChannelPosition[] from, [CCode 
(array_length_cname = "channels", array_length_pos = 2.5)] Gst.Audio.ChannelPosition[] to);
+                       public static Gst.Buffer truncate (owned Gst.Buffer buffer, int bpf, size_t trim, 
size_t samples);
                        public void unmap ();
                }
                [CCode (cheader_filename = "gst/audio/audio.h", has_type_id = false)]
@@ -556,6 +564,7 @@ namespace Gst {
                        public Gst.Format format;
                        public uint64 start;
                        public uint64 end;
+                       public static unowned Gst.MetaInfo? get_info ();
                }
                [CCode (cheader_filename = "gst/audio/audio.h", has_type_id = false)]
                [GIR (name = "AudioDownmixMeta")]
@@ -566,6 +575,7 @@ namespace Gst {
                        public int from_channels;
                        public int to_channels;
                        public float matrix;
+                       public static unowned Gst.MetaInfo? get_info ();
                }
                [CCode (cheader_filename = "gst/audio/audio.h", has_type_id = false)]
                [GIR (name = "AudioFormatInfo")]
@@ -592,6 +602,7 @@ namespace Gst {
                        public Gst.Meta meta;
                        public uint8 level;
                        public bool voice_activity;
+                       public static unowned Gst.MetaInfo? get_info ();
                }
                [CCode (cheader_filename = "gst/audio/audio.h", has_type_id = false)]
                [GIR (name = "AudioMeta")]
@@ -601,6 +612,7 @@ namespace Gst {
                        public weak Gst.Audio.Info info;
                        public size_t samples;
                        public size_t offsets;
+                       public static unowned Gst.MetaInfo? get_info ();
                }
                [CCode (cheader_filename = "gst/audio/audio.h", has_type_id = false)]
                [GIR (name = "AudioRingBufferSpec")]
@@ -768,7 +780,13 @@ namespace Gst {
                        S18,
                        U18,
                        F32,
-                       F64
+                       F64;
+                       public static Gst.Audio.Format build_integer (bool sign, int endianness, int width, 
int depth);
+                       [Version (deprecated = true, deprecated_since = "1.20")]
+                       public static void fill_silence (Gst.Audio.FormatInfo info, [CCode 
(array_length_cname = "length", array_length_pos = 2.1, array_length_type = "gsize")] uint8[] dest);
+                       public static Gst.Audio.Format from_string (string format);
+                       public unowned Gst.Audio.FormatInfo? get_info ();
+                       public unowned string to_string ();
                }
                [CCode (cheader_filename = "gst/audio/audio.h", cprefix = "GST_AUDIO_FORMAT_FLAG_", type_id = 
"gst_audio_format_flags_get_type ()")]
                [Flags]
@@ -960,14 +978,16 @@ namespace Gst {
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "GST_AUDIO_RESAMPLER_QUALITY_MIN")]
                public const int RESAMPLER_QUALITY_MIN;
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_buffer_clip")]
+               [Version (replacement = "AudioBuffer.clip")]
                public static Gst.Buffer audio_buffer_clip (owned Gst.Buffer buffer, Gst.Segment segment, int 
rate, int bpf);
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_buffer_map")]
-               [Version (since = "1.16")]
+               [Version (replacement = "AudioBuffer.map", since = "1.16")]
                public static bool audio_buffer_map (out Gst.Audio.Buffer buffer, Gst.Audio.Info info, 
Gst.Buffer gstbuffer, Gst.MapFlags flags);
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_buffer_reorder_channels")]
+               [Version (replacement = "AudioBuffer.reorder_channels")]
                public static bool audio_buffer_reorder_channels (Gst.Buffer buffer, Gst.Audio.Format format, 
[CCode (array_length_cname = "channels", array_length_pos = 2.5)] Gst.Audio.ChannelPosition[] from, [CCode 
(array_length_cname = "channels", array_length_pos = 2.5)] Gst.Audio.ChannelPosition[] to);
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_buffer_truncate")]
-               [Version (since = "1.16")]
+               [Version (replacement = "AudioBuffer.truncate", since = "1.16")]
                public static Gst.Buffer audio_buffer_truncate (owned Gst.Buffer buffer, int bpf, size_t 
trim, size_t samples);
                [CCode (cheader_filename = "gst/audio/audio.h", cname = 
"gst_audio_channel_get_fallback_mask")]
                [Version (since = "1.8")]
@@ -986,23 +1006,29 @@ namespace Gst {
                [CCode (cheader_filename = "gst/audio/audio.h", cname = 
"gst_audio_clipping_meta_api_get_type")]
                public static GLib.Type audio_clipping_meta_api_get_type ();
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_clipping_meta_get_info")]
+               [Version (replacement = "AudioClippingMeta.get_info")]
                public static unowned Gst.MetaInfo? audio_clipping_meta_get_info ();
                [CCode (cheader_filename = "gst/audio/audio.h", cname = 
"gst_audio_downmix_meta_api_get_type")]
                public static GLib.Type audio_downmix_meta_api_get_type ();
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_downmix_meta_get_info")]
+               [Version (replacement = "AudioDownmixMeta.get_info")]
                public static unowned Gst.MetaInfo? audio_downmix_meta_get_info ();
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_format_build_integer")]
+               [Version (replacement = "AudioFormat.build_integer")]
                public static Gst.Audio.Format audio_format_build_integer (bool sign, int endianness, int 
width, int depth);
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_format_fill_silence")]
-               [Version (deprecated = true, deprecated_since = "1.20")]
+               [Version (deprecated = true, deprecated_since = "1.20", replacement = 
"AudioFormat.fill_silence")]
                public static void audio_format_fill_silence (Gst.Audio.FormatInfo info, [CCode 
(array_length_cname = "length", array_length_pos = 2.1, array_length_type = "gsize")] uint8[] dest);
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_format_from_string")]
+               [Version (replacement = "AudioFormat.from_string")]
                public static Gst.Audio.Format audio_format_from_string (string format);
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_format_get_info")]
+               [Version (replacement = "AudioFormat.get_info")]
                public static unowned Gst.Audio.FormatInfo? audio_format_get_info (Gst.Audio.Format format);
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_format_info_get_type")]
                public static GLib.Type audio_format_info_get_type ();
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_format_to_string")]
+               [Version (replacement = "AudioFormat.to_string")]
                public static unowned string audio_format_to_string (Gst.Audio.Format format);
                [CCode (array_length_pos = 0.1, array_length_type = "guint", cheader_filename = 
"gst/audio/audio.h", cname = "gst_audio_formats_raw")]
                [Version (since = "1.18")]
@@ -1014,14 +1040,16 @@ namespace Gst {
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_iec61937_payload")]
                public static bool audio_iec61937_payload ([CCode (array_length_cname = "src_n", 
array_length_pos = 1.5, array_length_type = "guint")] uint8[] src, [CCode (array_length_cname = "dst_n", 
array_length_pos = 2.5, array_length_type = "guint")] uint8[] dst, Gst.Audio.RingBufferSpec spec, int 
endianness);
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_info_from_caps")]
+               [Version (replacement = "AudioInfo.from_caps")]
                public static bool audio_info_from_caps (out unowned Gst.Audio.Info info, Gst.Caps caps);
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_info_init")]
+               [Version (replacement = "AudioInfo.init")]
                public static void audio_info_init (out unowned Gst.Audio.Info info);
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_level_meta_api_get_type")]
                [Version (since = "1.20")]
                public static GLib.Type audio_level_meta_api_get_type ();
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_level_meta_get_info")]
-               [Version (since = "1.20")]
+               [Version (replacement = "AudioLevelMeta.get_info", since = "1.20")]
                public static unowned Gst.MetaInfo? audio_level_meta_get_info ();
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_make_raw_caps")]
                [Version (since = "1.18")]
@@ -1029,10 +1057,12 @@ namespace Gst {
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_meta_api_get_type")]
                public static GLib.Type audio_meta_api_get_type ();
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_meta_get_info")]
+               [Version (replacement = "AudioMeta.get_info")]
                public static unowned Gst.MetaInfo? audio_meta_get_info ();
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_reorder_channels")]
                public static bool audio_reorder_channels ([CCode (array_length_cname = "size", 
array_length_pos = 1.5, array_length_type = "gsize")] uint8[] data, Gst.Audio.Format format, [CCode 
(array_length_cname = "channels", array_length_pos = 2.5)] Gst.Audio.ChannelPosition[] from, [CCode 
(array_length_cname = "channels", array_length_pos = 2.5)] Gst.Audio.ChannelPosition[] to);
                [CCode (cheader_filename = "gst/audio/audio.h", cname = 
"gst_audio_resampler_options_set_quality")]
+               [Version (replacement = "AudioResampler.options_set_quality")]
                public static void audio_resampler_options_set_quality (Gst.Audio.ResamplerMethod method, 
uint quality, int in_rate, int out_rate, Gst.Structure options);
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_buffer_add_audio_clipping_meta")]
                [Version (since = "1.8")]
@@ -1051,6 +1081,7 @@ namespace Gst {
                [Version (since = "1.20")]
                public static unowned Gst.Audio.LevelMeta? buffer_get_audio_level_meta (Gst.Buffer buffer);
                [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_stream_volume_convert_volume")]
+               [Version (replacement = "StreamVolume.convert_volume")]
                public static double stream_volume_convert_volume (Gst.Audio.StreamVolumeFormat from, 
Gst.Audio.StreamVolumeFormat to, double val);
        }
 }
diff --git a/vapi/gstreamer-base-1.0.vapi b/vapi/gstreamer-base-1.0.vapi
index e7ab05888..30ec578d6 100644
--- a/vapi/gstreamer-base-1.0.vapi
+++ b/vapi/gstreamer-base-1.0.vapi
@@ -366,6 +366,12 @@ namespace Gst {
                        public void init_with_data ([CCode (array_length_cname = "size", array_length_pos = 
1.5, array_length_type = "guint")] uint8[] data, bool initialized);
                        [CCode (cname = "gst_byte_writer_init_with_size")]
                        public void init_with_size (uint size, bool fixed);
+                       [CCode (cname = "gst_byte_writer_new")]
+                       public static Gst.Base.ByteWriter @new ();
+                       [CCode (cname = "gst_byte_writer_new_with_data")]
+                       public static Gst.Base.ByteWriter new_with_data (uint8 data, uint size, bool 
initialized);
+                       [CCode (cname = "gst_byte_writer_new_with_size")]
+                       public static Gst.Base.ByteWriter new_with_size (uint size, bool fixed);
                        [CCode (cname = "gst_byte_writer_put_buffer")]
                        public bool put_buffer (Gst.Buffer buffer, size_t offset, ssize_t size);
                        [CCode (cname = "gst_byte_writer_put_data")]
diff --git a/vapi/gstreamer-check-1.0.vapi b/vapi/gstreamer-check-1.0.vapi
index 7da174fcc..29d83f735 100644
--- a/vapi/gstreamer-check-1.0.vapi
+++ b/vapi/gstreamer-check-1.0.vapi
@@ -175,6 +175,8 @@ namespace Gst {
                        public Gst.FlowReturn src_crank_and_push_many (int cranks, int pushes);
                        [CCode (cname = "gst_harness_src_push_event")]
                        public bool src_push_event ();
+                       [CCode (cname = "gst_harness_stress_thread_stop")]
+                       public static uint stress_thread_stop (Gst.Check.HarnessThread t);
                        [CCode (cname = "gst_harness_take_all_data_as_buffer")]
                        [Version (since = "1.14")]
                        public Gst.Buffer take_all_data_as_buffer ();
@@ -233,7 +235,7 @@ namespace Gst {
                [CCode (cheader_filename = "gst/check/check.h")]
                public static void element_push_buffer_list (string element_name, owned GLib.List<Gst.Buffer> 
buffer_in, Gst.Caps caps_in, owned GLib.List<Gst.Buffer> buffer_out, Gst.Caps caps_out, Gst.FlowReturn 
last_flow_return);
                [CCode (cheader_filename = "gst/check/check.h", cname = "gst_harness_stress_thread_stop")]
-               [Version (since = "1.6")]
+               [Version (replacement = "Harness.stress_thread_stop", since = "1.6")]
                public static uint harness_stress_thread_stop (Gst.Check.HarnessThread t);
                [CCode (cheader_filename = "gst/check/check.h")]
                public static void init (int argc, string argv);
diff --git a/vapi/gstreamer-net-1.0.vapi b/vapi/gstreamer-net-1.0.vapi
index aef871785..be7579fe0 100644
--- a/vapi/gstreamer-net-1.0.vapi
+++ b/vapi/gstreamer-net-1.0.vapi
@@ -84,12 +84,14 @@ namespace Gst {
                public struct AddressMeta {
                        public Gst.Meta meta;
                        public weak GLib.SocketAddress addr;
+                       public static unowned Gst.MetaInfo? get_info ();
                }
                [CCode (cheader_filename = "gst/net/net.h", has_type_id = false)]
                [GIR (name = "NetControlMessageMeta")]
                public struct ControlMessageMeta {
                        public Gst.Meta meta;
                        public weak GLib.SocketControlMessage message;
+                       public static unowned Gst.MetaInfo? get_info ();
                }
                [CCode (cheader_filename = "gst/net/net.h", cname = "GstPtpStatisticsCallback", instance_pos 
= 2.9)]
                public delegate bool PtpStatisticsCallback (uint8 domain, Gst.Structure stats);
@@ -106,6 +108,7 @@ namespace Gst {
                [CCode (cheader_filename = "gst/net/net.h")]
                public static GLib.Type address_meta_api_get_type ();
                [CCode (cheader_filename = "gst/net/net.h")]
+               [Version (replacement = "NetAddressMeta.get_info")]
                public static unowned Gst.MetaInfo? address_meta_get_info ();
                [CCode (cheader_filename = "gst/net/net.h", cname = "gst_buffer_add_net_address_meta")]
                public static unowned Gst.Net.AddressMeta? buffer_add_net_address_meta (Gst.Buffer buffer, 
GLib.SocketAddress addr);
@@ -116,6 +119,7 @@ namespace Gst {
                [CCode (cheader_filename = "gst/net/net.h")]
                public static GLib.Type control_message_meta_api_get_type ();
                [CCode (cheader_filename = "gst/net/net.h")]
+               [Version (replacement = "NetControlMessageMeta.get_info")]
                public static unowned Gst.MetaInfo? control_message_meta_get_info ();
                [CCode (cheader_filename = "gst/net/net.h", cname = "gst_ptp_deinit")]
                [Version (since = "1.6")]
@@ -136,6 +140,9 @@ namespace Gst {
                [Version (since = "1.6")]
                public static void ptp_statistics_callback_remove (ulong id);
                [CCode (cheader_filename = "gst/net/net.h")]
+               [Version (replacement = "NetTimePacket.receive")]
+               public static Gst.Net.TimePacket time_packet_receive (GLib.Socket socket, out 
GLib.SocketAddress src_address) throws GLib.Error;
+               [CCode (cheader_filename = "gst/net/net.h")]
                [Version (since = "1.18")]
                public static bool utils_set_socket_tos (GLib.Socket socket, int qos_dscp);
        }
diff --git a/vapi/gstreamer-pbutils-1.0.vapi b/vapi/gstreamer-pbutils-1.0.vapi
index 802cf4a1e..6cfee23d6 100644
--- a/vapi/gstreamer-pbutils-1.0.vapi
+++ b/vapi/gstreamer-pbutils-1.0.vapi
@@ -323,7 +323,9 @@ namespace Gst {
                        STARTED_OK,
                        INTERNAL_FAILURE,
                        HELPER_MISSING,
-                       INSTALL_IN_PROGRESS
+                       INSTALL_IN_PROGRESS;
+                       [CCode (cname = "gst_install_plugins_return_get_name")]
+                       public unowned string get_name ();
                }
                [CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "GstAudioVisualizerShaderFunc", 
has_target = false)]
                public delegate void AudioVisualizerShaderFunc (Gst.PbUtils.AudioVisualizer scope, 
Gst.Video.Frame s, Gst.Video.Frame d);
@@ -402,6 +404,7 @@ namespace Gst {
                [CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = 
"gst_install_plugins_installation_in_progress")]
                public static bool install_plugins_installation_in_progress ();
                [CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = 
"gst_install_plugins_return_get_name")]
+               [Version (replacement = "InstallPluginsReturn.get_name")]
                public static unowned string install_plugins_return_get_name 
(Gst.PbUtils.InstallPluginsReturn ret);
                [CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_install_plugins_supported")]
                public static bool install_plugins_supported ();
diff --git a/vapi/gstreamer-play-1.0.vapi b/vapi/gstreamer-play-1.0.vapi
index 3e99fc9dd..65be184ce 100644
--- a/vapi/gstreamer-play-1.0.vapi
+++ b/vapi/gstreamer-play-1.0.vapi
@@ -222,7 +222,8 @@ namespace Gst {
                        HUE,
                        BRIGHTNESS,
                        SATURATION,
-                       CONTRAST
+                       CONTRAST;
+                       public unowned string get_name ();
                }
                [CCode (cheader_filename = "gst/play/play.h", cprefix = "GST_PLAY_MESSAGE_", type_id = 
"gst_play_message_get_type ()")]
                [GIR (name = "PlayMessage")]
@@ -240,7 +241,19 @@ namespace Gst {
                        MEDIA_INFO_UPDATED,
                        VOLUME_CHANGED,
                        MUTE_CHANGED,
-                       SEEK_DONE
+                       SEEK_DONE;
+                       public unowned string get_name ();
+                       public static void parse_buffering_percent (Gst.Message msg, out uint percent);
+                       public static void parse_duration_updated (Gst.Message msg, out Gst.ClockTime 
duration);
+                       public static void parse_error (Gst.Message msg, out unowned GLib.Error error, out 
Gst.Structure details);
+                       public static void parse_media_info_updated (Gst.Message msg, out Gst.Play.MediaInfo 
info);
+                       public static void parse_muted_changed (Gst.Message msg, out bool muted);
+                       public static void parse_position_updated (Gst.Message msg, out Gst.ClockTime 
position);
+                       public static void parse_state_changed (Gst.Message msg, out Gst.Play.State state);
+                       public static void parse_type (Gst.Message msg, out Gst.Play.Message type);
+                       public static void parse_video_dimensions_changed (Gst.Message msg, out uint width, 
out uint height);
+                       public static void parse_volume_changed (Gst.Message msg, out double volume);
+                       public static void parse_warning (Gst.Message msg, out unowned GLib.Error error, out 
Gst.Structure details);
                }
                [CCode (cheader_filename = "gst/play/play.h", cprefix = "GST_PLAY_THUMBNAIL_", has_type_id = 
false)]
                [GIR (name = "PlaySnapshotFormat")]
@@ -261,61 +274,64 @@ namespace Gst {
                        STOPPED,
                        BUFFERING,
                        PAUSED,
-                       PLAYING
+                       PLAYING;
+                       public unowned string get_name ();
                }
                [CCode (cheader_filename = "gst/play/play.h", cprefix = "GST_PLAY_ERROR_")]
                [GIR (name = "PlayError")]
                [Version (since = "1.20")]
                public errordomain Error {
-                       FAILED
+                       FAILED;
+                       public unowned string get_name ();
+                       public static GLib.Quark quark ();
                }
                [CCode (cheader_filename = "gst/play/play.h", cname = "gst_play_color_balance_type_get_name")]
-               [Version (since = "1.20")]
+               [Version (replacement = "PlayColorBalanceType.get_name", since = "1.20")]
                public static unowned string play_color_balance_type_get_name (Gst.Play.ColorBalanceType 
type);
                [CCode (cheader_filename = "gst/play/play.h", cname = "gst_play_error_get_name")]
-               [Version (since = "1.20")]
+               [Version (replacement = "PlayError.get_name", since = "1.20")]
                public static unowned string play_error_get_name (Gst.Play.Error error);
                [CCode (cheader_filename = "gst/play/play.h", cname = "gst_play_error_quark")]
-               [Version (since = "1.20")]
+               [Version (replacement = "PlayError.quark", since = "1.20")]
                public static GLib.Quark play_error_quark ();
                [CCode (cheader_filename = "gst/play/play.h", cname = "gst_play_message_get_name")]
-               [Version (since = "1.20")]
+               [Version (replacement = "PlayMessage.get_name", since = "1.20")]
                public static unowned string play_message_get_name (Gst.Play.Message message_type);
                [CCode (cheader_filename = "gst/play/play.h", cname = 
"gst_play_message_parse_buffering_percent")]
-               [Version (since = "1.20")]
+               [Version (replacement = "PlayMessage.parse_buffering_percent", since = "1.20")]
                public static void play_message_parse_buffering_percent (Gst.Message msg, out uint percent);
                [CCode (cheader_filename = "gst/play/play.h", cname = 
"gst_play_message_parse_duration_updated")]
-               [Version (since = "1.20")]
+               [Version (replacement = "PlayMessage.parse_duration_updated", since = "1.20")]
                public static void play_message_parse_duration_updated (Gst.Message msg, out Gst.ClockTime 
duration);
                [CCode (cheader_filename = "gst/play/play.h", cname = "gst_play_message_parse_error")]
-               [Version (since = "1.20")]
+               [Version (replacement = "PlayMessage.parse_error", since = "1.20")]
                public static void play_message_parse_error (Gst.Message msg, out unowned GLib.Error error, 
out Gst.Structure details);
                [CCode (cheader_filename = "gst/play/play.h", cname = 
"gst_play_message_parse_media_info_updated")]
-               [Version (since = "1.20")]
+               [Version (replacement = "PlayMessage.parse_media_info_updated", since = "1.20")]
                public static void play_message_parse_media_info_updated (Gst.Message msg, out 
Gst.Play.MediaInfo info);
                [CCode (cheader_filename = "gst/play/play.h", cname = "gst_play_message_parse_muted_changed")]
-               [Version (since = "1.20")]
+               [Version (replacement = "PlayMessage.parse_muted_changed", since = "1.20")]
                public static void play_message_parse_muted_changed (Gst.Message msg, out bool muted);
                [CCode (cheader_filename = "gst/play/play.h", cname = 
"gst_play_message_parse_position_updated")]
-               [Version (since = "1.20")]
+               [Version (replacement = "PlayMessage.parse_position_updated", since = "1.20")]
                public static void play_message_parse_position_updated (Gst.Message msg, out Gst.ClockTime 
position);
                [CCode (cheader_filename = "gst/play/play.h", cname = "gst_play_message_parse_state_changed")]
-               [Version (since = "1.20")]
+               [Version (replacement = "PlayMessage.parse_state_changed", since = "1.20")]
                public static void play_message_parse_state_changed (Gst.Message msg, out Gst.Play.State 
state);
                [CCode (cheader_filename = "gst/play/play.h", cname = "gst_play_message_parse_type")]
-               [Version (since = "1.20")]
+               [Version (replacement = "PlayMessage.parse_type", since = "1.20")]
                public static void play_message_parse_type (Gst.Message msg, out Gst.Play.Message type);
                [CCode (cheader_filename = "gst/play/play.h", cname = 
"gst_play_message_parse_video_dimensions_changed")]
-               [Version (since = "1.20")]
+               [Version (replacement = "PlayMessage.parse_video_dimensions_changed", since = "1.20")]
                public static void play_message_parse_video_dimensions_changed (Gst.Message msg, out uint 
width, out uint height);
                [CCode (cheader_filename = "gst/play/play.h", cname = 
"gst_play_message_parse_volume_changed")]
-               [Version (since = "1.20")]
+               [Version (replacement = "PlayMessage.parse_volume_changed", since = "1.20")]
                public static void play_message_parse_volume_changed (Gst.Message msg, out double volume);
                [CCode (cheader_filename = "gst/play/play.h", cname = "gst_play_message_parse_warning")]
-               [Version (since = "1.20")]
+               [Version (replacement = "PlayMessage.parse_warning", since = "1.20")]
                public static void play_message_parse_warning (Gst.Message msg, out unowned GLib.Error error, 
out Gst.Structure details);
                [CCode (cheader_filename = "gst/play/play.h", cname = "gst_play_state_get_name")]
-               [Version (since = "1.20")]
+               [Version (replacement = "PlayState.get_name", since = "1.20")]
                public static unowned string play_state_get_name (Gst.Play.State state);
        }
 }
diff --git a/vapi/gstreamer-player-1.0.vapi b/vapi/gstreamer-player-1.0.vapi
index 6f8581f11..e05295add 100644
--- a/vapi/gstreamer-player-1.0.vapi
+++ b/vapi/gstreamer-player-1.0.vapi
@@ -252,4 +252,16 @@ namespace Gst {
        }
        [CCode (cheader_filename = "gst/player/player.h", has_target = false)]
        public delegate void PlayerSignalDispatcherFunc (void* data);
+       [CCode (cheader_filename = "gst/player/player.h")]
+       [Version (replacement = "PlayerColorBalanceType.get_name")]
+       public static unowned string player_color_balance_type_get_name (Gst.PlayerColorBalanceType type);
+       [CCode (cheader_filename = "gst/player/player.h")]
+       [Version (replacement = "PlayerError.get_name")]
+       public static unowned string player_error_get_name (Gst.PlayerError error);
+       [CCode (cheader_filename = "gst/player/player.h")]
+       [Version (replacement = "PlayerError.quark")]
+       public static GLib.Quark player_error_quark ();
+       [CCode (cheader_filename = "gst/player/player.h")]
+       [Version (replacement = "PlayerState.get_name")]
+       public static unowned string player_state_get_name (Gst.PlayerState state);
 }
diff --git a/vapi/gstreamer-rtp-1.0.vapi b/vapi/gstreamer-rtp-1.0.vapi
index 846dbb67c..5170dff0b 100644
--- a/vapi/gstreamer-rtp-1.0.vapi
+++ b/vapi/gstreamer-rtp-1.0.vapi
@@ -219,6 +219,30 @@ namespace Gst {
                [CCode (cheader_filename = "gst/rtp/rtp.h", cname = "GST_RTCP_VERSION")]
                public const int VERSION;
                [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTCPBuffer.map")]
+               public static bool buffer_map (Gst.Buffer buffer, Gst.MapFlags flags, Gst.RTCP.Buffer rtcp);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTCPBuffer.new")]
+               public static Gst.Buffer buffer_new (uint mtu);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTCPBuffer.new_copy_data")]
+               public static Gst.Buffer buffer_new_copy_data ([CCode (array_length_cname = "len", 
array_length_pos = 1.1, array_length_type = "guint")] uint8[] data);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTCPBuffer.new_take_data")]
+               public static Gst.Buffer buffer_new_take_data ([CCode (array_length_cname = "len", 
array_length_pos = 1.1, array_length_type = "guint")] uint8[] data);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTCPBuffer.validate")]
+               public static bool buffer_validate (Gst.Buffer buffer);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTCPBuffer.validate_data")]
+               public static bool buffer_validate_data ([CCode (array_length_cname = "len", array_length_pos 
= 1.1, array_length_type = "guint")] uint8[] data);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTCPBuffer.validate_data_reduced", since = "1.6")]
+               public static bool buffer_validate_data_reduced ([CCode (array_length_cname = "len", 
array_length_pos = 1.1, array_length_type = "guint")] uint8[] data);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTCPBuffer.validate_reduced", since = "1.6")]
+               public static bool buffer_validate_reduced (Gst.Buffer buffer);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
                public static uint64 ntp_to_unix (uint64 ntptime);
                [CCode (cheader_filename = "gst/rtp/rtp.h")]
                public static uint64 unix_to_ntp (uint64 unixtime);
@@ -399,9 +423,6 @@ namespace Gst {
                        public weak size_t size[4];
                        public bool add_extension_onebyte_header (uint8 id, [CCode (array_length_cname = 
"size", array_length_pos = 2.1, array_length_type = "guint")] uint8[] data);
                        public bool add_extension_twobytes_header (uint8 appbits, uint8 id, [CCode 
(array_length_cname = "size", array_length_pos = 3.1, array_length_type = "guint")] uint8[] data);
-                       [CCode (cname = "gst_buffer_add_rtp_source_meta")]
-                       [Version (since = "1.16")]
-                       public static unowned Gst.RTP.SourceMeta? add_rtp_source_meta (Gst.Buffer buffer, 
uint32? ssrc, uint32? csrc, uint csrc_count);
                        public static void allocate_data (Gst.Buffer buffer, uint payload_len, uint8 pad_len, 
uint8 csrc_count);
                        public static uint calc_header_len (uint8 csrc_count);
                        public static uint calc_packet_len (uint payload_len, uint8 pad_len, uint8 
csrc_count);
@@ -431,9 +452,6 @@ namespace Gst {
                        public uint get_payload_len ();
                        public Gst.Buffer get_payload_subbuffer (uint offset, uint len);
                        public uint8 get_payload_type ();
-                       [CCode (cname = "gst_buffer_get_rtp_source_meta")]
-                       [Version (since = "1.16")]
-                       public static unowned Gst.RTP.SourceMeta? get_rtp_source_meta (Gst.Buffer buffer);
                        public uint16 get_seq ();
                        public uint32 get_ssrc ();
                        public uint32 get_timestamp ();
@@ -468,6 +486,8 @@ namespace Gst {
                        public uint clock_rate;
                        public weak string encoding_parameters;
                        public uint bitrate;
+                       public static unowned Gst.RTP.PayloadInfo? for_name (string media, string 
encoding_name);
+                       public static unowned Gst.RTP.PayloadInfo? for_pt (uint8 payload_type);
                }
                [CCode (cheader_filename = "gst/rtp/rtp.h", has_type_id = false)]
                [GIR (name = "RTPSourceMeta")]
@@ -480,6 +500,7 @@ namespace Gst {
                        public weak uint32 csrc[15];
                        public uint csrc_count;
                        public bool append_csrc ([CCode (array_length_cname = "csrc_count", array_length_pos 
= 1.1, array_length_type = "guint", type = "const guint32*")] uint32[] csrc);
+                       public static unowned Gst.MetaInfo? get_info ();
                        public uint get_source_count ();
                        public bool set_ssrc (uint32? ssrc);
                }
@@ -603,6 +624,51 @@ namespace Gst {
                public const int SOURCE_META_MAX_CSRC_COUNT;
                [CCode (cheader_filename = "gst/rtp/rtp.h", cname = "GST_RTP_VERSION")]
                public const int VERSION;
+               [CCode (cheader_filename = "gst/rtp/rtp.h", cname = "gst_buffer_add_rtp_source_meta")]
+               [Version (since = "1.16")]
+               public static unowned Gst.RTP.SourceMeta? buffer_add_rtp_source_meta (Gst.Buffer buffer, 
uint32? ssrc, uint32? csrc, uint csrc_count);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTPBuffer.allocate_data")]
+               public static void buffer_allocate_data (Gst.Buffer buffer, uint payload_len, uint8 pad_len, 
uint8 csrc_count);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTPBuffer.calc_header_len")]
+               public static uint buffer_calc_header_len (uint8 csrc_count);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTPBuffer.calc_packet_len")]
+               public static uint buffer_calc_packet_len (uint payload_len, uint8 pad_len, uint8 csrc_count);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTPBuffer.calc_payload_len")]
+               public static uint buffer_calc_payload_len (uint packet_len, uint8 pad_len, uint8 csrc_count);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTPBuffer.compare_seqnum")]
+               public static int buffer_compare_seqnum (uint16 seqnum1, uint16 seqnum2);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTPBuffer.default_clock_rate")]
+               public static uint32 buffer_default_clock_rate (uint8 payload_type);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTPBuffer.ext_timestamp")]
+               public static uint64 buffer_ext_timestamp (ref uint64 exttimestamp, uint32 timestamp);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTPBuffer.get_extension_onebyte_header_from_bytes", since = "1.18")]
+               public static bool buffer_get_extension_onebyte_header_from_bytes (GLib.Bytes bytes, uint16 
bit_pattern, uint8 id, uint nth, [CCode (array_length_cname = "size", array_length_pos = 5.1, 
array_length_type = "guint")] out unowned uint8[] data);
+               [CCode (cheader_filename = "gst/rtp/rtp.h", cname = "gst_buffer_get_rtp_source_meta")]
+               [Version (since = "1.16")]
+               public static unowned Gst.RTP.SourceMeta? buffer_get_rtp_source_meta (Gst.Buffer buffer);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTPBuffer.map")]
+               public static bool buffer_map (Gst.Buffer buffer, Gst.MapFlags flags, out Gst.RTP.Buffer rtp);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTPBuffer.new_allocate")]
+               public static Gst.Buffer buffer_new_allocate (uint payload_len, uint8 pad_len, uint8 
csrc_count);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTPBuffer.new_allocate_len")]
+               public static Gst.Buffer buffer_new_allocate_len (uint packet_len, uint8 pad_len, uint8 
csrc_count);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTPBuffer.new_copy_data")]
+               public static Gst.Buffer buffer_new_copy_data ([CCode (array_length_cname = "len", 
array_length_pos = 1.1, array_length_type = "gsize")] uint8[] data);
+               [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTPBuffer.new_take_data")]
+               public static Gst.Buffer buffer_new_take_data ([CCode (array_length_cname = "len", 
array_length_pos = 1.1, array_length_type = "gsize")] owned uint8[] data);
                [CCode (cheader_filename = "gst/rtp/rtp.h")]
                [Version (since = "1.20")]
                public static GLib.List<Gst.ElementFactory> get_header_extension_list ();
@@ -615,12 +681,15 @@ namespace Gst {
                [CCode (cheader_filename = "gst/rtp/rtp.h")]
                public static bool hdrext_set_ntp_64 (void* data, uint size, uint64 ntptime);
                [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTPPayloadInfo.for_name")]
                public static unowned Gst.RTP.PayloadInfo? payload_info_for_name (string media, string 
encoding_name);
                [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTPPayloadInfo.for_pt")]
                public static unowned Gst.RTP.PayloadInfo? payload_info_for_pt (uint8 payload_type);
                [CCode (cheader_filename = "gst/rtp/rtp.h")]
                public static GLib.Type source_meta_api_get_type ();
                [CCode (cheader_filename = "gst/rtp/rtp.h")]
+               [Version (replacement = "RTPSourceMeta.get_info")]
                public static unowned Gst.MetaInfo? source_meta_get_info ();
        }
 }
diff --git a/vapi/gstreamer-rtsp-1.0.vapi b/vapi/gstreamer-rtsp-1.0.vapi
index fafa3293b..9e35cc3c7 100644
--- a/vapi/gstreamer-rtsp-1.0.vapi
+++ b/vapi/gstreamer-rtsp-1.0.vapi
@@ -26,6 +26,7 @@ namespace Gst {
                [Compact]
                [GIR (name = "RTSPConnection")]
                public class Connection {
+                       public static Gst.RTSP.Result accept (GLib.Socket socket, out Gst.RTSP.Connection 
conn, GLib.Cancellable? cancellable = null);
                        public void clear_auth_params ();
                        public Gst.RTSP.Result close ();
                        [Version (deprecated = true, deprecated_since = "1.18")]
@@ -36,6 +37,8 @@ namespace Gst {
                        public Gst.RTSP.Result connect_with_response (GLib.TimeVal timeout, Gst.RTSP.Message 
response);
                        [Version (since = "1.18")]
                        public Gst.RTSP.Result connect_with_response_usec (int64 timeout, Gst.RTSP.Message 
response);
+                       public static Gst.RTSP.Result create (Gst.RTSP.Url url, out Gst.RTSP.Connection conn);
+                       public static Gst.RTSP.Result create_from_socket (GLib.Socket socket, string ip, 
uint16 port, string initial_buffer, out Gst.RTSP.Connection conn);
                        public Gst.RTSP.Result do_tunnel (Gst.RTSP.Connection conn2);
                        public Gst.RTSP.Result flush (bool flush);
                        public Gst.RTSP.Result free ();
@@ -215,6 +218,7 @@ namespace Gst {
                        public string get_request_uri ();
                        [Version (since = "1.18")]
                        public string get_request_uri_with_control (string control_path);
+                       public static Gst.RTSP.Result parse (string urlstr, out Gst.RTSP.Url url);
                        public Gst.RTSP.Result set_port (uint16 port);
                }
                [CCode (cheader_filename = "gst/rtsp/rtsp.h", has_type_id = false)]
@@ -259,6 +263,12 @@ namespace Gst {
                public struct Range {
                        public int min;
                        public int max;
+                       public static bool convert_units (Gst.RTSP.TimeRange range, Gst.RTSP.RangeUnit unit);
+                       public static void free (Gst.RTSP.TimeRange range);
+                       [Version (since = "1.2")]
+                       public static bool get_times (Gst.RTSP.TimeRange range, out Gst.ClockTime min, out 
Gst.ClockTime max);
+                       public static Gst.RTSP.Result parse (string rangestr, out Gst.RTSP.TimeRange range);
+                       public static string to_string (Gst.RTSP.TimeRange range);
                }
                [CCode (cheader_filename = "gst/rtsp/rtsp.h", has_type_id = false)]
                [GIR (name = "RTSPTime")]
@@ -304,9 +314,14 @@ namespace Gst {
                        public uint ssrc;
                        public string as_text ();
                        public Gst.RTSP.Result free ();
+                       public static Gst.RTSP.Result get_manager (Gst.RTSP.TransMode trans, out unowned 
string? manager, uint option);
                        [Version (since = "1.4")]
                        public Gst.RTSP.Result get_media_type (out unowned string media_type);
+                       [Version (deprecated = true)]
+                       public static Gst.RTSP.Result get_mime (Gst.RTSP.TransMode trans, string mime);
                        public Gst.RTSP.Result init ();
+                       public Gst.RTSP.Result @new ();
+                       public static Gst.RTSP.Result parse (string str, Gst.RTSP.Transport transport);
                }
                [CCode (cheader_filename = "gst/rtsp/rtsp.h", cprefix = "GST_RTSP_AUTH_", type_id = 
"gst_rtsp_auth_method_get_type ()")]
                [GIR (name = "RTSPAuthMethod")]
@@ -451,7 +466,8 @@ namespace Gst {
                        SET_PARAMETER,
                        TEARDOWN,
                        GET,
-                       POST
+                       POST;
+                       public unowned string as_text ();
                }
                [CCode (cheader_filename = "gst/rtsp/rtsp.h", cprefix = "GST_RTSP_MESSAGE_", type_id = 
"gst_rtsp_msg_type_get_type ()")]
                [GIR (name = "RTSPMsgType")]
@@ -587,7 +603,8 @@ namespace Gst {
                        INVALID,
                        @1_0,
                        @1_1,
-                       @2_0
+                       @2_0;
+                       public unowned string as_text ();
                }
                [CCode (cheader_filename = "gst/rtsp/rtsp.h", instance_pos = 3.9)]
                public delegate bool ConnectionAcceptCertificateFunc (GLib.TlsConnection conn, 
GLib.TlsCertificate peer_cert, GLib.TlsCertificateFlags errors);
@@ -597,10 +614,13 @@ namespace Gst {
                [Version (since = "1.12")]
                public static void auth_credentials_free (Gst.RTSP.AuthCredential credentials);
                [CCode (cheader_filename = "gst/rtsp/rtsp.h")]
+               [Version (replacement = "RTSPConnection.accept")]
                public static Gst.RTSP.Result connection_accept (GLib.Socket socket, out Gst.RTSP.Connection 
conn, GLib.Cancellable? cancellable = null);
                [CCode (cheader_filename = "gst/rtsp/rtsp.h")]
+               [Version (replacement = "RTSPConnection.create")]
                public static Gst.RTSP.Result connection_create (Gst.RTSP.Url url, out Gst.RTSP.Connection 
conn);
                [CCode (cheader_filename = "gst/rtsp/rtsp.h")]
+               [Version (replacement = "RTSPConnection.create_from_socket")]
                public static Gst.RTSP.Result connection_create_from_socket (GLib.Socket socket, string ip, 
uint16 port, string initial_buffer, out Gst.RTSP.Connection conn);
                [CCode (cheader_filename = "gst/rtsp/rtsp.h")]
                public static Gst.RTSP.HeaderField find_header_field (string header);
@@ -625,6 +645,7 @@ namespace Gst {
                [CCode (cheader_filename = "gst/rtsp/rtsp.h")]
                public static Gst.RTSP.Result message_new_response (out Gst.RTSP.Message msg, 
Gst.RTSP.StatusCode code, string? reason, Gst.RTSP.Message? request);
                [CCode (cheader_filename = "gst/rtsp/rtsp.h")]
+               [Version (replacement = "RTSPMethod.as_text")]
                public static unowned string method_as_text (Gst.RTSP.Method method);
                [CCode (cheader_filename = "gst/rtsp/rtsp.h")]
                public static string options_as_text (Gst.RTSP.Method options);
@@ -632,32 +653,41 @@ namespace Gst {
                [Version (since = "1.2")]
                public static Gst.RTSP.Method options_from_text (string options);
                [CCode (cheader_filename = "gst/rtsp/rtsp.h")]
+               [Version (replacement = "RTSPRange.convert_units")]
                public static bool range_convert_units (Gst.RTSP.TimeRange range, Gst.RTSP.RangeUnit unit);
                [CCode (cheader_filename = "gst/rtsp/rtsp.h")]
+               [Version (replacement = "RTSPRange.free")]
                public static void range_free (Gst.RTSP.TimeRange range);
                [CCode (cheader_filename = "gst/rtsp/rtsp.h")]
-               [Version (since = "1.2")]
+               [Version (replacement = "RTSPRange.get_times", since = "1.2")]
                public static bool range_get_times (Gst.RTSP.TimeRange range, out Gst.ClockTime min, out 
Gst.ClockTime max);
                [CCode (cheader_filename = "gst/rtsp/rtsp.h")]
+               [Version (replacement = "RTSPRange.parse")]
                public static Gst.RTSP.Result range_parse (string rangestr, out Gst.RTSP.TimeRange range);
                [CCode (cheader_filename = "gst/rtsp/rtsp.h")]
+               [Version (replacement = "RTSPRange.to_string")]
                public static string range_to_string (Gst.RTSP.TimeRange range);
                [CCode (cheader_filename = "gst/rtsp/rtsp.h")]
                public static unowned string status_as_text (Gst.RTSP.StatusCode code);
                [CCode (cheader_filename = "gst/rtsp/rtsp.h")]
                public static string strresult (Gst.RTSP.Result result);
                [CCode (cheader_filename = "gst/rtsp/rtsp.h")]
+               [Version (replacement = "RTSPTransport.get_manager")]
                public static Gst.RTSP.Result transport_get_manager (Gst.RTSP.TransMode trans, out unowned 
string? manager, uint option);
                [CCode (cheader_filename = "gst/rtsp/rtsp.h")]
-               [Version (deprecated = true)]
+               [Version (deprecated = true, replacement = "RTSPTransport.get_mime")]
                public static Gst.RTSP.Result transport_get_mime (Gst.RTSP.TransMode trans, string mime);
                [CCode (cheader_filename = "gst/rtsp/rtsp.h")]
+               [Version (replacement = "RTSPTransport.new")]
                public static Gst.RTSP.Result transport_new (Gst.RTSP.Transport transport);
                [CCode (cheader_filename = "gst/rtsp/rtsp.h")]
+               [Version (replacement = "RTSPTransport.parse")]
                public static Gst.RTSP.Result transport_parse (string str, Gst.RTSP.Transport transport);
                [CCode (cheader_filename = "gst/rtsp/rtsp.h")]
+               [Version (replacement = "RTSPUrl.parse")]
                public static Gst.RTSP.Result url_parse (string urlstr, out Gst.RTSP.Url url);
                [CCode (cheader_filename = "gst/rtsp/rtsp.h")]
+               [Version (replacement = "RTSPVersion.as_text")]
                public static unowned string version_as_text (Gst.RTSP.Version version);
        }
 }
diff --git a/vapi/gstreamer-rtsp-server-1.0.vapi b/vapi/gstreamer-rtsp-server-1.0.vapi
index d1128133e..696426791 100644
--- a/vapi/gstreamer-rtsp-server-1.0.vapi
+++ b/vapi/gstreamer-rtsp-server-1.0.vapi
@@ -846,6 +846,8 @@ namespace Gst {
                        public weak Gst.RTSPServer.Stream stream;
                        public weak Gst.RTSP.Message response;
                        public weak Gst.RTSPServer.StreamTransport trans;
+                       [CCode (cname = "gst_rtsp_context_get_current")]
+                       public static unowned Gst.RTSPServer.Context? get_current ();
                        [CCode (cname = "gst_rtsp_context_pop_current")]
                        public void pop_current ();
                        [CCode (cname = "gst_rtsp_context_push_current")]
diff --git a/vapi/gstreamer-sdp-1.0.vapi b/vapi/gstreamer-sdp-1.0.vapi
index 87bcc3631..fec85b8b5 100644
--- a/vapi/gstreamer-sdp-1.0.vapi
+++ b/vapi/gstreamer-sdp-1.0.vapi
@@ -205,6 +205,7 @@ namespace Gst {
                        public Gst.SDP.Result add_time (string start, string stop, [CCode (array_length = 
false, array_null_terminated = true)] string[] repeat);
                        public Gst.SDP.Result add_zone (string adj_time, string typed_time);
                        public string as_text ();
+                       public static string as_uri (string scheme, Gst.SDP.Message msg);
                        public uint attributes_len ();
                        [Version (since = "1.8")]
                        public Gst.SDP.Result attributes_to_caps (Gst.Caps caps);
@@ -244,8 +245,13 @@ namespace Gst {
                        [Version (since = "1.2")]
                        public Gst.SDP.Result insert_zone (int idx, Gst.SDP.Zone zone);
                        public uint medias_len ();
+                       public static Gst.SDP.Result @new (out Gst.SDP.Message msg);
+                       [Version (since = "1.16")]
+                       public static Gst.SDP.Result new_from_text (string text, out Gst.SDP.Message msg);
+                       public static Gst.SDP.Result parse_buffer ([CCode (array_length_cname = "size", 
array_length_pos = 1.5, array_length_type = "guint")] uint8[] data, Gst.SDP.Message msg);
                        [Version (since = "1.8.1")]
                        public Gst.SDP.Result parse_keymgmt (out Gst.SDP.MIKEYMessage mikey);
+                       public static Gst.SDP.Result parse_uri (string uri, Gst.SDP.Message msg);
                        public uint phones_len ();
                        [Version (since = "1.2")]
                        public Gst.SDP.Result remove_attribute (uint idx);
@@ -385,6 +391,7 @@ namespace Gst {
                        public Gst.SDP.Result insert_connection (int idx, Gst.SDP.Connection conn);
                        [Version (since = "1.2")]
                        public Gst.SDP.Result insert_format (int idx, string format);
+                       public static Gst.SDP.Result @new (out Gst.SDP.Media media);
                        [Version (since = "1.8.1")]
                        public Gst.SDP.Result parse_keymgmt (out Gst.SDP.MIKEYMessage mikey);
                        [Version (since = "1.2")]
@@ -406,6 +413,8 @@ namespace Gst {
                        public Gst.SDP.Result set_information (string information);
                        public Gst.SDP.Result set_key (string type, string data);
                        public Gst.SDP.Result set_media (string med);
+                       [Version (since = "1.8")]
+                       public static Gst.SDP.Result set_media_from_caps (Gst.Caps caps, Gst.SDP.Media media);
                        public Gst.SDP.Result set_port_info (uint port, uint num_ports);
                        public Gst.SDP.Result set_proto (string proto);
                        public Gst.SDP.Result uninit ();
@@ -575,20 +584,25 @@ namespace Gst {
                [Version (since = "1.8")]
                public static string make_keymgmt (string uri, string base64);
                [CCode (cheader_filename = "gst/sdp/sdp.h")]
+               [Version (replacement = "SDPMedia.new")]
                public static Gst.SDP.Result media_new (out Gst.SDP.Media media);
                [CCode (cheader_filename = "gst/sdp/sdp.h")]
-               [Version (since = "1.8")]
+               [Version (replacement = "SDPMedia.set_media_from_caps", since = "1.8")]
                public static Gst.SDP.Result media_set_media_from_caps (Gst.Caps caps, Gst.SDP.Media media);
                [CCode (cheader_filename = "gst/sdp/sdp.h")]
+               [Version (replacement = "SDPMessage.as_uri")]
                public static string message_as_uri (string scheme, Gst.SDP.Message msg);
                [CCode (cheader_filename = "gst/sdp/sdp.h")]
+               [Version (replacement = "SDPMessage.new")]
                public static Gst.SDP.Result message_new (out Gst.SDP.Message msg);
                [CCode (cheader_filename = "gst/sdp/sdp.h")]
-               [Version (since = "1.16")]
+               [Version (replacement = "SDPMessage.new_from_text", since = "1.16")]
                public static Gst.SDP.Result message_new_from_text (string text, out Gst.SDP.Message msg);
                [CCode (cheader_filename = "gst/sdp/sdp.h")]
+               [Version (replacement = "SDPMessage.parse_buffer")]
                public static Gst.SDP.Result message_parse_buffer ([CCode (array_length_cname = "size", 
array_length_pos = 1.5, array_length_type = "guint")] uint8[] data, Gst.SDP.Message msg);
                [CCode (cheader_filename = "gst/sdp/sdp.h")]
+               [Version (replacement = "SDPMessage.parse_uri")]
                public static Gst.SDP.Result message_parse_uri (string uri, Gst.SDP.Message msg);
        }
 }
diff --git a/vapi/gstreamer-video-1.0.vapi b/vapi/gstreamer-video-1.0.vapi
index db41717ea..58c80a4be 100644
--- a/vapi/gstreamer-video-1.0.vapi
+++ b/vapi/gstreamer-video-1.0.vapi
@@ -392,6 +392,8 @@ namespace Gst {
                        public Gst.Video.Info copy ();
                        [Version (since = "1.6")]
                        public void free ();
+                       public bool from_caps (Gst.Caps caps);
+                       public void init ();
                        public bool is_equal (Gst.Video.Info other);
                        public bool set_format (Gst.Video.Format format, uint width, uint height);
                        [Version (since = "1.16")]
@@ -642,6 +644,7 @@ namespace Gst {
                        public uint8 field;
                        public Gst.Video.AFDSpec spec;
                        public Gst.Video.AFDValue afd;
+                       public static unowned Gst.MetaInfo? get_info ();
                }
                [CCode (cheader_filename = "gst/video/video.h", has_type_id = false)]
                [GIR (name = "VideoAffineTransformationMeta")]
@@ -651,6 +654,7 @@ namespace Gst {
                        [CCode (array_length = false)]
                        public weak float matrix[16];
                        public void apply_matrix ([CCode (array_length = false)] float matrix[16]);
+                       public static unowned Gst.MetaInfo? get_info ();
                }
                [CCode (cheader_filename = "gst/video/video.h", has_type_id = false)]
                [GIR (name = "VideoAlignment")]
@@ -682,6 +686,7 @@ namespace Gst {
                        public bool is_letterbox;
                        public uint bar_data1;
                        public uint bar_data2;
+                       public static unowned Gst.MetaInfo? get_info ();
                }
                [CCode (cheader_filename = "gst/video/video.h", has_type_id = false)]
                [GIR (name = "VideoCaptionMeta")]
@@ -692,6 +697,7 @@ namespace Gst {
                        [CCode (array_length_cname = "size", array_length_type = "gsize")]
                        public weak uint8[] data;
                        public size_t size;
+                       public static unowned Gst.MetaInfo? get_info ();
                }
                [CCode (cheader_filename = "gst/video/video.h", has_type_id = false)]
                [GIR (name = "VideoCodecAlphaMeta")]
@@ -699,6 +705,7 @@ namespace Gst {
                public struct CodecAlphaMeta {
                        public Gst.Meta meta;
                        public weak Gst.Buffer buffer;
+                       public static unowned Gst.MetaInfo? get_info ();
                }
                [CCode (cheader_filename = "gst/video/video.h", has_type_id = false)]
                [GIR (name = "VideoColorPrimariesInfo")]
@@ -749,6 +756,7 @@ namespace Gst {
                        public uint y;
                        public uint width;
                        public uint height;
+                       public static unowned Gst.MetaInfo? get_info ();
                }
                [CCode (cheader_filename = "gst/video/video.h", has_type_id = false)]
                [GIR (name = "VideoFormatInfo")]
@@ -798,6 +806,8 @@ namespace Gst {
                        public Gst.MapInfo map_info[4];
                        public bool copy (Gst.Video.Frame src);
                        public bool copy_plane (Gst.Video.Frame src, uint plane);
+                       public bool map (Gst.Video.Info info, Gst.Buffer buffer, Gst.MapFlags flags);
+                       public bool map_id (Gst.Video.Info info, Gst.Buffer buffer, int id, Gst.MapFlags 
flags);
                        public void unmap ();
                }
                [CCode (cheader_filename = "gst/video/video.h", has_type_id = false)]
@@ -808,6 +818,7 @@ namespace Gst {
                        public uint n_textures;
                        [CCode (array_length = false)]
                        public weak Gst.Video.GLTextureType texture_type[4];
+                       public static unowned Gst.MetaInfo? get_info ();
                        public bool upload (uint texture_id);
                }
                [CCode (cheader_filename = "gst/video/video.h", has_type_id = false)]
@@ -821,6 +832,7 @@ namespace Gst {
                        public uint32 min_display_mastering_luminance;
                        public bool add_to_caps (Gst.Caps caps);
                        public bool from_caps (Gst.Caps caps);
+                       public bool from_string (string mastering);
                        public void init ();
                        public bool is_equal (Gst.Video.MasteringDisplayInfo other);
                        public string to_string ();
@@ -852,6 +864,7 @@ namespace Gst {
                        [CCode (cname = "unmap")]
                        public weak Gst.Video.MetaUnmapVFunc unmap_v;
                        public Gst.Video.Alignment alignment;
+                       public static unowned Gst.MetaInfo? get_info ();
                        [Version (since = "1.18")]
                        public bool get_plane_height ([CCode (array_length = false)] out unowned uint 
plane_height[4]);
                        [Version (since = "1.18")]
@@ -866,12 +879,14 @@ namespace Gst {
                public struct MetaTransform {
                        public weak Gst.Video.Info in_info;
                        public weak Gst.Video.Info out_info;
+                       public static GLib.Quark scale_get_quark ();
                }
                [CCode (cheader_filename = "gst/video/video.h", has_type_id = false)]
                [GIR (name = "VideoOverlayCompositionMeta")]
                public struct OverlayCompositionMeta {
                        public Gst.Meta meta;
                        public weak Gst.Video.OverlayComposition overlay;
+                       public static unowned Gst.MetaInfo? get_info ();
                }
                [CCode (cheader_filename = "gst/video/video.h", has_type_id = false)]
                [GIR (name = "VideoRectangle")]
@@ -895,6 +910,7 @@ namespace Gst {
                        public weak GLib.List<void*> @params;
                        [Version (since = "1.14")]
                        public void add_param (owned Gst.Structure s);
+                       public static unowned Gst.MetaInfo? get_info ();
                        [Version (since = "1.14")]
                        public unowned Gst.Structure? get_param (string name);
                }
@@ -928,6 +944,7 @@ namespace Gst {
                public struct TimeCodeMeta {
                        public Gst.Meta meta;
                        public weak Gst.Video.TimeCode tc;
+                       public static unowned Gst.MetaInfo? get_info ();
                }
                [CCode (cheader_filename = "gst/video/video.h", cprefix = "GST_VIDEO_AFD_SPEC_", type_id = 
"gst_video_afd_spec_get_type ()")]
                [GIR (name = "VideoAFDSpec")]
@@ -1009,7 +1026,9 @@ namespace Gst {
                        CEA608_RAW,
                        CEA608_S334_1A,
                        CEA708_RAW,
-                       CEA708_CDP
+                       CEA708_CDP;
+                       public static Gst.Video.CaptionType from_caps (Gst.Caps caps);
+                       public Gst.Caps to_caps ();
                }
                [CCode (cheader_filename = "gst/video/video.h", cprefix = "GST_VIDEO_CHROMA_FLAG_", type_id = 
"gst_video_chroma_flags_get_type ()")]
                [Flags]
@@ -1045,7 +1064,11 @@ namespace Gst {
                        COSITED,
                        JPEG,
                        MPEG2,
-                       DV
+                       DV;
+                       [Version (since = "1.20")]
+                       public static Gst.Video.ChromaSite from_string (string s);
+                       [Version (since = "1.20")]
+                       public string? to_string ();
                }
                [CCode (cheader_filename = "gst/video/video.h", cprefix = "GST_VIDEO_CODEC_FRAME_FLAG_", 
has_type_id = false)]
                [Flags]
@@ -1073,7 +1096,13 @@ namespace Gst {
                        BT709,
                        BT601,
                        SMPTE240M,
-                       BT2020
+                       BT2020;
+                       [Version (since = "1.18")]
+                       public static Gst.Video.ColorMatrix from_iso (uint value);
+                       [Version (since = "1.6")]
+                       public bool get_Kr_Kb (out double Kr, out double Kb);
+                       [Version (since = "1.18")]
+                       public uint to_iso ();
                }
                [CCode (cheader_filename = "gst/video/video.h", cprefix = "GST_VIDEO_COLOR_PRIMARIES_", 
type_id = "gst_video_color_primaries_get_type ()")]
                [GIR (name = "VideoColorPrimaries")]
@@ -1090,14 +1119,21 @@ namespace Gst {
                        SMPTEST428,
                        SMPTERP431,
                        SMPTEEG432,
-                       EBU3213
+                       EBU3213;
+                       [Version (since = "1.18")]
+                       public static Gst.Video.ColorPrimaries from_iso (uint value);
+                       [Version (since = "1.6")]
+                       public unowned Gst.Video.ColorPrimariesInfo? get_info ();
+                       [Version (since = "1.18")]
+                       public uint to_iso ();
                }
                [CCode (cheader_filename = "gst/video/video.h", cprefix = "GST_VIDEO_COLOR_RANGE_", type_id = 
"gst_video_color_range_get_type ()")]
                [GIR (name = "VideoColorRange")]
                public enum ColorRange {
                        UNKNOWN,
                        @0_255,
-                       @16_235
+                       @16_235;
+                       public void offsets (Gst.Video.FormatInfo info, [CCode (array_length = false)] out 
unowned int offset[4], [CCode (array_length = false)] out unowned int scale[4]);
                }
                [CCode (cheader_filename = "gst/video/video.h", cprefix = 
"GST_VIDEO_DECODER_REQUEST_SYNC_POINT_", has_type_id = false)]
                [Flags]
@@ -1130,7 +1166,9 @@ namespace Gst {
                public enum FieldOrder {
                        UNKNOWN,
                        TOP_FIELD_FIRST,
-                       BOTTOM_FIELD_FIRST
+                       BOTTOM_FIELD_FIRST;
+                       public static Gst.Video.FieldOrder from_string (string order);
+                       public unowned string to_string ();
                }
                [CCode (cheader_filename = "gst/video/video.h", cprefix = "GST_VIDEO_FLAG_", type_id = 
"gst_video_flags_get_type ()")]
                [Flags]
@@ -1257,7 +1295,15 @@ namespace Gst {
                        [Version (since = "1.20")]
                        BGRP,
                        [Version (since = "1.20")]
-                       AV12
+                       AV12;
+                       public static Gst.Video.Format from_fourcc (uint32 fourcc);
+                       public static Gst.Video.Format from_masks (int depth, int bpp, int endianness, uint 
red_mask, uint green_mask, uint blue_mask, uint alpha_mask);
+                       public static Gst.Video.Format from_string (string format);
+                       public unowned Gst.Video.FormatInfo? get_info ();
+                       [Version (since = "1.2")]
+                       public void* get_palette (out size_t size);
+                       public uint32 to_fourcc ();
+                       public unowned string to_string ();
                }
                [CCode (cheader_filename = "gst/video/video.h", cprefix = "GST_VIDEO_FORMAT_FLAG_", type_id = 
"gst_video_format_flags_get_type ()")]
                [Flags]
@@ -1328,7 +1374,11 @@ namespace Gst {
                        INTERLEAVED,
                        MIXED,
                        FIELDS,
-                       ALTERNATE
+                       ALTERNATE;
+                       [Version (since = "1.6")]
+                       public static Gst.Video.InterlaceMode from_string (string mode);
+                       [Version (since = "1.6")]
+                       public unowned string to_string ();
                }
                [CCode (cheader_filename = "gst/video/video.h", cprefix = "GST_VIDEO_MATRIX_MODE_", type_id = 
"gst_video_matrix_mode_get_type ()")]
                [GIR (name = "VideoMatrixMode")]
@@ -1381,7 +1431,11 @@ namespace Gst {
                        CHECKERBOARD,
                        FRAME_BY_FRAME,
                        MULTIVIEW_FRAME_BY_FRAME,
-                       SEPARATED
+                       SEPARATED;
+                       [Version (since = "1.6")]
+                       public static Gst.Video.MultiviewMode from_caps_string (string caps_mview_mode);
+                       [Version (since = "1.6")]
+                       public unowned string to_caps_string ();
                }
                [CCode (cheader_filename = "gst/video/video.h", cname = "GstNavigationCommand", cprefix = 
"GST_NAVIGATION_COMMAND_", type_id = "gst_navigation_command_get_type ()")]
                [GIR (name = "NavigationCommand")]
@@ -1536,7 +1590,17 @@ namespace Gst {
                        SMPTE2084,
                        ARIB_STD_B67,
                        [Version (since = "1.18")]
-                       BT601
+                       BT601;
+                       [Version (since = "1.20")]
+                       public double decode (double val);
+                       [Version (since = "1.20")]
+                       public double encode (double val);
+                       [Version (since = "1.18")]
+                       public static Gst.Video.TransferFunction from_iso (uint value);
+                       [Version (since = "1.18")]
+                       public bool is_equivalent (uint from_bpp, Gst.Video.TransferFunction to_func, uint 
to_bpp);
+                       [Version (since = "1.18")]
+                       public uint to_iso ();
                }
                [CCode (cheader_filename = "gst/video/video.h", cprefix = "GST_VIDEO_VBI_PARSER_RESULT_", 
type_id = "gst_video_vbi_parser_result_get_type ()")]
                [GIR (name = "VideoVBIParserResult")]
@@ -1718,14 +1782,17 @@ namespace Gst {
                [CCode (cheader_filename = "gst/video/video.h")]
                public static GLib.Type afd_meta_api_get_type ();
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoAFDMeta.get_info")]
                public static unowned Gst.MetaInfo? afd_meta_get_info ();
                [CCode (cheader_filename = "gst/video/video.h")]
                public static GLib.Type affine_transformation_meta_api_get_type ();
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoAffineTransformationMeta.get_info")]
                public static unowned Gst.MetaInfo? affine_transformation_meta_get_info ();
                [CCode (cheader_filename = "gst/video/video.h")]
                public static GLib.Type bar_meta_api_get_type ();
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoBarMeta.get_info")]
                public static unowned Gst.MetaInfo? bar_meta_get_info ();
                [CCode (cheader_filename = "gst/video/video.h")]
                public static bool blend (Gst.Video.Frame dest, Gst.Video.Frame src, int x, int y, float 
global_alpha);
@@ -1779,12 +1846,13 @@ namespace Gst {
                [CCode (cheader_filename = "gst/video/video.h")]
                public static GLib.Type caption_meta_api_get_type ();
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoCaptionMeta.get_info")]
                public static unowned Gst.MetaInfo? caption_meta_get_info ();
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.16")]
+               [Version (replacement = "VideoCaptionType.from_caps", since = "1.16")]
                public static Gst.Video.CaptionType caption_type_from_caps (Gst.Caps caps);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.16")]
+               [Version (replacement = "VideoCaptionType.to_caps", since = "1.16")]
                public static Gst.Caps caption_type_to_caps (Gst.Video.CaptionType type);
                [CCode (cheader_filename = "gst/video/video.h")]
                [Version (since = "1.20")]
@@ -1793,10 +1861,10 @@ namespace Gst {
                [Version (deprecated = true, deprecated_since = "1.20")]
                public static Gst.Video.ChromaSite chroma_from_string (string s);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.20")]
+               [Version (replacement = "VideoChromaSite.from_string", since = "1.20")]
                public static Gst.Video.ChromaSite chroma_site_from_string (string s);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.20")]
+               [Version (replacement = "VideoChromaSite.to_string", since = "1.20")]
                public static string? chroma_site_to_string (Gst.Video.ChromaSite site);
                [CCode (cheader_filename = "gst/video/video.h")]
                [Version (deprecated = true, deprecated_since = "1.20")]
@@ -1805,27 +1873,28 @@ namespace Gst {
                [Version (since = "1.20")]
                public static GLib.Type codec_alpha_meta_api_get_type ();
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.20")]
+               [Version (replacement = "VideoCodecAlphaMeta.get_info", since = "1.20")]
                public static unowned Gst.MetaInfo? codec_alpha_meta_get_info ();
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.18")]
+               [Version (replacement = "VideoColorMatrix.from_iso", since = "1.18")]
                public static Gst.Video.ColorMatrix color_matrix_from_iso (uint value);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.6")]
+               [Version (replacement = "VideoColorMatrix.get_Kr_Kb", since = "1.6")]
                public static bool color_matrix_get_Kr_Kb (Gst.Video.ColorMatrix matrix, out double Kr, out 
double Kb);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.18")]
+               [Version (replacement = "VideoColorMatrix.to_iso", since = "1.18")]
                public static uint color_matrix_to_iso (Gst.Video.ColorMatrix matrix);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.18")]
+               [Version (replacement = "VideoColorPrimaries.from_iso", since = "1.18")]
                public static Gst.Video.ColorPrimaries color_primaries_from_iso (uint value);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.6")]
+               [Version (replacement = "VideoColorPrimaries.get_info", since = "1.6")]
                public static unowned Gst.Video.ColorPrimariesInfo? color_primaries_get_info 
(Gst.Video.ColorPrimaries primaries);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.18")]
+               [Version (replacement = "VideoColorPrimaries.to_iso", since = "1.18")]
                public static uint color_primaries_to_iso (Gst.Video.ColorPrimaries primaries);
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoColorRange.offsets")]
                public static void color_range_offsets (Gst.Video.ColorRange range, Gst.Video.FormatInfo 
info, [CCode (array_length = false)] out unowned int offset[4], [CCode (array_length = false)] out unowned 
int scale[4]);
                [CCode (cheader_filename = "gst/video/video.h")]
                [Version (deprecated = true, deprecated_since = "1.20", since = "1.6")]
@@ -1840,6 +1909,7 @@ namespace Gst {
                [CCode (cheader_filename = "gst/video/video.h")]
                public static GLib.Type crop_meta_api_get_type ();
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoCropMeta.get_info")]
                public static unowned Gst.MetaInfo? crop_meta_get_info ();
                [CCode (cheader_filename = "gst/video/video.h")]
                public static bool event_is_force_key_unit (Gst.Event event);
@@ -1856,49 +1926,60 @@ namespace Gst {
                [CCode (cheader_filename = "gst/video/video.h")]
                public static bool event_parse_upstream_force_key_unit (Gst.Event event, out Gst.ClockTime 
running_time, out bool all_headers, out uint count);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.12")]
+               [Version (replacement = "VideoFieldOrder.from_string", since = "1.12")]
                public static Gst.Video.FieldOrder field_order_from_string (string order);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.12")]
+               [Version (replacement = "VideoFieldOrder.to_string", since = "1.12")]
                public static unowned string field_order_to_string (Gst.Video.FieldOrder order);
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoFormat.from_fourcc")]
                public static Gst.Video.Format format_from_fourcc (uint32 fourcc);
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoFormat.from_masks")]
                public static Gst.Video.Format format_from_masks (int depth, int bpp, int endianness, uint 
red_mask, uint green_mask, uint blue_mask, uint alpha_mask);
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoFormat.from_string")]
                public static Gst.Video.Format format_from_string (string format);
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoFormat.get_info")]
                public static unowned Gst.Video.FormatInfo? format_get_info (Gst.Video.Format format);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.2")]
+               [Version (replacement = "VideoFormat.get_palette", since = "1.2")]
                public static void* format_get_palette (Gst.Video.Format format, out size_t size);
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoFormat.to_fourcc")]
                public static uint32 format_to_fourcc (Gst.Video.Format format);
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoFormat.to_string")]
                public static unowned string format_to_string (Gst.Video.Format format);
                [CCode (array_length_pos = 0.1, array_length_type = "guint", cheader_filename = 
"gst/video/video.h")]
                [Version (since = "1.18")]
                public static unowned Gst.Video.Format[] formats_raw ();
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoFrame.map")]
                public static bool frame_map (out Gst.Video.Frame frame, Gst.Video.Info info, Gst.Buffer 
buffer, Gst.MapFlags flags);
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoFrame.map_id")]
                public static bool frame_map_id (out Gst.Video.Frame frame, Gst.Video.Info info, Gst.Buffer 
buffer, int id, Gst.MapFlags flags);
                [CCode (cheader_filename = "gst/video/video.h")]
                public static GLib.Type gl_texture_upload_meta_api_get_type ();
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoGLTextureUploadMeta.get_info")]
                public static unowned Gst.MetaInfo? gl_texture_upload_meta_get_info ();
                [CCode (cheader_filename = "gst/video/video.h")]
                [Version (since = "1.6")]
                public static bool guess_framerate (Gst.ClockTime duration, out int dest_n, out int dest_d);
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoInfo.from_caps")]
                public static bool info_from_caps (out unowned Gst.Video.Info info, Gst.Caps caps);
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoInfo.init")]
                public static void info_init (out unowned Gst.Video.Info info);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.6")]
+               [Version (replacement = "VideoInterlaceMode.from_string", since = "1.6")]
                public static Gst.Video.InterlaceMode interlace_mode_from_string (string mode);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.6")]
+               [Version (replacement = "VideoInterlaceMode.to_string", since = "1.6")]
                public static unowned string interlace_mode_to_string (Gst.Video.InterlaceMode mode);
                [CCode (cheader_filename = "gst/video/video.h", cname = 
"gst_is_video_overlay_prepare_window_handle_message")]
                public static bool is_video_overlay_prepare_window_handle_message (Gst.Message msg);
@@ -1909,13 +1990,15 @@ namespace Gst {
                [Version (since = "1.18")]
                public static Gst.Caps make_raw_caps_with_features ([CCode (array_length_cname = "len", 
array_length_pos = 1.5, array_length_type = "guint")] Gst.Video.Format[]? formats, owned Gst.CapsFeatures? 
features);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.18")]
+               [Version (replacement = "VideoMasteringDisplayInfo.from_string", since = "1.18")]
                public static bool mastering_display_info_from_string (out Gst.Video.MasteringDisplayInfo 
minfo, string mastering);
                [CCode (cheader_filename = "gst/video/video.h")]
                public static GLib.Type meta_api_get_type ();
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoMeta.get_info")]
                public static unowned Gst.MetaInfo? meta_get_info ();
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoMetaTransform.scale_get_quark")]
                public static GLib.Quark meta_transform_scale_get_quark ();
                [CCode (cheader_filename = "gst/video/video.h")]
                [Version (since = "1.6")]
@@ -1936,74 +2019,95 @@ namespace Gst {
                [Version (since = "1.6")]
                public static bool multiview_guess_half_aspect (Gst.Video.MultiviewMode mv_mode, uint width, 
uint height, uint par_n, uint par_d);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.6")]
+               [Version (replacement = "VideoMultiviewMode.from_caps_string", since = "1.6")]
                public static Gst.Video.MultiviewMode multiview_mode_from_caps_string (string 
caps_mview_mode);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.6")]
+               [Version (replacement = "VideoMultiviewMode.to_caps_string", since = "1.6")]
                public static unowned string multiview_mode_to_caps_string (Gst.Video.MultiviewMode 
mview_mode);
                [CCode (cheader_filename = "gst/video/video.h")]
                [Version (since = "1.6")]
                public static void multiview_video_info_change_mode (Gst.Video.Info info, 
Gst.Video.MultiviewMode out_mview_mode, Gst.Video.MultiviewFlags out_mview_flags);
                [CCode (cheader_filename = "gst/video/video.h", cname = "gst_navigation_event_get_type")]
+               [Version (replacement = "Navigation.event_get_type")]
                public static Gst.Video.NavigationEventType navigation_event_get_type (Gst.Event event);
                [CCode (cheader_filename = "gst/video/video.h", cname = "gst_navigation_event_parse_command")]
+               [Version (replacement = "Navigation.event_parse_command")]
                public static bool navigation_event_parse_command (Gst.Event event, out 
Gst.Video.NavigationCommand command);
                [CCode (cheader_filename = "gst/video/video.h", cname = 
"gst_navigation_event_parse_key_event")]
+               [Version (replacement = "Navigation.event_parse_key_event")]
                public static bool navigation_event_parse_key_event (Gst.Event event, out unowned string key);
                [CCode (cheader_filename = "gst/video/video.h", cname = 
"gst_navigation_event_parse_mouse_button_event")]
+               [Version (replacement = "Navigation.event_parse_mouse_button_event")]
                public static bool navigation_event_parse_mouse_button_event (Gst.Event event, out int 
button, out double x, out double y);
                [CCode (cheader_filename = "gst/video/video.h", cname = 
"gst_navigation_event_parse_mouse_move_event")]
+               [Version (replacement = "Navigation.event_parse_mouse_move_event")]
                public static bool navigation_event_parse_mouse_move_event (Gst.Event event, out double x, 
out double y);
                [CCode (cheader_filename = "gst/video/video.h", cname = 
"gst_navigation_event_parse_mouse_scroll_event")]
-               [Version (since = "1.18")]
+               [Version (replacement = "Navigation.event_parse_mouse_scroll_event", since = "1.18")]
                public static bool navigation_event_parse_mouse_scroll_event (Gst.Event event, out double x, 
out double y, out double delta_x, out double delta_y);
                [CCode (cheader_filename = "gst/video/video.h", cname = "gst_navigation_message_get_type")]
+               [Version (replacement = "Navigation.message_get_type")]
                public static Gst.Video.NavigationMessageType navigation_message_get_type (Gst.Message 
message);
                [CCode (cheader_filename = "gst/video/video.h", cname = 
"gst_navigation_message_new_angles_changed")]
+               [Version (replacement = "Navigation.message_new_angles_changed")]
                public static Gst.Message navigation_message_new_angles_changed (Gst.Object src, uint 
cur_angle, uint n_angles);
                [CCode (cheader_filename = "gst/video/video.h", cname = 
"gst_navigation_message_new_commands_changed")]
+               [Version (replacement = "Navigation.message_new_commands_changed")]
                public static Gst.Message navigation_message_new_commands_changed (Gst.Object src);
                [CCode (cheader_filename = "gst/video/video.h", cname = "gst_navigation_message_new_event")]
-               [Version (since = "1.6")]
+               [Version (replacement = "Navigation.message_new_event", since = "1.6")]
                public static Gst.Message navigation_message_new_event (Gst.Object src, Gst.Event event);
                [CCode (cheader_filename = "gst/video/video.h", cname = 
"gst_navigation_message_new_mouse_over")]
+               [Version (replacement = "Navigation.message_new_mouse_over")]
                public static Gst.Message navigation_message_new_mouse_over (Gst.Object src, bool active);
                [CCode (cheader_filename = "gst/video/video.h", cname = 
"gst_navigation_message_parse_angles_changed")]
+               [Version (replacement = "Navigation.message_parse_angles_changed")]
                public static bool navigation_message_parse_angles_changed (Gst.Message message, out uint 
cur_angle, out uint n_angles);
                [CCode (cheader_filename = "gst/video/video.h", cname = "gst_navigation_message_parse_event")]
-               [Version (since = "1.6")]
+               [Version (replacement = "Navigation.message_parse_event", since = "1.6")]
                public static bool navigation_message_parse_event (Gst.Message message, out Gst.Event event);
                [CCode (cheader_filename = "gst/video/video.h", cname = 
"gst_navigation_message_parse_mouse_over")]
+               [Version (replacement = "Navigation.message_parse_mouse_over")]
                public static bool navigation_message_parse_mouse_over (Gst.Message message, out bool active);
                [CCode (cheader_filename = "gst/video/video.h", cname = "gst_navigation_query_get_type")]
+               [Version (replacement = "Navigation.query_get_type")]
                public static Gst.Video.NavigationQueryType navigation_query_get_type (Gst.Query query);
                [CCode (cheader_filename = "gst/video/video.h", cname = "gst_navigation_query_new_angles")]
+               [Version (replacement = "Navigation.query_new_angles")]
                public static Gst.Query navigation_query_new_angles ();
                [CCode (cheader_filename = "gst/video/video.h", cname = "gst_navigation_query_new_commands")]
+               [Version (replacement = "Navigation.query_new_commands")]
                public static Gst.Query navigation_query_new_commands ();
                [CCode (cheader_filename = "gst/video/video.h", cname = "gst_navigation_query_parse_angles")]
+               [Version (replacement = "Navigation.query_parse_angles")]
                public static bool navigation_query_parse_angles (Gst.Query query, out uint cur_angle, out 
uint n_angles);
                [CCode (cheader_filename = "gst/video/video.h", cname = 
"gst_navigation_query_parse_commands_length")]
+               [Version (replacement = "Navigation.query_parse_commands_length")]
                public static bool navigation_query_parse_commands_length (Gst.Query query, out uint n_cmds);
                [CCode (cheader_filename = "gst/video/video.h", cname = 
"gst_navigation_query_parse_commands_nth")]
+               [Version (replacement = "Navigation.query_parse_commands_nth")]
                public static bool navigation_query_parse_commands_nth (Gst.Query query, uint nth, out 
Gst.Video.NavigationCommand cmd);
                [CCode (cheader_filename = "gst/video/video.h", cname = "gst_navigation_query_set_angles")]
+               [Version (replacement = "Navigation.query_set_angles")]
                public static void navigation_query_set_angles (Gst.Query query, uint cur_angle, uint 
n_angles);
                [CCode (cheader_filename = "gst/video/video.h", cname = "gst_navigation_query_set_commandsv")]
+               [Version (replacement = "Navigation.query_set_commandsv")]
                public static void navigation_query_set_commandsv (Gst.Query query, [CCode 
(array_length_cname = "n_cmds", array_length_pos = 1.5)] Gst.Video.NavigationCommand[] cmds);
                [CCode (cheader_filename = "gst/video/video.h")]
                public static GLib.Type overlay_composition_meta_api_get_type ();
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoOverlayCompositionMeta.get_info")]
                public static unowned Gst.MetaInfo? overlay_composition_meta_get_info ();
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.14")]
+               [Version (replacement = "VideoOverlay.install_properties", since = "1.14")]
                public static void overlay_install_properties (GLib.ObjectClass oclass, int last_prop_id);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.14")]
+               [Version (replacement = "VideoOverlay.set_property", since = "1.14")]
                public static bool overlay_set_property (GLib.Object object, int last_prop_id, uint 
property_id, GLib.Value value);
                [CCode (cheader_filename = "gst/video/video.h")]
                public static GLib.Type region_of_interest_meta_api_get_type ();
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoRegionOfInterestMeta.get_info")]
                public static unowned Gst.MetaInfo? region_of_interest_meta_get_info ();
                [CCode (cheader_filename = "gst/video/video.h")]
                [Version (since = "1.4")]
@@ -2011,21 +2115,22 @@ namespace Gst {
                [CCode (cheader_filename = "gst/video/video.h")]
                public static GLib.Type time_code_meta_api_get_type ();
                [CCode (cheader_filename = "gst/video/video.h")]
+               [Version (replacement = "VideoTimeCodeMeta.get_info")]
                public static unowned Gst.MetaInfo? time_code_meta_get_info ();
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.20")]
+               [Version (replacement = "VideoTransferFunction.decode", since = "1.20")]
                public static double transfer_function_decode (Gst.Video.TransferFunction func, double val);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.20")]
+               [Version (replacement = "VideoTransferFunction.encode", since = "1.20")]
                public static double transfer_function_encode (Gst.Video.TransferFunction func, double val);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.18")]
+               [Version (replacement = "VideoTransferFunction.from_iso", since = "1.18")]
                public static Gst.Video.TransferFunction transfer_function_from_iso (uint value);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.18")]
+               [Version (replacement = "VideoTransferFunction.is_equivalent", since = "1.18")]
                public static bool transfer_function_is_equivalent (Gst.Video.TransferFunction from_func, 
uint from_bpp, Gst.Video.TransferFunction to_func, uint to_bpp);
                [CCode (cheader_filename = "gst/video/video.h")]
-               [Version (since = "1.18")]
+               [Version (replacement = "VideoTransferFunction.to_iso", since = "1.18")]
                public static uint transfer_function_to_iso (Gst.Video.TransferFunction func);
        }
 }
diff --git a/vapi/gstreamer-webrtc-1.0.vapi b/vapi/gstreamer-webrtc-1.0.vapi
index 3e0059b4d..c2d56c31e 100644
--- a/vapi/gstreamer-webrtc-1.0.vapi
+++ b/vapi/gstreamer-webrtc-1.0.vapi
@@ -245,7 +245,9 @@ namespace Gst {
                OFFER,
                PRANSWER,
                ANSWER,
-               ROLLBACK
+               ROLLBACK;
+               [CCode (cname = "gst_webrtc_sdp_type_to_string")]
+               public unowned string to_string ();
        }
        [CCode (cheader_filename = "gst/webrtc/webrtc.h", cprefix = "GST_WEBRTC_SIGNALING_STATE_", type_id = 
"gst_webrtc_signaling_state_get_type ()")]
        public enum WebRTCSignalingState {
@@ -274,5 +276,6 @@ namespace Gst {
                CERTIFICATE
        }
        [CCode (cheader_filename = "gst/webrtc/webrtc.h")]
+       [Version (replacement = "WebRTCSDPType.to_string")]
        public static unowned string webrtc_sdp_type_to_string (Gst.WebRTCSDPType type);
 }
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 41f673f9b..f70360f3a 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -1068,14 +1068,10 @@ namespace Gtk {
                public weak Gtk.BindingEntry set_next;
                public weak Gtk.BindingSignal signals;
                public static void add_signal (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType 
modifiers, string signal_name, uint n_args, ...);
-               [CCode (cheader_filename = "gtk/gtk.h")]
                [Version (since = "3.0")]
                public static GLib.TokenType add_signal_from_string (Gtk.BindingSet binding_set, string 
signal_desc);
-               [CCode (cheader_filename = "gtk/gtk.h")]
-               public static void add_signall (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType 
modifiers, string signal_name, [CCode (type = "GSList*")] GLib.SList<Gtk.BindingArg?> binding_args);
-               [CCode (cheader_filename = "gtk/gtk.h")]
+               public static void add_signall (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType 
modifiers, string signal_name, GLib.SList<Gtk.BindingArg?> binding_args);
                public static void remove (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType 
modifiers);
-               [CCode (cheader_filename = "gtk/gtk.h")]
                [Version (since = "2.12")]
                public static void skip (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType modifiers);
        }
@@ -1094,8 +1090,8 @@ namespace Gtk {
                [Version (deprecated = true, deprecated_since = "3.0")]
                public void add_path (Gtk.PathType path_type, string path_pattern, Gtk.PathPriorityType 
priority);
                [CCode (cheader_filename = "gtk/gtk.h")]
+               [Version (replacement = "BindingSet.by_class")]
                public static unowned Gtk.BindingSet by_class ([CCode (type = "gpointer")] GLib.ObjectClass 
object_class);
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public static unowned Gtk.BindingSet? find (string set_name);
                public static unowned Gtk.BindingSet @new (string name);
        }
@@ -5515,7 +5511,6 @@ namespace Gtk {
                [CCode (has_construct_function = false)]
                [Version (since = "2.10")]
                public PaperSize.from_ppd (string ppd_name, string ppd_display_name, double width, double 
height);
-               [CCode (cheader_filename = "gtk/gtk.h")]
                [Version (since = "2.10")]
                public static unowned string get_default ();
                [Version (since = "2.10")]
@@ -5532,7 +5527,6 @@ namespace Gtk {
                public double get_height (Gtk.Unit unit);
                [Version (since = "2.10")]
                public unowned string get_name ();
-               [CCode (cheader_filename = "gtk/gtk.h")]
                [Version (since = "2.12")]
                public static GLib.List<Gtk.PaperSize> get_paper_sizes (bool include_custom);
                [Version (since = "2.10")]
@@ -8852,18 +8846,17 @@ namespace Gtk {
                public TreeRowReference (Gtk.TreeModel model, Gtk.TreePath path);
                [Version (since = "2.2")]
                public Gtk.TreeRowReference copy ();
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public static void deleted (GLib.Object proxy, Gtk.TreePath path);
                [DestroysInstance]
                public void free ();
                [Version (since = "2.8")]
                public unowned Gtk.TreeModel get_model ();
                public Gtk.TreePath? get_path ();
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public static void inserted (GLib.Object proxy, Gtk.TreePath path);
                [CCode (has_construct_function = false)]
                public TreeRowReference.proxy (GLib.Object proxy, Gtk.TreeModel model, Gtk.TreePath path);
                [CCode (cheader_filename = "gtk/gtk.h")]
+               [Version (replacement = "TreeRowReference.reordered")]
                public static void reordered (GLib.Object proxy, Gtk.TreePath path, Gtk.TreeIter iter, [CCode 
(array_length = false)] int[] new_order);
                public bool valid ();
        }
@@ -11479,7 +11472,18 @@ namespace Gtk {
                LARGE_TOOLBAR,
                BUTTON,
                DND,
-               DIALOG
+               DIALOG;
+               [Version (deprecated = true, deprecated_since = "3.10")]
+               public static int from_name (string name);
+               [Version (deprecated = true, deprecated_since = "3.10")]
+               public static unowned string get_name (int size);
+               public static bool lookup (int size, out int width, out int height);
+               [Version (deprecated = true, deprecated_since = "3.10", since = "2.2")]
+               public static bool lookup_for_settings (Gtk.Settings settings, int size, out int width, out 
int height);
+               [Version (deprecated = true, deprecated_since = "3.10")]
+               public static int register (string name, int width, int height);
+               [Version (deprecated = true, deprecated_since = "3.10")]
+               public static void register_alias (string alias, int target);
        }
        [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ICON_VIEW_", type_id = 
"gtk_icon_view_drop_position_get_type ()")]
        public enum IconViewDropPosition {
@@ -12230,7 +12234,6 @@ namespace Gtk {
                INVALID_PROPERTY,
                INVALID_SIGNAL,
                INVALID_ID;
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CSS_PROVIDER_ERROR_")]
@@ -12241,7 +12244,6 @@ namespace Gtk {
                NAME,
                DEPRECATED,
                UNKNOWN_VALUE;
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_FILE_CHOOSER_ERROR_")]
@@ -12250,7 +12252,6 @@ namespace Gtk {
                BAD_FILENAME,
                ALREADY_EXISTS,
                INCOMPLETE_HOSTNAME;
-               [CCode (cheader_filename = "gtk/gtk.h")]
                [Version (since = "2.4")]
                public static GLib.Quark quark ();
        }
@@ -12258,7 +12259,6 @@ namespace Gtk {
        public errordomain IconThemeError {
                NOT_FOUND,
                FAILED;
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_ERROR_")]
@@ -12267,7 +12267,6 @@ namespace Gtk {
                INTERNAL_ERROR,
                NOMEM,
                INVALID_FILE;
-               [CCode (cheader_filename = "gtk/gtk.h")]
                [Version (since = "2.10")]
                public static GLib.Quark quark ();
        }
@@ -12276,7 +12275,6 @@ namespace Gtk {
        public errordomain RecentChooserError {
                NOT_FOUND,
                INVALID_URI;
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RECENT_MANAGER_ERROR_")]
@@ -12289,7 +12287,6 @@ namespace Gtk {
                READ,
                WRITE,
                UNKNOWN;
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
@@ -12815,11 +12812,29 @@ namespace Gtk {
        [Version (deprecated = true, deprecated_since = "3.10", since = "2.6")]
        public static bool alternative_dialog_button_order (Gdk.Screen? screen);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "BindingEntry.add_signal_from_string", since = "3.0")]
+       public static GLib.TokenType binding_entry_add_signal_from_string (Gtk.BindingSet binding_set, string 
signal_desc);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "BindingEntry.add_signall")]
+       public static void binding_entry_add_signall (Gtk.BindingSet binding_set, uint keyval, 
Gdk.ModifierType modifiers, string signal_name, [CCode (type = "GSList*")] GLib.SList<Gtk.BindingArg?> 
binding_args);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "BindingEntry.remove")]
+       public static void binding_entry_remove (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType 
modifiers);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "BindingEntry.skip", since = "2.12")]
+       public static void binding_entry_skip (Gtk.BindingSet binding_set, uint keyval, Gdk.ModifierType 
modifiers);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "BindingSet.find")]
+       public static unowned Gtk.BindingSet? binding_set_find (string set_name);
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public static bool bindings_activate (GLib.Object object, uint keyval, Gdk.ModifierType modifiers);
        [CCode (cheader_filename = "gtk/gtk.h")]
        [Version (since = "2.4")]
        public static bool bindings_activate_event (GLib.Object object, Gdk.EventKey event);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "BuilderError.quark")]
+       public static GLib.Quark builder_error_quark ();
+       [CCode (cheader_filename = "gtk/gtk.h")]
        [Version (since = "3.0")]
        public static bool cairo_should_draw_window (Cairo.Context cr, Gdk.Window window);
        [CCode (cheader_filename = "gtk/gtk.h")]
@@ -12828,6 +12843,9 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static unowned string? check_version (uint required_major, uint required_minor, uint 
required_micro);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "CssProviderError.quark")]
+       public static GLib.Quark css_provider_error_quark ();
+       [CCode (cheader_filename = "gtk/gtk.h")]
        [Version (since = "3.0")]
        public static void device_grab_add (Gtk.Widget widget, Gdk.Device device, bool block_others);
        [CCode (cheader_filename = "gtk/gtk.h")]
@@ -12939,6 +12957,9 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static bool events_pending ();
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "FileChooserError.quark", since = "2.4")]
+       public static GLib.Quark file_chooser_error_quark ();
+       [CCode (cheader_filename = "gtk/gtk.h")]
        [Version (since = "3.0")]
        public static uint get_binary_age ();
        [CCode (cheader_filename = "gtk/gtk.h")]
@@ -12997,6 +13018,9 @@ namespace Gtk {
        [Version (deprecated_since = "3.10")]
        public static void icon_size_register_alias (string alias, Gtk.IconSize target);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "IconThemeError.quark")]
+       public static GLib.Quark icon_theme_error_quark ();
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public static void init ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned 
string[]? argv);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static bool init_check ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref 
unowned string[]? argv);
@@ -13082,8 +13106,17 @@ namespace Gtk {
        [Version (deprecated = true, deprecated_since = "3.0")]
        public static void paint_vline (Gtk.Style style, Cairo.Context cr, Gtk.StateType state_type, 
Gtk.Widget? widget, string? detail, int y1_, int y2_, int x);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "PaperSize.get_default", since = "2.10")]
+       public static unowned string paper_size_get_default ();
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "PaperSize.get_paper_sizes", since = "2.12")]
+       public static GLib.List<Gtk.PaperSize> paper_size_get_paper_sizes (bool include_custom);
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public static bool parse_args ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref 
unowned string[] argv);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "PrintError.quark", since = "2.10")]
+       public static GLib.Quark print_error_quark ();
+       [CCode (cheader_filename = "gtk/gtk.h")]
        [Version (since = "2.10")]
        public static Gtk.PageSetup print_run_page_setup_dialog (Gtk.Window? parent, Gtk.PageSetup? 
page_setup, Gtk.PrintSettings settings);
        [CCode (cheader_filename = "gtk/gtk.h")]
@@ -13155,6 +13188,12 @@ namespace Gtk {
        [Version (deprecated = true, deprecated_since = "3.0")]
        public static void rc_set_default_files ([CCode (array_length = false, array_null_terminated = true)] 
string[] filenames);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "RecentChooserError.quark")]
+       public static GLib.Quark recent_chooser_error_quark ();
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "RecentManagerError.quark")]
+       public static GLib.Quark recent_manager_error_quark ();
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public static void render_icon_surface (Gtk.StyleContext context, Cairo.Context cr, Cairo.Surface 
surface, double x, double y);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static void render_insertion_cursor (Gtk.StyleContext context, Cairo.Context cr, double x, 
double y, Pango.Layout layout, int index, Pango.Direction direction);
@@ -13274,5 +13313,11 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static bool tree_get_row_drag_data (Gtk.SelectionData selection_data, out unowned 
Gtk.TreeModel? tree_model, out Gtk.TreePath? path);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "TreeRowReference.deleted")]
+       public static void tree_row_reference_deleted (GLib.Object proxy, Gtk.TreePath path);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "TreeRowReference.inserted")]
+       public static void tree_row_reference_inserted (GLib.Object proxy, Gtk.TreePath path);
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public static bool tree_set_row_drag_data (Gtk.SelectionData selection_data, Gtk.TreeModel 
tree_model, Gtk.TreePath path);
 }
diff --git a/vapi/gtk4.vapi b/vapi/gtk4.vapi
index 82991423d..8a71ad34d 100644
--- a/vapi/gtk4.vapi
+++ b/vapi/gtk4.vapi
@@ -5132,16 +5132,16 @@ namespace Gdk {
                [CCode (has_construct_function = false)]
                protected Event ();
                [CCode (cname = "gdk_events_get_angle")]
-               public static bool get_angle (Gdk.Event event1, Gdk.Event event2, out double angle);
+               public bool get_angle (Gdk.Event event2, out double angle);
                public bool get_axes ([CCode (array_length_cname = "n_axes", array_length_pos = 1.1, 
array_length_type = "guint")] out unowned double[] axes);
                public bool get_axis (Gdk.AxisUse axis_use, out double value);
                [CCode (cname = "gdk_events_get_center")]
-               public static bool get_center (Gdk.Event event1, Gdk.Event event2, out double x, out double 
y);
+               public bool get_center (Gdk.Event event2, out double x, out double y);
                public unowned Gdk.Device? get_device ();
                public unowned Gdk.DeviceTool? get_device_tool ();
                public unowned Gdk.Display? get_display ();
                [CCode (cname = "gdk_events_get_distance")]
-               public static bool get_distance (Gdk.Event event1, Gdk.Event event2, out double distance);
+               public bool get_distance (Gdk.Event event2, out double distance);
                public unowned Gdk.EventSequence get_event_sequence ();
                public Gdk.EventType get_event_type ();
                [CCode (array_length_pos = 0.1, array_length_type = "guint")]
@@ -5481,6 +5481,7 @@ namespace Gdk {
                public virtual double get_intrinsic_aspect_ratio ();
                public virtual int get_intrinsic_height ();
                public virtual int get_intrinsic_width ();
+               [Version (replacement = "Paintable.new_empty")]
                public static Gdk.Paintable new_empty (int intrinsic_width, int intrinsic_height);
                public abstract void snapshot (Gdk.Snapshot snapshot, double width, double height);
                [HasEmitter]
@@ -5922,6 +5923,12 @@ namespace Gdk {
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static async bool content_serialize_async (GLib.OutputStream stream, string mime_type, 
GLib.Value value, int io_priority, GLib.Cancellable? cancellable) throws GLib.Error;
        [CCode (cheader_filename = "gdk/gdk.h")]
+       [Version (replacement = "DragAction.is_unique")]
+       public static bool drag_action_is_unique (Gdk.DragAction action);
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       [Version (replacement = "GLError.quark")]
+       public static GLib.Quark gl_error_quark ();
+       [CCode (cheader_filename = "gdk/gdk.h")]
        public static unowned string? intern_mime_type (string string);
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static void keyval_convert_case (uint symbol, out uint lower, out uint upper);
@@ -5949,6 +5956,9 @@ namespace Gdk {
        public static void set_allowed_backends (string backends);
        [CCode (cheader_filename = "gdk/gdk.h")]
        public static uint unicode_to_keyval (uint32 wc);
+       [CCode (cheader_filename = "gdk/gdk.h")]
+       [Version (replacement = "VulkanError.quark")]
+       public static GLib.Quark vulkan_error_quark ();
 }
 [CCode (cprefix = "Gsk", gir_namespace = "Gsk", gir_version = "4.0", lower_case_cprefix = "gsk_")]
 namespace Gsk {
@@ -6423,6 +6433,12 @@ namespace Gsk {
        }
        [CCode (cheader_filename = "gsk/gsk.h", error_pos = 2.8, instance_pos = 2.9)]
        public delegate void ParseErrorFunc (Gsk.ParseLocation start, Gsk.ParseLocation end) throws 
GLib.Error;
+       [CCode (cheader_filename = "gsk/gsk.h")]
+       [Version (replacement = "SerializationError.quark")]
+       public static GLib.Quark serialization_error_quark ();
+       [CCode (cheader_filename = "gsk/gsk.h")]
+       [Version (replacement = "Transform.parse")]
+       public static bool transform_parse (string string, out Gsk.Transform out_transform);
 }
 [CCode (cprefix = "Gtk", gir_namespace = "Gtk", gir_version = "4.0", lower_case_cprefix = "gtk_")]
 namespace Gtk {
@@ -9817,7 +9833,6 @@ namespace Gtk {
                public PaperSize.from_key_file (GLib.KeyFile key_file, string? group_name) throws GLib.Error;
                [CCode (has_construct_function = false)]
                public PaperSize.from_ppd (string ppd_name, string ppd_display_name, double width, double 
height);
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public static unowned string get_default ();
                public double get_default_bottom_margin (Gtk.Unit unit);
                public double get_default_left_margin (Gtk.Unit unit);
@@ -9826,7 +9841,6 @@ namespace Gtk {
                public unowned string get_display_name ();
                public double get_height (Gtk.Unit unit);
                public unowned string get_name ();
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public static GLib.List<Gtk.PaperSize> get_paper_sizes (bool include_custom);
                public unowned string get_ppd_name ();
                public double get_width (Gtk.Unit unit);
@@ -11730,17 +11744,16 @@ namespace Gtk {
                [CCode (has_construct_function = false)]
                public TreeRowReference (Gtk.TreeModel model, Gtk.TreePath path);
                public Gtk.TreeRowReference copy ();
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public static void deleted (GLib.Object proxy, Gtk.TreePath path);
                [DestroysInstance]
                public void free ();
                public unowned Gtk.TreeModel get_model ();
                public Gtk.TreePath? get_path ();
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public static void inserted (GLib.Object proxy, Gtk.TreePath path);
                [CCode (has_construct_function = false)]
                public TreeRowReference.proxy (GLib.Object proxy, Gtk.TreeModel model, Gtk.TreePath path);
                [CCode (cheader_filename = "gtk/gtk.h")]
+               [Version (replacement = "TreeRowReference.reordered")]
                public static void reordered (GLib.Object proxy, Gtk.TreePath path, Gtk.TreeIter iter, [CCode 
(array_length = false)] int[] new_order);
                public bool valid ();
        }
@@ -12844,12 +12857,9 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h", has_type_id = false)]
        public struct BitsetIter {
                public uint get_value ();
-               [CCode (cheader_filename = "gtk/gtk.h")]
-               public static bool init_at (out Gtk.BitsetIter iter, Gtk.Bitset @set, uint target, out uint 
value);
-               [CCode (cheader_filename = "gtk/gtk.h")]
-               public static bool init_first (out Gtk.BitsetIter iter, Gtk.Bitset @set, out uint value);
-               [CCode (cheader_filename = "gtk/gtk.h")]
-               public static bool init_last (out Gtk.BitsetIter iter, Gtk.Bitset @set, out uint value);
+               public bool init_at (Gtk.Bitset @set, uint target, out uint value);
+               public bool init_first (Gtk.Bitset @set, out uint value);
+               public bool init_last (Gtk.Bitset @set, out uint value);
                public bool is_valid ();
                public bool next (out uint value);
                public bool previous (out uint value);
@@ -13056,7 +13066,6 @@ namespace Gtk {
                VALUE_MIN,
                VALUE_NOW,
                VALUE_TEXT;
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public void init_value (GLib.Value value);
        }
        [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ACCESSIBLE_RELATION_", type_id = 
"gtk_accessible_relation_get_type ()")]
@@ -13079,7 +13088,6 @@ namespace Gtk {
                ROW_INDEX_TEXT,
                ROW_SPAN,
                SET_SIZE;
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public void init_value (GLib.Value value);
        }
        [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ACCESSIBLE_ROLE_", type_id = 
"gtk_accessible_role_get_type ()")]
@@ -13180,7 +13188,6 @@ namespace Gtk {
                INVALID,
                PRESSED,
                SELECTED;
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public void init_value (GLib.Value value);
        }
        [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ACCESSIBLE_TRISTATE_", type_id = 
"gtk_accessible_tristate_get_type ()")]
@@ -13573,7 +13580,6 @@ namespace Gtk {
                SMALLER,
                EQUAL,
                LARGER;
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public static Gtk.Ordering from_cmpfunc (int cmpfunc_result);
        }
        [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ORIENTATION_", type_id = 
"gtk_orientation_get_type ()")]
@@ -14001,7 +14007,6 @@ namespace Gtk {
                INVALID_SIGNAL,
                INVALID_ID,
                INVALID_FUNCTION;
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CONSTRAINT_VFL_PARSER_ERROR_INVALID_")]
@@ -14012,7 +14017,6 @@ namespace Gtk {
                METRIC,
                PRIORITY,
                RELATION;
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CSS_PARSER_ERROR_")]
@@ -14031,14 +14035,12 @@ namespace Gtk {
                BAD_FILENAME,
                ALREADY_EXISTS,
                INCOMPLETE_HOSTNAME;
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ICON_THEME_")]
        public errordomain IconThemeError {
                NOT_FOUND,
                FAILED;
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_ERROR_")]
@@ -14047,7 +14049,6 @@ namespace Gtk {
                INTERNAL_ERROR,
                NOMEM,
                INVALID_FILE;
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RECENT_MANAGER_ERROR_")]
@@ -14059,7 +14060,6 @@ namespace Gtk {
                READ,
                WRITE,
                UNKNOWN;
-               [CCode (cheader_filename = "gtk/gtk.h")]
                public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "gtk/gtk.h", instance_pos = 1.9)]
@@ -14299,14 +14299,41 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static bool accelerator_valid (uint keyval, Gdk.ModifierType modifiers);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "AccessibleProperty.init_value")]
+       public static void accessible_property_init_value (Gtk.AccessibleProperty property, GLib.Value value);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "AccessibleRelation.init_value")]
+       public static void accessible_relation_init_value (Gtk.AccessibleRelation relation, GLib.Value value);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "AccessibleState.init_value")]
+       public static void accessible_state_init_value (Gtk.AccessibleState state, GLib.Value value);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "BitsetIter.init_at")]
+       public static bool bitset_iter_init_at (out Gtk.BitsetIter iter, Gtk.Bitset @set, uint target, out 
uint value);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "BitsetIter.init_first")]
+       public static bool bitset_iter_init_first (out Gtk.BitsetIter iter, Gtk.Bitset @set, out uint value);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "BitsetIter.init_last")]
+       public static bool bitset_iter_init_last (out Gtk.BitsetIter iter, Gtk.Bitset @set, out uint value);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "BuilderError.quark")]
+       public static GLib.Quark builder_error_quark ();
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public static unowned string? check_version (uint required_major, uint required_minor, uint 
required_micro);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "ConstraintVflParserError.quark")]
+       public static GLib.Quark constraint_vfl_parser_error_quark ();
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public static void disable_setlocale ();
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static int distribute_natural_allocation (int extra_space, [CCode (array_length_cname = 
"n_requested_sizes", array_length_pos = 1.5, array_length_type = "guint")] Gtk.RequestedSize[] sizes);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static bool drag_check_threshold (Gtk.Widget widget, int start_x, int start_y, int current_x, 
int current_y);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "FileChooserError.quark")]
+       public static GLib.Quark file_chooser_error_quark ();
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public static uint get_binary_age ();
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static Gtk.DebugFlags get_debug_flags ();
@@ -14325,18 +14352,37 @@ 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")]
+       [Version (replacement = "IconThemeError.quark")]
+       public static GLib.Quark icon_theme_error_quark ();
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public static void init ();
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static bool init_check ();
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static bool is_initialized ();
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "Native.get_for_surface")]
        public static unowned Gtk.Native native_get_for_surface (Gdk.Surface surface);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "Ordering.from_cmpfunc")]
+       public static Gtk.Ordering ordering_from_cmpfunc (int cmpfunc_result);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "PaperSize.get_default")]
+       public static unowned string paper_size_get_default ();
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "PaperSize.get_paper_sizes")]
+       public static GLib.List<Gtk.PaperSize> paper_size_get_paper_sizes (bool include_custom);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "PrintError.quark")]
+       public static GLib.Quark print_error_quark ();
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public static Gtk.PageSetup print_run_page_setup_dialog (Gtk.Window? parent, Gtk.PageSetup? 
page_setup, Gtk.PrintSettings settings);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static void print_run_page_setup_dialog_async (Gtk.Window? parent, Gtk.PageSetup? page_setup, 
Gtk.PrintSettings settings, [CCode (scope = "async")] Gtk.PageSetupDoneFunc done_cb);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "RecentManagerError.quark")]
+       public static GLib.Quark recent_manager_error_quark ();
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public static void rgb_to_hsv (float r, float g, float b, out float h, out float s, out float v);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static void set_debug_flags (Gtk.DebugFlags flags);
@@ -14369,6 +14415,12 @@ namespace Gtk {
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static bool tree_get_row_drag_data (GLib.Value value, out unowned Gtk.TreeModel? tree_model, 
out Gtk.TreePath? path);
        [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "TreeRowReference.deleted")]
+       public static void tree_row_reference_deleted (GLib.Object proxy, Gtk.TreePath path);
+       [CCode (cheader_filename = "gtk/gtk.h")]
+       [Version (replacement = "TreeRowReference.inserted")]
+       public static void tree_row_reference_inserted (GLib.Object proxy, Gtk.TreePath path);
+       [CCode (cheader_filename = "gtk/gtk.h")]
        public static Gtk.Expression? value_dup_expression (GLib.Value value);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public static unowned Gtk.Expression? value_get_expression (ref GLib.Value value);
diff --git a/vapi/harfbuzz-gobject.vapi b/vapi/harfbuzz-gobject.vapi
index 7d48fd415..162a35797 100644
--- a/vapi/harfbuzz-gobject.vapi
+++ b/vapi/harfbuzz-gobject.vapi
@@ -8,153 +8,153 @@ namespace HarfBuzz {
        [GIR (name = "blob_t")]
        public class Blob {
                [Version (since = "1.8.0")]
-               public static HarfBuzz.Blob copy_writable_or_fail (HarfBuzz.Blob blob);
+               public HarfBuzz.Blob copy_writable_or_fail ();
                [Version (since = "1.7.7")]
                public static HarfBuzz.Blob create_from_file (string file_name);
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Blob create_sub_blob (HarfBuzz.Blob parent, uint offset, uint length);
-               [CCode (array_length_pos = 1.1, array_length_type = "guint")]
+               public HarfBuzz.Blob create_sub_blob (uint offset, uint length);
+               [CCode (array_length_pos = 0.2, array_length_type = "guint")]
                [Version (since = "0.9.2")]
-               public static unowned string[] get_data (HarfBuzz.Blob blob);
-               [CCode (array_length_pos = 1.1, array_length_type = "guint")]
+               public unowned string[] get_data ();
+               [CCode (array_length_pos = 0.2, array_length_type = "guint")]
                [Version (since = "0.9.2")]
-               public static unowned string[] get_data_writable (HarfBuzz.Blob blob);
+               public unowned string[] get_data_writable ();
                [Version (since = "0.9.2")]
                public static HarfBuzz.Blob get_empty ();
                [Version (since = "0.9.2")]
-               public static uint get_length (HarfBuzz.Blob blob);
+               public uint get_length ();
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool is_immutable (HarfBuzz.Blob blob);
+               public HarfBuzz.Bool is_immutable ();
                [Version (since = "0.9.2")]
-               public static void make_immutable (HarfBuzz.Blob blob);
+               public void make_immutable ();
        }
        [CCode (cheader_filename = "hb-gobject.h", cname = "hb_buffer_t", copy_function = "g_boxed_copy", 
free_function = "g_boxed_free", type_id = "hb_gobject_buffer_get_type ()")]
        [Compact]
        [GIR (name = "buffer_t")]
        public class Buffer {
                [Version (since = "0.9.7")]
-               public static void add (HarfBuzz.Buffer buffer, HarfBuzz.Codepoint codepoint, uint cluster);
+               public void add (HarfBuzz.Codepoint codepoint, uint cluster);
                [Version (since = "0.9.31")]
-               public static void add_codepoints (HarfBuzz.Buffer buffer, [CCode (array_length_cname = 
"text_length", array_length_pos = 2.5)] HarfBuzz.Codepoint[] text, uint item_offset, int item_length);
+               public void add_codepoints ([CCode (array_length_cname = "text_length", array_length_pos = 
1.5)] HarfBuzz.Codepoint[] text, uint item_offset, int item_length);
                [Version (since = "0.9.39")]
-               public static void add_latin1 (HarfBuzz.Buffer buffer, [CCode (array_length_cname = 
"text_length", array_length_pos = 2.5)] uint8[] text, uint item_offset, int item_length);
+               public void add_latin1 ([CCode (array_length_cname = "text_length", array_length_pos = 1.5)] 
uint8[] text, uint item_offset, int item_length);
                [Version (since = "0.9.2")]
-               public static void add_utf16 (HarfBuzz.Buffer buffer, [CCode (array_length_cname = 
"text_length", array_length_pos = 2.5)] uint16[] text, uint item_offset, int item_length);
+               public void add_utf16 ([CCode (array_length_cname = "text_length", array_length_pos = 1.5)] 
uint16[] text, uint item_offset, int item_length);
                [Version (since = "0.9.2")]
-               public static void add_utf32 (HarfBuzz.Buffer buffer, [CCode (array_length_cname = 
"text_length", array_length_pos = 2.5)] uint32[] text, uint item_offset, int item_length);
+               public void add_utf32 ([CCode (array_length_cname = "text_length", array_length_pos = 1.5)] 
uint32[] text, uint item_offset, int item_length);
                [Version (since = "0.9.2")]
-               public static void add_utf8 (HarfBuzz.Buffer buffer, [CCode (array_length_cname = 
"text_length", array_length_pos = 2.5)] uint8[] text, uint item_offset, int item_length);
+               public void add_utf8 ([CCode (array_length_cname = "text_length", array_length_pos = 1.5)] 
uint8[] text, uint item_offset, int item_length);
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool allocation_successful (HarfBuzz.Buffer buffer);
+               public HarfBuzz.Bool allocation_successful ();
                [Version (since = "1.5.0")]
-               public static void append (HarfBuzz.Buffer buffer, HarfBuzz.Buffer source, uint start, uint 
end);
+               public void append (HarfBuzz.Buffer source, uint start, uint end);
                [Version (since = "0.9.11")]
-               public static void clear_contents (HarfBuzz.Buffer buffer);
+               public void clear_contents ();
                [Version (since = "0.9.2")]
                public static HarfBuzz.Buffer create ();
                [Version (since = "0.9.7")]
-               public static HarfBuzz.Bool deserialize_glyphs (HarfBuzz.Buffer buffer, [CCode 
(array_length_cname = "buf_len", array_length_pos = 2.5)] string[] buf, out string end_ptr, HarfBuzz.Font 
font, HarfBuzz.BufferSerializeFormat format);
+               public HarfBuzz.Bool deserialize_glyphs ([CCode (array_length_cname = "buf_len", 
array_length_pos = 1.5)] string[] buf, out string end_ptr, HarfBuzz.Font font, HarfBuzz.BufferSerializeFormat 
format);
                [Version (since = "2.7.3")]
-               public static HarfBuzz.Bool deserialize_unicode (HarfBuzz.Buffer buffer, [CCode 
(array_length_cname = "buf_len", array_length_pos = 2.5)] string[] buf, out string end_ptr, 
HarfBuzz.BufferSerializeFormat format);
+               public HarfBuzz.Bool deserialize_unicode ([CCode (array_length_cname = "buf_len", 
array_length_pos = 1.5)] string[] buf, out string end_ptr, HarfBuzz.BufferSerializeFormat format);
                [Version (since = "1.5.0")]
-               public static HarfBuzz.BufferDiffFlags diff (HarfBuzz.Buffer buffer, HarfBuzz.Buffer 
reference, HarfBuzz.Codepoint dottedcircle_glyph, uint position_fuzz);
+               public HarfBuzz.BufferDiffFlags diff (HarfBuzz.Buffer reference, HarfBuzz.Codepoint 
dottedcircle_glyph, uint position_fuzz);
                [Version (since = "0.9.42")]
-               public static HarfBuzz.BufferClusterLevel get_cluster_level (HarfBuzz.Buffer buffer);
+               public HarfBuzz.BufferClusterLevel get_cluster_level ();
                [Version (since = "0.9.5")]
-               public static HarfBuzz.BufferContentType get_content_type (HarfBuzz.Buffer buffer);
+               public HarfBuzz.BufferContentType get_content_type ();
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Direction get_direction (HarfBuzz.Buffer buffer);
+               public HarfBuzz.Direction get_direction ();
                [Version (since = "0.9.2")]
                public static HarfBuzz.Buffer get_empty ();
                [Version (since = "0.9.7")]
-               public static HarfBuzz.BufferFlags get_flags (HarfBuzz.Buffer buffer);
-               [CCode (array_length_pos = 1.1, array_length_type = "guint")]
+               public HarfBuzz.BufferFlags get_flags ();
+               [CCode (array_length_pos = 0.2, array_length_type = "guint")]
                [Version (since = "0.9.2")]
-               public static unowned HarfBuzz.Glyph[] get_glyph_infos (HarfBuzz.Buffer buffer);
-               [CCode (array_length_pos = 1.1, array_length_type = "guint")]
+               public unowned HarfBuzz.Glyph[] get_glyph_infos ();
+               [CCode (array_length_pos = 0.2, array_length_type = "guint")]
                [Version (since = "0.9.2")]
-               public static unowned HarfBuzz.GlyphPosition[] get_glyph_positions (HarfBuzz.Buffer buffer);
+               public unowned HarfBuzz.GlyphPosition[] get_glyph_positions ();
                [Version (since = "2.0.0")]
-               public static HarfBuzz.Codepoint get_invisible_glyph (HarfBuzz.Buffer buffer);
+               public HarfBuzz.Codepoint get_invisible_glyph ();
                [Version (since = "0.9.2")]
-               public static unowned HarfBuzz.Language get_language (HarfBuzz.Buffer buffer);
+               public unowned HarfBuzz.Language get_language ();
                [Version (since = "0.9.2")]
-               public static uint get_length (HarfBuzz.Buffer buffer);
+               public uint get_length ();
                [Version (since = "0.9.31")]
-               public static HarfBuzz.Codepoint get_replacement_codepoint (HarfBuzz.Buffer buffer);
+               public HarfBuzz.Codepoint get_replacement_codepoint ();
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Script get_script (HarfBuzz.Buffer buffer);
+               public HarfBuzz.Script get_script ();
                [Version (since = "0.9.7")]
-               public static void get_segment_properties (HarfBuzz.Buffer buffer, out unowned 
HarfBuzz.SegmentProperties props);
+               public void get_segment_properties (out unowned HarfBuzz.SegmentProperties props);
                [Version (since = "0.9.2")]
-               public static HarfBuzz.UnicodeFuncs get_unicode_funcs (HarfBuzz.Buffer buffer);
+               public HarfBuzz.UnicodeFuncs get_unicode_funcs ();
                [Version (since = "0.9.7")]
-               public static void guess_segment_properties (HarfBuzz.Buffer buffer);
-               public static HarfBuzz.Bool has_positions (HarfBuzz.Buffer buffer);
+               public void guess_segment_properties ();
+               public HarfBuzz.Bool has_positions ();
                [Version (since = "0.9.2")]
-               public static void normalize_glyphs (HarfBuzz.Buffer buffer);
+               public void normalize_glyphs ();
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool pre_allocate (HarfBuzz.Buffer buffer, uint size);
+               public HarfBuzz.Bool pre_allocate (uint size);
                [Version (since = "0.9.2")]
-               public static void reset (HarfBuzz.Buffer buffer);
+               public void reset ();
                [Version (since = "0.9.2")]
-               public static void reverse (HarfBuzz.Buffer buffer);
+               public void reverse ();
                [Version (since = "0.9.2")]
-               public static void reverse_clusters (HarfBuzz.Buffer buffer);
+               public void reverse_clusters ();
                [Version (since = "0.9.41")]
-               public static void reverse_range (HarfBuzz.Buffer buffer, uint start, uint end);
+               public void reverse_range (uint start, uint end);
                [Version (since = "2.7.3")]
-               public static uint serialize (HarfBuzz.Buffer buffer, uint start, uint end, [CCode 
(array_length_cname = "buf_size", array_length_pos = 4.5, array_length_type = "guint")] out uint8[] buf, out 
uint buf_consumed, HarfBuzz.Font? font, HarfBuzz.BufferSerializeFormat format, HarfBuzz.BufferSerializeFlags 
flags);
+               public uint serialize (uint start, uint end, [CCode (array_length_cname = "buf_size", 
array_length_pos = 3.5, array_length_type = "guint")] out uint8[] buf, out uint buf_consumed, HarfBuzz.Font? 
font, HarfBuzz.BufferSerializeFormat format, HarfBuzz.BufferSerializeFlags flags);
                [Version (since = "0.9.7")]
                public static HarfBuzz.BufferSerializeFormat serialize_format_from_string ([CCode 
(array_length_cname = "len", array_length_pos = 1.1)] uint8[] str);
                [Version (since = "0.9.7")]
                public static unowned string serialize_format_to_string (HarfBuzz.BufferSerializeFormat 
format);
                [Version (since = "0.9.7")]
-               public static uint serialize_glyphs (HarfBuzz.Buffer buffer, uint start, uint end, [CCode 
(array_length_cname = "buf_size", array_length_pos = 4.5, array_length_type = "guint")] out uint8[] buf, out 
uint buf_consumed, HarfBuzz.Font? font, HarfBuzz.BufferSerializeFormat format, HarfBuzz.BufferSerializeFlags 
flags);
+               public uint serialize_glyphs (uint start, uint end, [CCode (array_length_cname = "buf_size", 
array_length_pos = 3.5, array_length_type = "guint")] out uint8[] buf, out uint buf_consumed, HarfBuzz.Font? 
font, HarfBuzz.BufferSerializeFormat format, HarfBuzz.BufferSerializeFlags flags);
                [CCode (array_length = false, array_null_terminated = true)]
                [Version (since = "0.9.7")]
                public static unowned string[] serialize_list_formats ();
                [Version (since = "2.7.3")]
-               public static uint serialize_unicode (HarfBuzz.Buffer buffer, uint start, uint end, [CCode 
(array_length_cname = "buf_size", array_length_pos = 4.5, array_length_type = "guint")] out uint8[] buf, out 
uint buf_consumed, HarfBuzz.BufferSerializeFormat format, HarfBuzz.BufferSerializeFlags flags);
+               public uint serialize_unicode (uint start, uint end, [CCode (array_length_cname = "buf_size", 
array_length_pos = 3.5, array_length_type = "guint")] out uint8[] buf, out uint buf_consumed, 
HarfBuzz.BufferSerializeFormat format, HarfBuzz.BufferSerializeFlags flags);
                [Version (since = "0.9.42")]
-               public static void set_cluster_level (HarfBuzz.Buffer buffer, HarfBuzz.BufferClusterLevel 
cluster_level);
+               public void set_cluster_level (HarfBuzz.BufferClusterLevel cluster_level);
                [Version (since = "0.9.5")]
-               public static void set_content_type (HarfBuzz.Buffer buffer, HarfBuzz.BufferContentType 
content_type);
+               public void set_content_type (HarfBuzz.BufferContentType content_type);
                [Version (since = "0.9.2")]
-               public static void set_direction (HarfBuzz.Buffer buffer, HarfBuzz.Direction direction);
+               public void set_direction (HarfBuzz.Direction direction);
                [Version (since = "0.9.7")]
-               public static void set_flags (HarfBuzz.Buffer buffer, HarfBuzz.BufferFlags flags);
+               public void set_flags (HarfBuzz.BufferFlags flags);
                [Version (since = "2.0.0")]
-               public static void set_invisible_glyph (HarfBuzz.Buffer buffer, HarfBuzz.Codepoint invisible);
+               public void set_invisible_glyph (HarfBuzz.Codepoint invisible);
                [Version (since = "0.9.2")]
-               public static void set_language (HarfBuzz.Buffer buffer, HarfBuzz.Language language);
+               public void set_language (HarfBuzz.Language language);
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool set_length (HarfBuzz.Buffer buffer, uint length);
+               public HarfBuzz.Bool set_length (uint length);
                [Version (since = "1.1.3")]
-               public static void set_message_func (HarfBuzz.Buffer buffer, owned HarfBuzz.BufferMessageFunc 
func);
+               public void set_message_func (owned HarfBuzz.BufferMessageFunc func);
                [Version (since = "0.9.31")]
-               public static void set_replacement_codepoint (HarfBuzz.Buffer buffer, HarfBuzz.Codepoint 
replacement);
+               public void set_replacement_codepoint (HarfBuzz.Codepoint replacement);
                [Version (since = "0.9.2")]
-               public static void set_script (HarfBuzz.Buffer buffer, HarfBuzz.Script script);
+               public void set_script (HarfBuzz.Script script);
                [Version (since = "0.9.7")]
-               public static void set_segment_properties (HarfBuzz.Buffer buffer, HarfBuzz.SegmentProperties 
props);
+               public void set_segment_properties (HarfBuzz.SegmentProperties props);
                [Version (since = "0.9.2")]
-               public static void set_unicode_funcs (HarfBuzz.Buffer buffer, HarfBuzz.UnicodeFuncs 
unicode_funcs);
+               public void set_unicode_funcs (HarfBuzz.UnicodeFuncs unicode_funcs);
        }
        [CCode (cheader_filename = "hb-gobject.h", cname = "hb_face_t", copy_function = "g_boxed_copy", 
free_function = "g_boxed_free", type_id = "hb_gobject_face_get_type ()")]
        [Compact]
        [GIR (name = "face_t")]
        public class Face {
                [Version (since = "1.9.0")]
-               public static HarfBuzz.Bool builder_add_table (HarfBuzz.Face face, HarfBuzz.Tag tag, 
HarfBuzz.Blob blob);
+               public HarfBuzz.Bool builder_add_table (HarfBuzz.Tag tag, HarfBuzz.Blob blob);
                [Version (since = "1.9.0")]
                public static HarfBuzz.Face builder_create ();
                [Version (since = "1.9.0")]
-               public static void collect_unicodes (HarfBuzz.Face face, HarfBuzz.Set @out);
+               public void collect_unicodes (HarfBuzz.Set @out);
                [Version (since = "1.9.0")]
-               public static void collect_variation_selectors (HarfBuzz.Face face, HarfBuzz.Set @out);
+               public void collect_variation_selectors (HarfBuzz.Set @out);
                [Version (since = "1.9.0")]
-               public static void collect_variation_unicodes (HarfBuzz.Face face, HarfBuzz.Codepoint 
variation_selector, HarfBuzz.Set @out);
+               public void collect_variation_unicodes (HarfBuzz.Codepoint variation_selector, HarfBuzz.Set 
@out);
                [Version (since = "1.7.7")]
                public static uint count (HarfBuzz.Blob blob);
                [Version (since = "0.9.2")]
@@ -164,27 +164,27 @@ namespace HarfBuzz {
                [Version (since = "0.9.2")]
                public static HarfBuzz.Face get_empty ();
                [Version (since = "0.9.7")]
-               public static uint get_glyph_count (HarfBuzz.Face face);
+               public uint get_glyph_count ();
                [Version (since = "0.9.2")]
-               public static uint get_index (HarfBuzz.Face face);
+               public uint get_index ();
                [Version (since = "1.6.0")]
-               public static uint get_table_tags (HarfBuzz.Face face, uint start_offset, [CCode 
(array_length_cname = "table_count", array_length_pos = 2.5, array_length_type = "guint")] out HarfBuzz.Tag[] 
table_tags);
+               public uint get_table_tags (uint start_offset, [CCode (array_length_cname = "table_count", 
array_length_pos = 1.5, array_length_type = "guint")] out HarfBuzz.Tag[] table_tags);
                [Version (since = "0.9.2")]
-               public static uint get_upem (HarfBuzz.Face face);
+               public uint get_upem ();
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool is_immutable (HarfBuzz.Face face);
+               public HarfBuzz.Bool is_immutable ();
                [Version (since = "0.9.2")]
-               public static void make_immutable (HarfBuzz.Face face);
+               public void make_immutable ();
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Blob reference_blob (HarfBuzz.Face face);
+               public HarfBuzz.Blob reference_blob ();
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Blob reference_table (HarfBuzz.Face face, HarfBuzz.Tag tag);
+               public HarfBuzz.Blob reference_table (HarfBuzz.Tag tag);
                [Version (since = "0.9.7")]
-               public static void set_glyph_count (HarfBuzz.Face face, uint glyph_count);
+               public void set_glyph_count (uint glyph_count);
                [Version (since = "0.9.2")]
-               public static void set_index (HarfBuzz.Face face, uint index);
+               public void set_index (uint index);
                [Version (since = "0.9.2")]
-               public static void set_upem (HarfBuzz.Face face, uint upem);
+               public void set_upem (uint upem);
        }
        [CCode (cheader_filename = "hb-gobject.h", cname = "hb_feature_t", copy_function = "g_boxed_copy", 
free_function = "g_boxed_free", type_id = "hb_gobject_feature_get_type ()")]
        [Compact]
@@ -195,119 +195,119 @@ namespace HarfBuzz {
                public HarfBuzz.Tag tag;
                public uint32 value;
                [CCode (cname = "hb_feature_to_string")]
-               [Version (since = "0.9.5")]
+               [Version (replacement = "feature_to_string", since = "0.9.5")]
                public void _string ([CCode (array_length_cname = "size", array_length_pos = 1.1, 
array_length_type = "guint")] out string[] buf);
                [Version (since = "0.9.5")]
                public static HarfBuzz.Bool from_string ([CCode (array_length_cname = "len", array_length_pos 
= 1.5)] uint8[] str, out unowned HarfBuzz.Feature feature);
                [Version (since = "0.9.5")]
-               public static void to_string (HarfBuzz.Feature feature, [CCode (array_length_cname = "size", 
array_length_pos = 2.1, array_length_type = "guint")] out string[] buf);
+               public void to_string ([CCode (array_length_cname = "size", array_length_pos = 1.1, 
array_length_type = "guint")] out string[] buf);
        }
        [CCode (cheader_filename = "hb-gobject.h", cname = "hb_font_t", copy_function = "g_boxed_copy", 
free_function = "g_boxed_free", type_id = "hb_gobject_font_get_type ()")]
        [Compact]
        [GIR (name = "font_t")]
        public class Font {
                [Version (since = "0.9.2")]
-               public static void add_glyph_origin_for_direction (HarfBuzz.Font font, HarfBuzz.Codepoint 
glyph, HarfBuzz.Direction direction, out HarfBuzz.Position x, out HarfBuzz.Position y);
+               public void add_glyph_origin_for_direction (HarfBuzz.Codepoint glyph, HarfBuzz.Direction 
direction, out HarfBuzz.Position x, out HarfBuzz.Position y);
                [Version (since = "0.9.2")]
                public static HarfBuzz.Font create (HarfBuzz.Face face);
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Font create_sub_font (HarfBuzz.Font parent);
+               public HarfBuzz.Font create_sub_font ();
                [Version (since = "0.9.2")]
                public static HarfBuzz.Font get_empty ();
                [Version (since = "1.1.3")]
-               public static HarfBuzz.FontExtents get_extents_for_direction (HarfBuzz.Font font, 
HarfBuzz.Direction direction);
+               public HarfBuzz.FontExtents get_extents_for_direction (HarfBuzz.Direction direction);
                [Version (since = "0.9.2")]
-               public static unowned HarfBuzz.Face get_face (HarfBuzz.Font font);
+               public unowned HarfBuzz.Face get_face ();
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool get_glyph (HarfBuzz.Font font, HarfBuzz.Codepoint unicode, 
HarfBuzz.Codepoint variation_selector, out HarfBuzz.Codepoint glyph);
+               public HarfBuzz.Bool get_glyph (HarfBuzz.Codepoint unicode, HarfBuzz.Codepoint 
variation_selector, out HarfBuzz.Codepoint glyph);
                [Version (since = "0.9.2")]
-               public static void get_glyph_advance_for_direction (HarfBuzz.Font font, HarfBuzz.Codepoint 
glyph, HarfBuzz.Direction direction, out HarfBuzz.Position x, out HarfBuzz.Position y);
+               public void get_glyph_advance_for_direction (HarfBuzz.Codepoint glyph, HarfBuzz.Direction 
direction, out HarfBuzz.Position x, out HarfBuzz.Position y);
                [Version (since = "1.8.6")]
-               public static void get_glyph_advances_for_direction (HarfBuzz.Font font, HarfBuzz.Direction 
direction, uint count, HarfBuzz.Codepoint first_glyph, uint glyph_stride, HarfBuzz.Position first_advance, 
uint advance_stride);
+               public void get_glyph_advances_for_direction (HarfBuzz.Direction direction, uint count, 
HarfBuzz.Codepoint first_glyph, uint glyph_stride, HarfBuzz.Position first_advance, uint advance_stride);
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool get_glyph_contour_point (HarfBuzz.Font font, HarfBuzz.Codepoint 
glyph, uint point_index, out HarfBuzz.Position x, out HarfBuzz.Position y);
+               public HarfBuzz.Bool get_glyph_contour_point (HarfBuzz.Codepoint glyph, uint point_index, out 
HarfBuzz.Position x, out HarfBuzz.Position y);
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool get_glyph_contour_point_for_origin (HarfBuzz.Font font, 
HarfBuzz.Codepoint glyph, uint point_index, HarfBuzz.Direction direction, out HarfBuzz.Position x, out 
HarfBuzz.Position y);
+               public HarfBuzz.Bool get_glyph_contour_point_for_origin (HarfBuzz.Codepoint glyph, uint 
point_index, HarfBuzz.Direction direction, out HarfBuzz.Position x, out HarfBuzz.Position y);
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool get_glyph_extents (HarfBuzz.Font font, HarfBuzz.Codepoint glyph, 
out HarfBuzz.GlyphExtents extents);
+               public HarfBuzz.Bool get_glyph_extents (HarfBuzz.Codepoint glyph, out HarfBuzz.GlyphExtents 
extents);
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool get_glyph_extents_for_origin (HarfBuzz.Font font, 
HarfBuzz.Codepoint glyph, HarfBuzz.Direction direction, out HarfBuzz.GlyphExtents extents);
+               public HarfBuzz.Bool get_glyph_extents_for_origin (HarfBuzz.Codepoint glyph, 
HarfBuzz.Direction direction, out HarfBuzz.GlyphExtents extents);
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool get_glyph_from_name (HarfBuzz.Font font, [CCode 
(array_length_cname = "len", array_length_pos = 2.5)] string[] name, out HarfBuzz.Codepoint glyph);
+               public HarfBuzz.Bool get_glyph_from_name ([CCode (array_length_cname = "len", 
array_length_pos = 1.5)] string[] name, out HarfBuzz.Codepoint glyph);
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Position get_glyph_h_advance (HarfBuzz.Font font, HarfBuzz.Codepoint 
glyph);
+               public HarfBuzz.Position get_glyph_h_advance (HarfBuzz.Codepoint glyph);
                [Version (since = "1.8.6")]
-               public static void get_glyph_h_advances (HarfBuzz.Font font, uint count, HarfBuzz.Codepoint 
first_glyph, uint glyph_stride, HarfBuzz.Position first_advance, uint advance_stride);
+               public void get_glyph_h_advances (uint count, HarfBuzz.Codepoint first_glyph, uint 
glyph_stride, HarfBuzz.Position first_advance, uint advance_stride);
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Position get_glyph_h_kerning (HarfBuzz.Font font, HarfBuzz.Codepoint 
left_glyph, HarfBuzz.Codepoint right_glyph);
+               public HarfBuzz.Position get_glyph_h_kerning (HarfBuzz.Codepoint left_glyph, 
HarfBuzz.Codepoint right_glyph);
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool get_glyph_h_origin (HarfBuzz.Font font, HarfBuzz.Codepoint glyph, 
out HarfBuzz.Position x, out HarfBuzz.Position y);
+               public HarfBuzz.Bool get_glyph_h_origin (HarfBuzz.Codepoint glyph, out HarfBuzz.Position x, 
out HarfBuzz.Position y);
                [Version (since = "0.9.2")]
-               public static void get_glyph_kerning_for_direction (HarfBuzz.Font font, HarfBuzz.Codepoint 
first_glyph, HarfBuzz.Codepoint second_glyph, HarfBuzz.Direction direction, out HarfBuzz.Position x, out 
HarfBuzz.Position y);
+               public void get_glyph_kerning_for_direction (HarfBuzz.Codepoint first_glyph, 
HarfBuzz.Codepoint second_glyph, HarfBuzz.Direction direction, out HarfBuzz.Position x, out HarfBuzz.Position 
y);
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool get_glyph_name (HarfBuzz.Font font, HarfBuzz.Codepoint glyph, 
[CCode (array_length_cname = "size", array_length_pos = 3.1, array_length_type = "guint")] string[] name);
+               public HarfBuzz.Bool get_glyph_name (HarfBuzz.Codepoint glyph, [CCode (array_length_cname = 
"size", array_length_pos = 2.1, array_length_type = "guint")] string[] name);
                [Version (since = "0.9.2")]
-               public static void get_glyph_origin_for_direction (HarfBuzz.Font font, HarfBuzz.Codepoint 
glyph, HarfBuzz.Direction direction, out HarfBuzz.Position x, out HarfBuzz.Position y);
+               public void get_glyph_origin_for_direction (HarfBuzz.Codepoint glyph, HarfBuzz.Direction 
direction, out HarfBuzz.Position x, out HarfBuzz.Position y);
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Position get_glyph_v_advance (HarfBuzz.Font font, HarfBuzz.Codepoint 
glyph);
+               public HarfBuzz.Position get_glyph_v_advance (HarfBuzz.Codepoint glyph);
                [Version (since = "1.8.6")]
-               public static void get_glyph_v_advances (HarfBuzz.Font font, uint count, HarfBuzz.Codepoint 
first_glyph, uint glyph_stride, HarfBuzz.Position first_advance, uint advance_stride);
+               public void get_glyph_v_advances (uint count, HarfBuzz.Codepoint first_glyph, uint 
glyph_stride, HarfBuzz.Position first_advance, uint advance_stride);
                [Version (deprecated = true, deprecated_since = "2.0.0", since = "0.9.2")]
-               public static HarfBuzz.Position get_glyph_v_kerning (HarfBuzz.Font font, HarfBuzz.Codepoint 
top_glyph, HarfBuzz.Codepoint bottom_glyph);
+               public HarfBuzz.Position get_glyph_v_kerning (HarfBuzz.Codepoint top_glyph, 
HarfBuzz.Codepoint bottom_glyph);
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool get_glyph_v_origin (HarfBuzz.Font font, HarfBuzz.Codepoint glyph, 
out HarfBuzz.Position x, out HarfBuzz.Position y);
+               public HarfBuzz.Bool get_glyph_v_origin (HarfBuzz.Codepoint glyph, out HarfBuzz.Position x, 
out HarfBuzz.Position y);
                [Version (since = "1.1.3")]
-               public static HarfBuzz.Bool get_h_extents (HarfBuzz.Font font, out HarfBuzz.FontExtents 
extents);
+               public HarfBuzz.Bool get_h_extents (out HarfBuzz.FontExtents extents);
                [Version (since = "1.2.3")]
-               public static HarfBuzz.Bool get_nominal_glyph (HarfBuzz.Font font, HarfBuzz.Codepoint 
unicode, out HarfBuzz.Codepoint glyph);
+               public HarfBuzz.Bool get_nominal_glyph (HarfBuzz.Codepoint unicode, out HarfBuzz.Codepoint 
glyph);
                [Version (since = "2.6.3")]
-               public static uint get_nominal_glyphs (HarfBuzz.Font font, uint count, HarfBuzz.Codepoint 
first_unicode, uint unicode_stride, HarfBuzz.Codepoint first_glyph, uint glyph_stride);
+               public uint get_nominal_glyphs (uint count, HarfBuzz.Codepoint first_unicode, uint 
unicode_stride, HarfBuzz.Codepoint first_glyph, uint glyph_stride);
                [Version (since = "0.9.2")]
-               public static unowned HarfBuzz.Font get_parent (HarfBuzz.Font font);
+               public unowned HarfBuzz.Font get_parent ();
                [Version (since = "0.9.2")]
-               public static void get_ppem (HarfBuzz.Font font, out uint x_ppem, out uint y_ppem);
+               public void get_ppem (out uint x_ppem, out uint y_ppem);
                [Version (since = "0.9.2")]
-               public static float get_ptem (HarfBuzz.Font font);
+               public float get_ptem ();
                [Version (since = "0.9.2")]
-               public static void get_scale (HarfBuzz.Font font, out int x_scale, out int y_scale);
+               public void get_scale (out int x_scale, out int y_scale);
                [Version (since = "1.1.3")]
-               public static HarfBuzz.Bool get_v_extents (HarfBuzz.Font font, out HarfBuzz.FontExtents 
extents);
+               public HarfBuzz.Bool get_v_extents (out HarfBuzz.FontExtents extents);
                [Version (since = "1.4.2")]
-               public static int get_var_coords_normalized (HarfBuzz.Font font, uint length);
+               public int get_var_coords_normalized (uint length);
                [Version (since = "1.2.3")]
-               public static HarfBuzz.Bool get_variation_glyph (HarfBuzz.Font font, HarfBuzz.Codepoint 
unicode, HarfBuzz.Codepoint variation_selector, out HarfBuzz.Codepoint glyph);
+               public HarfBuzz.Bool get_variation_glyph (HarfBuzz.Codepoint unicode, HarfBuzz.Codepoint 
variation_selector, out HarfBuzz.Codepoint glyph);
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool glyph_from_string (HarfBuzz.Font font, [CCode (array_length_cname 
= "len", array_length_pos = 2.5)] uint8[] s, out HarfBuzz.Codepoint glyph);
+               public HarfBuzz.Bool glyph_from_string ([CCode (array_length_cname = "len", array_length_pos 
= 1.5)] uint8[] s, out HarfBuzz.Codepoint glyph);
                [Version (since = "0.9.2")]
-               public static void glyph_to_string (HarfBuzz.Font font, HarfBuzz.Codepoint glyph, [CCode 
(array_length_cname = "size", array_length_pos = 3.1, array_length_type = "guint")] string[] s);
+               public void glyph_to_string (HarfBuzz.Codepoint glyph, [CCode (array_length_cname = "size", 
array_length_pos = 2.1, array_length_type = "guint")] string[] s);
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool is_immutable (HarfBuzz.Font font);
+               public HarfBuzz.Bool is_immutable ();
                [Version (since = "0.9.2")]
-               public static void make_immutable (HarfBuzz.Font font);
+               public void make_immutable ();
                [Version (since = "1.4.3")]
-               public static void set_face (HarfBuzz.Font font, HarfBuzz.Face face);
+               public void set_face (HarfBuzz.Face face);
                [Version (since = "0.9.2")]
-               public static void set_funcs (HarfBuzz.Font font, owned HarfBuzz.FontFuncs klass);
+               public void set_funcs (owned HarfBuzz.FontFuncs klass);
                [Version (since = "0.9.2")]
-               public static void set_funcs_data (HarfBuzz.Font font, [CCode (destroy_notify_pos = 2.1)] 
owned void* font_data);
+               public void set_funcs_data ([CCode (destroy_notify_pos = 1.1)] owned void* font_data);
                [Version (since = "1.0.5")]
-               public static void set_parent (HarfBuzz.Font font, HarfBuzz.Font parent);
+               public void set_parent (HarfBuzz.Font parent);
                [Version (since = "0.9.2")]
-               public static void set_ppem (HarfBuzz.Font font, uint x_ppem, uint y_ppem);
+               public void set_ppem (uint x_ppem, uint y_ppem);
                [Version (since = "1.6.0")]
-               public static void set_ptem (HarfBuzz.Font font, float ptem);
+               public void set_ptem (float ptem);
                [Version (since = "0.9.2")]
-               public static void set_scale (HarfBuzz.Font font, int x_scale, int y_scale);
+               public void set_scale (int x_scale, int y_scale);
                [Version (since = "1.4.2")]
-               public static void set_var_coords_design (HarfBuzz.Font font, float coords, uint 
coords_length);
+               public void set_var_coords_design (float coords, uint coords_length);
                [Version (since = "1.4.2")]
-               public static void set_var_coords_normalized (HarfBuzz.Font font, int coords, uint 
coords_length);
+               public void set_var_coords_normalized (int coords, uint coords_length);
                [Version (since = "2.6.0")]
-               public static void set_var_named_instance (HarfBuzz.Font font, uint instance_index);
+               public void set_var_named_instance (uint instance_index);
                [Version (since = "1.4.2")]
-               public static void set_variations (HarfBuzz.Font font, HarfBuzz.Variation variations, uint 
variations_length);
+               public void set_variations (HarfBuzz.Variation variations, uint variations_length);
                [Version (since = "0.9.2")]
-               public static void subtract_glyph_origin_for_direction (HarfBuzz.Font font, 
HarfBuzz.Codepoint glyph, HarfBuzz.Direction direction, out HarfBuzz.Position x, out HarfBuzz.Position y);
+               public void subtract_glyph_origin_for_direction (HarfBuzz.Codepoint glyph, HarfBuzz.Direction 
direction, out HarfBuzz.Position x, out HarfBuzz.Position y);
        }
        [CCode (cheader_filename = "hb-gobject.h", cname = "hb_font_funcs_t", copy_function = "g_boxed_copy", 
free_function = "g_boxed_free", type_id = "hb_gobject_font_funcs_get_type ()")]
        [Compact]
@@ -318,45 +318,45 @@ namespace HarfBuzz {
                [Version (since = "0.9.2")]
                public static HarfBuzz.FontFuncs get_empty ();
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool is_immutable (HarfBuzz.FontFuncs ffuncs);
+               public HarfBuzz.Bool is_immutable ();
                [Version (since = "0.9.2")]
-               public static void make_immutable (HarfBuzz.FontFuncs ffuncs);
+               public void make_immutable ();
                [Version (since = "1.1.2")]
-               public static void set_font_h_extents_func (HarfBuzz.FontFuncs ffuncs, owned 
HarfBuzz.FontGetFontHExtentsFunc func);
+               public void set_font_h_extents_func (owned HarfBuzz.FontGetFontHExtentsFunc func);
                [Version (since = "1.1.2")]
-               public static void set_font_v_extents_func (HarfBuzz.FontFuncs ffuncs, owned 
HarfBuzz.FontGetFontVExtentsFunc func);
+               public void set_font_v_extents_func (owned HarfBuzz.FontGetFontVExtentsFunc func);
                [Version (since = "0.9.2")]
-               public static void set_glyph_contour_point_func (HarfBuzz.FontFuncs ffuncs, owned 
HarfBuzz.FontGetGlyphContourFunc func);
+               public void set_glyph_contour_point_func (owned HarfBuzz.FontGetGlyphContourFunc func);
                [Version (since = "0.9.2")]
-               public static void set_glyph_extents_func (HarfBuzz.FontFuncs ffuncs, owned 
HarfBuzz.FontGetGlyphExtentsFunc func);
+               public void set_glyph_extents_func (owned HarfBuzz.FontGetGlyphExtentsFunc func);
                [Version (since = "0.9.2")]
-               public static void set_glyph_from_name_func (HarfBuzz.FontFuncs ffuncs, owned 
HarfBuzz.FontGetGlyphFromNameFunc func);
+               public void set_glyph_from_name_func (owned HarfBuzz.FontGetGlyphFromNameFunc func);
                [Version (deprecated = true, deprecated_since = "1.2.3", since = "0.9.2")]
-               public static void set_glyph_func (HarfBuzz.FontFuncs ffuncs, owned HarfBuzz.FontGetGlyphFunc 
func);
+               public void set_glyph_func (owned HarfBuzz.FontGetGlyphFunc func);
                [Version (since = "0.9.2")]
-               public static void set_glyph_h_advance_func (HarfBuzz.FontFuncs ffuncs, owned 
HarfBuzz.FontGetGlyphHAdvanceFunc func);
+               public void set_glyph_h_advance_func (owned HarfBuzz.FontGetGlyphHAdvanceFunc func);
                [Version (since = "1.8.6")]
-               public static void set_glyph_h_advances_func (HarfBuzz.FontFuncs ffuncs, owned 
HarfBuzz.FontGetGlyphHAdvancesFunc func);
+               public void set_glyph_h_advances_func (owned HarfBuzz.FontGetGlyphHAdvancesFunc func);
                [Version (since = "0.9.2")]
-               public static void set_glyph_h_kerning_func (HarfBuzz.FontFuncs ffuncs, owned 
HarfBuzz.FontGetGlyphHKerningFunc func);
+               public void set_glyph_h_kerning_func (owned HarfBuzz.FontGetGlyphHKerningFunc func);
                [Version (since = "0.9.2")]
-               public static void set_glyph_h_origin_func (HarfBuzz.FontFuncs ffuncs, owned 
HarfBuzz.FontGetGlyphHOriginFunc func);
+               public void set_glyph_h_origin_func (owned HarfBuzz.FontGetGlyphHOriginFunc func);
                [Version (since = "0.9.2")]
-               public static void set_glyph_name_func (HarfBuzz.FontFuncs ffuncs, owned 
HarfBuzz.FontGetGlyphNameFunc func);
+               public void set_glyph_name_func (owned HarfBuzz.FontGetGlyphNameFunc func);
                [Version (since = "0.9.2")]
-               public static void set_glyph_v_advance_func (HarfBuzz.FontFuncs ffuncs, owned 
HarfBuzz.FontGetGlyphVAdvanceFunc func);
+               public void set_glyph_v_advance_func (owned HarfBuzz.FontGetGlyphVAdvanceFunc func);
                [Version (since = "1.8.6")]
-               public static void set_glyph_v_advances_func (HarfBuzz.FontFuncs ffuncs, owned 
HarfBuzz.FontGetGlyphVAdvancesFunc func);
+               public void set_glyph_v_advances_func (owned HarfBuzz.FontGetGlyphVAdvancesFunc func);
                [Version (deprecated = true, deprecated_since = "2.0.0", since = "0.9.2")]
-               public static void set_glyph_v_kerning_func (HarfBuzz.FontFuncs ffuncs, owned 
HarfBuzz.FontGetGlyphVKerningFunc func);
+               public void set_glyph_v_kerning_func (owned HarfBuzz.FontGetGlyphVKerningFunc func);
                [Version (since = "0.9.2")]
-               public static void set_glyph_v_origin_func (HarfBuzz.FontFuncs ffuncs, owned 
HarfBuzz.FontGetGlyphVOriginFunc func);
+               public void set_glyph_v_origin_func (owned HarfBuzz.FontGetGlyphVOriginFunc func);
                [Version (since = "1.2.3")]
-               public static void set_nominal_glyph_func (HarfBuzz.FontFuncs ffuncs, owned 
HarfBuzz.FontGetNominalGlyphFunc func);
+               public void set_nominal_glyph_func (owned HarfBuzz.FontGetNominalGlyphFunc func);
                [Version (since = "2.0.0")]
-               public static void set_nominal_glyphs_func (HarfBuzz.FontFuncs ffuncs, owned 
HarfBuzz.FontGetNominalGlyphsFunc func);
+               public void set_nominal_glyphs_func (owned HarfBuzz.FontGetNominalGlyphsFunc func);
                [Version (since = "1.2.3")]
-               public static void set_variation_glyph_func (HarfBuzz.FontFuncs ffuncs, owned 
HarfBuzz.FontGetVariantGlyphFunc func);
+               public void set_variation_glyph_func (owned HarfBuzz.FontGetVariantGlyphFunc func);
        }
        [CCode (cheader_filename = "hb-gobject.h", cname = "hb_glyph_info_t", copy_function = "g_boxed_copy", 
free_function = "g_boxed_free", lower_case_cprefix = "hb_gobject_glyph_info_", type_id = 
"hb_gobject_glyph_info_get_type ()")]
        [Compact]
@@ -379,7 +379,7 @@ namespace HarfBuzz {
        [GIR (name = "language_t")]
        public class Language {
                [CCode (cname = "hb_language_to_string")]
-               [Version (since = "0.9.2")]
+               [Version (replacement = "language_to_string", since = "0.9.2")]
                public unowned string _string ();
                [Version (since = "0.9.2")]
                public static unowned HarfBuzz.Language from_string ([CCode (array_length_cname = "len", 
array_length_pos = 1.1)] uint8[] str);
@@ -393,25 +393,25 @@ namespace HarfBuzz {
        [GIR (name = "map_t")]
        public class Map {
                [Version (since = "1.7.7")]
-               public static HarfBuzz.Bool allocation_successful (HarfBuzz.Map map);
+               public HarfBuzz.Bool allocation_successful ();
                [Version (since = "1.7.7")]
-               public static void clear (HarfBuzz.Map map);
+               public void clear ();
                [Version (since = "1.7.7")]
                public static HarfBuzz.Map create ();
                [Version (since = "1.7.7")]
-               public static void del (HarfBuzz.Map map, HarfBuzz.Codepoint key);
+               public void del (HarfBuzz.Codepoint key);
                [Version (since = "1.7.7")]
-               public static HarfBuzz.Codepoint @get (HarfBuzz.Map map, HarfBuzz.Codepoint key);
+               public HarfBuzz.Codepoint @get (HarfBuzz.Codepoint key);
                [Version (since = "1.7.7")]
                public static HarfBuzz.Map get_empty ();
                [Version (since = "1.7.7")]
-               public static uint get_population (HarfBuzz.Map map);
+               public uint get_population ();
                [Version (since = "1.7.7")]
-               public static HarfBuzz.Bool has (HarfBuzz.Map map, HarfBuzz.Codepoint key);
+               public HarfBuzz.Bool has (HarfBuzz.Codepoint key);
                [Version (since = "1.7.7")]
-               public static HarfBuzz.Bool is_empty (HarfBuzz.Map map);
+               public HarfBuzz.Bool is_empty ();
                [Version (since = "1.7.7")]
-               public static void @set (HarfBuzz.Map map, HarfBuzz.Codepoint key, HarfBuzz.Codepoint value);
+               public void @set (HarfBuzz.Codepoint key, HarfBuzz.Codepoint value);
        }
        [CCode (cheader_filename = "hb-gobject.h", cname = "hb_ot_math_glyph_part_t", copy_function = 
"g_boxed_copy", free_function = "g_boxed_free", lower_case_cprefix = "hb_gobject_ot_math_glyph_part_", 
type_id = "hb_gobject_ot_math_glyph_part_get_type ()")]
        [Compact]
@@ -440,64 +440,64 @@ namespace HarfBuzz {
                public weak HarfBuzz.Language language;
                public HarfBuzz.Script script;
                [Version (since = "0.9.7")]
-               public static HarfBuzz.Bool equal (HarfBuzz.SegmentProperties a, HarfBuzz.SegmentProperties 
b);
+               public HarfBuzz.Bool equal (HarfBuzz.SegmentProperties b);
                [Version (since = "0.9.7")]
-               public static uint hash (HarfBuzz.SegmentProperties p);
+               public uint hash ();
        }
        [CCode (cheader_filename = "hb-gobject.h", cname = "hb_set_t", copy_function = "g_boxed_copy", 
free_function = "g_boxed_free", type_id = "hb_gobject_set_get_type ()")]
        [Compact]
        [GIR (name = "set_t")]
        public class Set {
                [Version (since = "0.9.2")]
-               public static void add (HarfBuzz.Set @set, HarfBuzz.Codepoint codepoint);
+               public void add (HarfBuzz.Codepoint codepoint);
                [Version (since = "0.9.7")]
-               public static void add_range (HarfBuzz.Set @set, HarfBuzz.Codepoint first, HarfBuzz.Codepoint 
last);
+               public void add_range (HarfBuzz.Codepoint first, HarfBuzz.Codepoint last);
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool allocation_successful (HarfBuzz.Set @set);
+               public HarfBuzz.Bool allocation_successful ();
                [Version (since = "0.9.2")]
-               public static void clear (HarfBuzz.Set @set);
+               public void clear ();
                [Version (since = "0.9.2")]
                public static HarfBuzz.Set create ();
                [Version (since = "0.9.2")]
-               public static void del (HarfBuzz.Set @set, HarfBuzz.Codepoint codepoint);
+               public void del (HarfBuzz.Codepoint codepoint);
                [Version (since = "0.9.7")]
-               public static void del_range (HarfBuzz.Set @set, HarfBuzz.Codepoint first, HarfBuzz.Codepoint 
last);
+               public void del_range (HarfBuzz.Codepoint first, HarfBuzz.Codepoint last);
                [Version (since = "0.9.2")]
                public static HarfBuzz.Set get_empty ();
                [Version (since = "0.9.7")]
-               public static HarfBuzz.Codepoint get_max (HarfBuzz.Set @set);
+               public HarfBuzz.Codepoint get_max ();
                [Version (since = "0.9.7")]
-               public static HarfBuzz.Codepoint get_min (HarfBuzz.Set @set);
+               public HarfBuzz.Codepoint get_min ();
                [Version (since = "0.9.7")]
-               public static uint get_population (HarfBuzz.Set @set);
+               public uint get_population ();
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool has (HarfBuzz.Set @set, HarfBuzz.Codepoint codepoint);
+               public HarfBuzz.Bool has (HarfBuzz.Codepoint codepoint);
                [Version (since = "0.9.2")]
-               public static void intersect (HarfBuzz.Set @set, HarfBuzz.Set other);
+               public void intersect (HarfBuzz.Set other);
                [Version (deprecated = true, deprecated_since = "1.6.1", since = "0.9.10")]
-               public static void invert (HarfBuzz.Set @set);
+               public void invert ();
                [Version (since = "0.9.7")]
-               public static HarfBuzz.Bool is_empty (HarfBuzz.Set @set);
+               public HarfBuzz.Bool is_empty ();
                [Version (since = "0.9.7")]
-               public static HarfBuzz.Bool is_equal (HarfBuzz.Set @set, HarfBuzz.Set other);
+               public HarfBuzz.Bool is_equal (HarfBuzz.Set other);
                [Version (since = "1.8.1")]
-               public static HarfBuzz.Bool is_subset (HarfBuzz.Set @set, HarfBuzz.Set larger_set);
+               public HarfBuzz.Bool is_subset (HarfBuzz.Set larger_set);
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool next (HarfBuzz.Set @set, ref HarfBuzz.Codepoint codepoint);
+               public HarfBuzz.Bool next (ref HarfBuzz.Codepoint codepoint);
                [Version (since = "0.9.7")]
-               public static HarfBuzz.Bool next_range (HarfBuzz.Set @set, out HarfBuzz.Codepoint first, ref 
HarfBuzz.Codepoint last);
+               public HarfBuzz.Bool next_range (out HarfBuzz.Codepoint first, ref HarfBuzz.Codepoint last);
                [Version (since = "1.8.0")]
-               public static HarfBuzz.Bool previous (HarfBuzz.Set @set, ref HarfBuzz.Codepoint codepoint);
+               public HarfBuzz.Bool previous (ref HarfBuzz.Codepoint codepoint);
                [Version (since = "1.8.0")]
-               public static HarfBuzz.Bool previous_range (HarfBuzz.Set @set, ref HarfBuzz.Codepoint first, 
out HarfBuzz.Codepoint last);
+               public HarfBuzz.Bool previous_range (ref HarfBuzz.Codepoint first, out HarfBuzz.Codepoint 
last);
                [Version (since = "0.9.2")]
-               public static void @set (HarfBuzz.Set @set, HarfBuzz.Set other);
+               public void @set (HarfBuzz.Set other);
                [Version (since = "0.9.2")]
-               public static void subtract (HarfBuzz.Set @set, HarfBuzz.Set other);
+               public void subtract (HarfBuzz.Set other);
                [Version (since = "0.9.2")]
-               public static void symmetric_difference (HarfBuzz.Set @set, HarfBuzz.Set other);
+               public void symmetric_difference (HarfBuzz.Set other);
                [Version (since = "0.9.2")]
-               public static void union (HarfBuzz.Set @set, HarfBuzz.Set other);
+               public void union (HarfBuzz.Set other);
        }
        [CCode (cheader_filename = "hb-gobject.h", cname = "hb_shape_plan_t", copy_function = "g_boxed_copy", 
free_function = "g_boxed_free", type_id = "hb_gobject_shape_plan_get_type ()")]
        [Compact]
@@ -512,11 +512,11 @@ namespace HarfBuzz {
                [Version (since = "1.4.0")]
                public static HarfBuzz.ShapePlan create_cached2 (HarfBuzz.Face face, 
HarfBuzz.SegmentProperties props, [CCode (array_length_cname = "num_user_features", array_length_pos = 3.5, 
array_length_type = "guint")] HarfBuzz.Feature[] user_features, [CCode (array_length_cname = "num_coords", 
array_length_pos = 4.5, array_length_type = "guint")] int[] coords, [CCode (array_length = false, 
array_null_terminated = true)] string[] shaper_list);
                [Version (since = "0.9.7")]
-               public static HarfBuzz.Bool execute (HarfBuzz.ShapePlan shape_plan, HarfBuzz.Font font, 
HarfBuzz.Buffer buffer, [CCode (array_length_cname = "num_features", array_length_pos = 4.1, 
array_length_type = "guint")] HarfBuzz.Feature[] features);
+               public HarfBuzz.Bool execute (HarfBuzz.Font font, HarfBuzz.Buffer buffer, [CCode 
(array_length_cname = "num_features", array_length_pos = 3.1, array_length_type = "guint")] 
HarfBuzz.Feature[] features);
                [Version (since = "0.9.7")]
                public static HarfBuzz.ShapePlan get_empty ();
                [Version (since = "0.9.7")]
-               public static unowned string get_shaper (HarfBuzz.ShapePlan shape_plan);
+               public unowned string get_shaper ();
        }
        [CCode (cheader_filename = "hb-gobject.h", cname = "hb_unicode_funcs_t", copy_function = 
"g_boxed_copy", free_function = "g_boxed_free", type_id = "hb_gobject_unicode_funcs_get_type ()")]
        [Compact]
@@ -524,56 +524,56 @@ namespace HarfBuzz {
        public class UnicodeFuncs {
                [CCode (cname = "hb_unicode_combining_class")]
                [Version (since = "0.9.2")]
-               public static HarfBuzz.UnicodeCombiningClass combining_class (HarfBuzz.UnicodeFuncs ufuncs, 
HarfBuzz.Codepoint unicode);
+               public HarfBuzz.UnicodeCombiningClass combining_class (HarfBuzz.Codepoint unicode);
                [CCode (cname = "hb_unicode_compose")]
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool compose (HarfBuzz.UnicodeFuncs ufuncs, HarfBuzz.Codepoint a, 
HarfBuzz.Codepoint b, out HarfBuzz.Codepoint ab);
+               public HarfBuzz.Bool compose (HarfBuzz.Codepoint a, HarfBuzz.Codepoint b, out 
HarfBuzz.Codepoint ab);
                [Version (since = "0.9.2")]
                public static HarfBuzz.UnicodeFuncs create (HarfBuzz.UnicodeFuncs? parent);
                [CCode (cname = "hb_unicode_decompose")]
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool decompose (HarfBuzz.UnicodeFuncs ufuncs, HarfBuzz.Codepoint ab, 
out HarfBuzz.Codepoint a, out HarfBuzz.Codepoint b);
+               public HarfBuzz.Bool decompose (HarfBuzz.Codepoint ab, out HarfBuzz.Codepoint a, out 
HarfBuzz.Codepoint b);
                [CCode (cname = "hb_unicode_decompose_compatibility")]
                [Version (deprecated = true, deprecated_since = "2.0.0", since = "0.9.2")]
-               public static uint decompose_compatibility (HarfBuzz.UnicodeFuncs ufuncs, HarfBuzz.Codepoint 
u, out HarfBuzz.Codepoint decomposed);
+               public uint decompose_compatibility (HarfBuzz.Codepoint u, out HarfBuzz.Codepoint decomposed);
                [CCode (cname = "hb_unicode_eastasian_width")]
                [Version (deprecated = true, deprecated_since = "2.0.0", since = "0.9.2")]
-               public static uint eastasian_width (HarfBuzz.UnicodeFuncs ufuncs, HarfBuzz.Codepoint unicode);
+               public uint eastasian_width (HarfBuzz.Codepoint unicode);
                [CCode (cname = "hb_unicode_general_category")]
                [Version (since = "0.9.2")]
-               public static HarfBuzz.UnicodeGeneralCategory general_category (HarfBuzz.UnicodeFuncs ufuncs, 
HarfBuzz.Codepoint unicode);
+               public HarfBuzz.UnicodeGeneralCategory general_category (HarfBuzz.Codepoint unicode);
                [Version (since = "0.9.2")]
                public static unowned HarfBuzz.UnicodeFuncs get_default ();
                [Version (since = "0.9.2")]
                public static HarfBuzz.UnicodeFuncs get_empty ();
                [Version (since = "0.9.2")]
-               public static HarfBuzz.UnicodeFuncs get_parent (HarfBuzz.UnicodeFuncs ufuncs);
+               public HarfBuzz.UnicodeFuncs get_parent ();
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Bool is_immutable (HarfBuzz.UnicodeFuncs ufuncs);
+               public HarfBuzz.Bool is_immutable ();
                [Version (since = "0.9.2")]
-               public static void make_immutable (HarfBuzz.UnicodeFuncs ufuncs);
+               public void make_immutable ();
                [CCode (cname = "hb_unicode_mirroring")]
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Codepoint mirroring (HarfBuzz.UnicodeFuncs ufuncs, HarfBuzz.Codepoint 
unicode);
+               public HarfBuzz.Codepoint mirroring (HarfBuzz.Codepoint unicode);
                [CCode (cname = "hb_unicode_script")]
                [Version (since = "0.9.2")]
-               public static HarfBuzz.Script script (HarfBuzz.UnicodeFuncs ufuncs, HarfBuzz.Codepoint 
unicode);
+               public HarfBuzz.Script script (HarfBuzz.Codepoint unicode);
                [Version (since = "0.9.2")]
-               public static void set_combining_class_func (HarfBuzz.UnicodeFuncs ufuncs, owned 
HarfBuzz.UnicodeCombiningClassFunc func);
+               public void set_combining_class_func (owned HarfBuzz.UnicodeCombiningClassFunc func);
                [Version (since = "0.9.2")]
-               public static void set_compose_func (HarfBuzz.UnicodeFuncs ufuncs, owned 
HarfBuzz.UnicodeComposeFunc func);
+               public void set_compose_func (owned HarfBuzz.UnicodeComposeFunc func);
                [Version (deprecated = true, deprecated_since = "2.0.0", since = "0.9.2")]
-               public static void set_decompose_compatibility_func (HarfBuzz.UnicodeFuncs ufuncs, owned 
HarfBuzz.UnicodedeComposeCompatibilityFunc func);
+               public void set_decompose_compatibility_func (owned 
HarfBuzz.UnicodedeComposeCompatibilityFunc func);
                [Version (since = "0.9.2")]
-               public static void set_decompose_func (HarfBuzz.UnicodeFuncs ufuncs, owned 
HarfBuzz.UnicodeDecomposeFunc func);
+               public void set_decompose_func (owned HarfBuzz.UnicodeDecomposeFunc func);
                [Version (deprecated = true, deprecated_since = "2.0.0", since = "0.9.2")]
-               public static void set_eastasian_width_func (HarfBuzz.UnicodeFuncs ufuncs, owned 
HarfBuzz.UnicodeEastasianWidthFunc func);
+               public void set_eastasian_width_func (owned HarfBuzz.UnicodeEastasianWidthFunc func);
                [Version (since = "0.9.2")]
-               public static void set_general_category_func (HarfBuzz.UnicodeFuncs ufuncs, owned 
HarfBuzz.UnicodeGeneralCategoryFunc func);
+               public void set_general_category_func (owned HarfBuzz.UnicodeGeneralCategoryFunc func);
                [Version (since = "0.9.2")]
-               public static void set_mirroring_func (HarfBuzz.UnicodeFuncs ufuncs, owned 
HarfBuzz.UnicodeMirroringFunc func);
+               public void set_mirroring_func (owned HarfBuzz.UnicodeMirroringFunc func);
                [Version (since = "0.9.2")]
-               public static void set_script_func (HarfBuzz.UnicodeFuncs ufuncs, owned 
HarfBuzz.UnicodeScriptFunc func);
+               public void set_script_func (owned HarfBuzz.UnicodeScriptFunc func);
        }
        [CCode (cheader_filename = "hb-gobject.h", cname = "hb_user_data_key_t", copy_function = 
"g_boxed_copy", free_function = "g_boxed_free", lower_case_cprefix = "hb_gobject_user_data_key_", type_id = 
"hb_gobject_user_data_key_get_type ()")]
        [Compact]
@@ -685,6 +685,7 @@ namespace HarfBuzz {
                public HarfBuzz.Tag tag;
                public float value;
                [CCode (cname = "hb_variation_to_string")]
+               [Version (replacement = "variation_to_string", since = "1.4.2")]
                public void _string (string buf, uint size);
                public static HarfBuzz.Bool from_string (string str, int len, HarfBuzz.Variation variation);
                public void to_string (string buf, uint size);
diff --git a/vapi/json-glib-1.0.vapi b/vapi/json-glib-1.0.vapi
index 193688040..b4515b890 100644
--- a/vapi/json-glib-1.0.vapi
+++ b/vapi/json-glib-1.0.vapi
@@ -453,6 +453,15 @@ namespace Json {
        [Version (since = "0.14")]
        public static string gvariant_serialize_data (GLib.Variant variant, out size_t length);
        [CCode (cheader_filename = "json-glib/json-glib.h")]
+       [Version (replacement = "ParserError.quark")]
+       public static GLib.Quark parser_error_quark ();
+       [CCode (cheader_filename = "json-glib/json-glib.h")]
+       [Version (replacement = "PathError.quark")]
+       public static GLib.Quark path_error_quark ();
+       [CCode (cheader_filename = "json-glib/json-glib.h")]
+       [Version (replacement = "ReaderError.quark")]
+       public static GLib.Quark reader_error_quark ();
+       [CCode (cheader_filename = "json-glib/json-glib.h")]
        [Version (deprecated = true, deprecated_since = "0.10", replacement = "Json.gobject_to_data")]
        public static string serialize_gobject (GLib.Object gobject, out size_t length);
        [CCode (cheader_filename = "json-glib/json-glib.h")]
diff --git a/vapi/libgeoclue-2.0.vapi b/vapi/libgeoclue-2.0.vapi
index 38e95f19e..e6ebba290 100644
--- a/vapi/libgeoclue-2.0.vapi
+++ b/vapi/libgeoclue-2.0.vapi
@@ -167,15 +167,21 @@ namespace GClue {
                AUTO_DELETE
        }
        [CCode (cheader_filename = "geoclue.h")]
+       [Version (replacement = "Client.interface_info")]
        public static unowned GLib.DBusInterfaceInfo client_interface_info ();
        [CCode (cheader_filename = "geoclue.h")]
+       [Version (replacement = "Client.override_properties")]
        public static uint client_override_properties (GLib.ObjectClass klass, uint property_id_begin);
        [CCode (cheader_filename = "geoclue.h")]
+       [Version (replacement = "Location.interface_info")]
        public static unowned GLib.DBusInterfaceInfo location_interface_info ();
        [CCode (cheader_filename = "geoclue.h")]
+       [Version (replacement = "Location.override_properties")]
        public static uint location_override_properties (GLib.ObjectClass klass, uint property_id_begin);
        [CCode (cheader_filename = "geoclue.h")]
+       [Version (replacement = "Manager.interface_info")]
        public static unowned GLib.DBusInterfaceInfo manager_interface_info ();
        [CCode (cheader_filename = "geoclue.h")]
+       [Version (replacement = "Manager.override_properties")]
        public static uint manager_override_properties (GLib.ObjectClass klass, uint property_id_begin);
 }
diff --git a/vapi/libpeas-1.0.vapi b/vapi/libpeas-1.0.vapi
index 75f659813..75c5731de 100644
--- a/vapi/libpeas-1.0.vapi
+++ b/vapi/libpeas-1.0.vapi
@@ -95,6 +95,7 @@ namespace Peas {
        [CCode (cheader_filename = "libpeas/peas.h", copy_function = "g_boxed_copy", free_function = 
"g_boxed_free", type_id = "peas_plugin_info_get_type ()")]
        [Compact]
        public class PluginInfo {
+               public static GLib.Quark error_quark ();
                [CCode (array_length = false, array_null_terminated = true)]
                public unowned string[] get_authors ();
                public unowned string get_copyright ();
@@ -133,6 +134,7 @@ namespace Peas {
                LOADER_NOT_FOUND,
                DEP_NOT_FOUND,
                DEP_LOADING_FAILED;
+               [Version (replacement = "PluginInfo.error_quark")]
                public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "libpeas/peas.h", instance_pos = 3.9)]
diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi
index cf67516d2..49bcac2bc 100644
--- a/vapi/libsoup-2.4.vapi
+++ b/vapi/libsoup-2.4.vapi
@@ -31,7 +31,8 @@ namespace Soup {
                [GIR (name = "XMLRPCError")]
                public errordomain Error {
                        ARGUMENTS,
-                       RETVAL
+                       RETVAL;
+                       public static GLib.Quark quark ();
                }
                [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_XMLRPC_FAULT_")]
                [GIR (name = "XMLRPCFault")]
@@ -45,7 +46,8 @@ namespace Soup {
                        SERVER_ERROR_INTERNAL_XML_RPC_ERROR,
                        APPLICATION_ERROR,
                        SYSTEM_ERROR,
-                       TRANSPORT_ERROR
+                       TRANSPORT_ERROR;
+                       public static GLib.Quark quark ();
                }
                [CCode (cheader_filename = "libsoup/soup.h")]
                [PrintfFormat]
@@ -63,6 +65,7 @@ namespace Soup {
                [Version (since = "2.52")]
                public static string build_response (GLib.Variant value) throws GLib.Error;
                [CCode (cheader_filename = "libsoup/soup.h")]
+               [Version (replacement = "XMLRPCError.quark")]
                public static GLib.Quark error_quark ();
                [CCode (cheader_filename = "libsoup/soup.h", sentinel = "G_TYPE_INVALID")]
                [Version (deprecated = true)]
@@ -71,6 +74,7 @@ namespace Soup {
                [Version (deprecated = true)]
                public static bool extract_method_response (string method_response, int length, ...) throws 
Soup.XMLRPC.Fault;
                [CCode (cheader_filename = "libsoup/soup.h")]
+               [Version (replacement = "XMLRPCFault.quark")]
                public static GLib.Quark fault_quark ();
                [CCode (cheader_filename = "libsoup/soup.h")]
                [Version (since = "2.52")]
@@ -1303,7 +1307,7 @@ namespace Soup {
        }
        [CCode (cheader_filename = "libsoup/soup.h", has_type_id = false)]
        public struct MessageHeadersIter {
-               public static void init (out Soup.MessageHeadersIter iter, Soup.MessageHeaders hdrs);
+               public void init (Soup.MessageHeaders hdrs);
                public static bool next (ref Soup.MessageHeadersIter iter, out unowned string name, out 
unowned string value);
        }
        [CCode (cheader_filename = "libsoup/soup.h", has_type_id = false)]
@@ -1970,6 +1974,9 @@ namespace Soup {
        [Version (since = "2.42")]
        public static bool check_version (uint major, uint minor, uint micro);
        [CCode (cheader_filename = "libsoup/soup.h")]
+       [Version (replacement = "Cookie.parse", since = "2.24")]
+       public static Soup.Cookie? cookie_parse (string header, Soup.URI origin);
+       [CCode (cheader_filename = "libsoup/soup.h")]
        [Version (since = "2.24")]
        public static GLib.SList<Soup.Cookie> cookies_from_request (Soup.Message msg);
        [CCode (cheader_filename = "libsoup/soup.h")]
@@ -2032,6 +2039,21 @@ namespace Soup {
        [CCode (cheader_filename = "libsoup/soup.h")]
        public static GLib.Quark http_error_quark ();
        [CCode (cheader_filename = "libsoup/soup.h")]
+       [Version (replacement = "MessageHeadersIter.init")]
+       public static void message_headers_iter_init (out Soup.MessageHeadersIter iter, Soup.MessageHeaders 
hdrs);
+       [CCode (cheader_filename = "libsoup/soup.h")]
+       [Version (replacement = "RequestError.quark")]
+       public static GLib.Quark request_error_quark ();
+       [CCode (cheader_filename = "libsoup/soup.h")]
+       [Version (replacement = "RequesterError.quark")]
+       public static GLib.Quark requester_error_quark ();
+       [CCode (cheader_filename = "libsoup/soup.h")]
+       [Version (replacement = "Status.get_phrase")]
+       public static unowned string status_get_phrase (uint status_code);
+       [CCode (cheader_filename = "libsoup/soup.h")]
+       [Version (replacement = "Status.proxify", since = "2.26")]
+       public static uint status_proxify (uint status_code);
+       [CCode (cheader_filename = "libsoup/soup.h")]
        public static bool str_case_equal (void* v1, void* v2);
        [CCode (cheader_filename = "libsoup/soup.h")]
        public static uint str_case_hash (void* key);
@@ -2039,9 +2061,21 @@ namespace Soup {
        [Version (since = "2.40")]
        public static bool tld_domain_is_public_suffix (string domain);
        [CCode (cheader_filename = "libsoup/soup.h")]
+       [Version (replacement = "TLDError.quark")]
+       public static GLib.Quark tld_error_quark ();
+       [CCode (cheader_filename = "libsoup/soup.h")]
        [Version (since = "2.40")]
        public static unowned string tld_get_base_domain (string hostname) throws GLib.Error;
        [CCode (cheader_filename = "libsoup/soup.h")]
+       [Version (replacement = "URI.decode")]
+       public static string uri_decode (string part);
+       [CCode (cheader_filename = "libsoup/soup.h")]
+       [Version (replacement = "URI.encode")]
+       public static string uri_encode (string part, string? escape_extra);
+       [CCode (cheader_filename = "libsoup/soup.h")]
+       [Version (replacement = "URI.normalize")]
+       public static string uri_normalize (string part, string? unescape_extra);
+       [CCode (cheader_filename = "libsoup/soup.h")]
        [Version (deprecated = true)]
        public static void value_array_append (GLib.ValueArray array, GLib.Type type, ...);
        [CCode (cheader_filename = "libsoup/soup.h")]
@@ -2099,6 +2133,9 @@ namespace Soup {
        [Version (since = "2.68")]
        public static bool websocket_client_verify_handshake_with_extensions (Soup.Message msg, 
GLib.GenericArray<GLib.TypeClass>? supported_extensions, out GLib.List<Soup.WebsocketExtension> 
accepted_extensions) throws GLib.Error;
        [CCode (cheader_filename = "libsoup/soup.h")]
+       [Version (replacement = "WebsocketError.get_quark")]
+       public static GLib.Quark websocket_error_get_quark ();
+       [CCode (cheader_filename = "libsoup/soup.h")]
        [Version (since = "2.50")]
        public static bool websocket_server_check_handshake (Soup.Message msg, string? origin, [CCode 
(array_length = false, array_null_terminated = true)] string[]? protocols) throws GLib.Error;
        [CCode (cheader_filename = "libsoup/soup.h")]
diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata
index 2a56f3e5e..637c5dc55 100644
--- a/vapi/metadata/Gio-2.0.metadata
+++ b/vapi/metadata/Gio-2.0.metadata
@@ -48,7 +48,6 @@ bus_watch_name_with_closures name="watch_name"
   .name_vanished_closure type="owned GLib.BusNameVanishedCallback?" default=null
 
 dbus_* parent="GLib.DBus" name="dbus_(.*)"
-dbus_error_* parent="GLib.DBusError" name="dbus_error_(.*)"
 dbus_address_get_for_bus_sync parent="GLib.BusType" name="get_address_sync"
 
 *_settings_backend_new parent="GLib.SettingsBackend" cheader_filename="gio/gsettingsbackend.h" 
feature_test_macro="G_SETTINGS_ENABLE_BACKEND"
diff --git a/vapi/metadata/GstNet-1.0.metadata b/vapi/metadata/GstNet-1.0.metadata
index f3136822b..d207fc84c 100644
--- a/vapi/metadata/GstNet-1.0.metadata
+++ b/vapi/metadata/GstNet-1.0.metadata
@@ -3,4 +3,3 @@ Net* name="Net(.+)"
 net_* name="net_(.+)"
 
 NET_TIME_PACKET_SIZE parent="Gst.Net.TimePacket" name="SIZE"
-net_time_packet_* parent="Gst.Net.TimePacket" name="net_time_packet_(.+)"
diff --git a/vapi/metadata/GstRtp-1.0.metadata b/vapi/metadata/GstRtp-1.0.metadata
index dc6e37c4c..6974b352a 100644
--- a/vapi/metadata/GstRtp-1.0.metadata
+++ b/vapi/metadata/GstRtp-1.0.metadata
@@ -5,8 +5,8 @@ rtp_* name="rtp_(.+)"
 
 RTP_PAYLOAD_* parent="Gst.RTP.Payload" name="RTP_PAYLOAD_(.+)"
 
-rtp_buffer_* parent="Gst.RTP.Buffer" name="rtp_buffer_(.+)"
-buffer_*_rtp_source_meta parent="Gst.RTP.Buffer" name="buffer_(.+)"
+//rtp_buffer_* parent="Gst.RTP.Buffer" name="rtp_buffer_(.+)"
+//buffer_*_rtp_source_meta parent="Gst.RTP.Buffer" name="buffer_(.+)"
 RTPBuffer
   .map unowned=false
 RTPHeaderExtension
@@ -19,9 +19,10 @@ RTCP* parent="Gst.RTCP" name="RTCP(.+)"
 RTCP_* parent="Gst.RTCP" name="RTCP_(.+)"
 rtcp_* parent="Gst.RTCP" name="rtcp_(.+)"
 
-rtcp_buffer_* parent="Gst.RTCP.Buffer" name="rtcp_buffer_(.+)"
-rtcp_buffer_new_take_data.data owned
-rtcp_buffer_map.rtcp out
+//rtcp_buffer_* parent="Gst.RTCP.Buffer" name="rtcp_buffer_(.+)"
+RTCPBuffer
+  .new_take_data.data owned
+  .map.rtcp out
 
 RTCPPacket
   .rtcp nullable
diff --git a/vapi/packagekit-glib2.vapi b/vapi/packagekit-glib2.vapi
index a82de9033..c55a3ab4a 100644
--- a/vapi/packagekit-glib2.vapi
+++ b/vapi/packagekit-glib2.vapi
@@ -1396,9 +1396,15 @@ namespace Pk {
                SKIP_TRANSACTION,
                REPAIR_REQUIRED,
                LAST;
+               [CCode (cname = "pk_exit_enum_from_string")]
                [Version (since = "0.5.0")]
-               public static Pk.Exit enum_from_string (string exit);
+               public static Pk.Exit from_string (string exit);
+               [CCode (cname = "pk_exit_enum_to_string")]
                [Version (since = "0.5.0")]
+               public unowned string to_string ();
+               [Version (replacement = "ExitEnum.from_string", since = "0.5.0")]
+               public static Pk.Exit enum_from_string (string exit);
+               [Version (replacement = "ExitEnum.to_string", since = "0.5.0")]
                public unowned string enum_to_string ();
        }
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkFilterEnum", cprefix = 
"PK_FILTER_ENUM_", type_id = "pk_filter_enum_get_type ()")]
@@ -1433,13 +1439,19 @@ namespace Pk {
                DOWNLOADED,
                NOT_DOWNLOADED,
                LAST;
+               [CCode (cname = "pk_filter_enum_from_string")]
+               [Version (since = "0.5.0")]
+               public static Pk.Filter from_string (string filter);
+               [CCode (cname = "pk_filter_enum_to_string")]
+               [Version (since = "0.5.0")]
+               public unowned string to_string ();
                [Version (since = "0.5.2")]
                public static Pk.Bitfield bitfield_from_string (string filters);
                [Version (since = "0.5.2")]
                public static string bitfield_to_string (Pk.Bitfield filters);
-               [Version (since = "0.5.0")]
+               [Version (replacement = "FilterEnum.from_string", since = "0.5.0")]
                public static Pk.Filter enum_from_string (string filter);
-               [Version (since = "0.5.0")]
+               [Version (replacement = "FilterEnum.to_string", since = "0.5.0")]
                public unowned string enum_to_string ();
        }
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkGroupEnum", cprefix = 
"PK_GROUP_ENUM_", type_id = "pk_group_enum_get_type ()")]
@@ -1481,13 +1493,19 @@ namespace Pk {
                VENDOR,
                NEWEST,
                LAST;
+               [CCode (cname = "pk_group_enum_from_string")]
+               [Version (since = "0.5.0")]
+               public static Pk.Group from_string (string group);
+               [CCode (cname = "pk_group_enum_to_string")]
+               [Version (since = "0.5.0")]
+               public unowned string to_string ();
                [Version (since = "0.5.2")]
                public static Pk.Bitfield bitfield_from_string (string groups);
                [Version (since = "0.5.2")]
                public static string bitfield_to_string (Pk.Bitfield groups);
-               [Version (since = "0.5.0")]
+               [Version (replacement = "GroupEnum.from_string", since = "0.5.0")]
                public static Pk.Group enum_from_string (string group);
-               [Version (since = "0.5.0")]
+               [Version (replacement = "GroupEnum.to_string", since = "0.5.0")]
                public unowned string enum_to_string ();
        }
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkInfoEnum", cprefix = 
"PK_INFO_ENUM_", type_id = "pk_info_enum_get_type ()")]
@@ -1520,13 +1538,25 @@ namespace Pk {
                TRUSTED,
                UNAVAILABLE,
                LAST;
+               [CCode (cname = "pk_info_enum_from_string")]
                [Version (since = "0.5.0")]
-               public static Pk.Info enum_from_string (string info);
+               public static Pk.Info from_string (string info);
+               [CCode (cname = "pk_info_enum_to_localised_past")]
                [Version (since = "0.7.2")]
-               public unowned string enum_to_localised_past ();
+               public unowned string to_localised_past ();
+               [CCode (cname = "pk_info_enum_to_localised_present")]
                [Version (since = "0.7.2")]
-               public unowned string enum_to_localised_present ();
+               public unowned string to_localised_present ();
+               [CCode (cname = "pk_info_enum_to_string")]
                [Version (since = "0.5.0")]
+               public unowned string to_string ();
+               [Version (replacement = "InfoEnum.from_string", since = "0.5.0")]
+               public static Pk.Info enum_from_string (string info);
+               [Version (replacement = "InfoEnum.to_localised_past", since = "0.7.2")]
+               public unowned string enum_to_localised_past ();
+               [Version (replacement = "InfoEnum.to_localised_present", since = "0.7.2")]
+               public unowned string enum_to_localised_present ();
+               [Version (replacement = "InfoEnum.to_string", since = "0.5.0")]
                public unowned string enum_to_string ();
        }
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkMediaTypeEnum", cprefix = 
"PK_MEDIA_TYPE_ENUM_", type_id = "pk_media_type_enum_get_type ()")]
@@ -1537,9 +1567,15 @@ namespace Pk {
                DVD,
                DISC,
                LAST;
+               [CCode (cname = "pk_media_type_enum_from_string")]
                [Version (since = "0.5.0")]
-               public static Pk.MediaType enum_from_string (string media_type);
+               public static Pk.MediaType from_string (string media_type);
+               [CCode (cname = "pk_media_type_enum_to_string")]
                [Version (since = "0.5.0")]
+               public unowned string to_string ();
+               [Version (replacement = "MediaTypeEnum.from_string", since = "0.5.0")]
+               public static Pk.MediaType enum_from_string (string media_type);
+               [Version (replacement = "MediaTypeEnum.to_string", since = "0.5.0")]
                public unowned string enum_to_string ();
        }
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkNetworkEnum", cprefix = 
"PK_NETWORK_ENUM_", type_id = "pk_network_enum_get_type ()")]
@@ -1552,9 +1588,15 @@ namespace Pk {
                WIFI,
                MOBILE,
                LAST;
+               [CCode (cname = "pk_network_enum_from_string")]
                [Version (since = "0.5.0")]
-               public static Pk.Network enum_from_string (string network);
+               public static Pk.Network from_string (string network);
+               [CCode (cname = "pk_network_enum_to_string")]
                [Version (since = "0.5.0")]
+               public unowned string to_string ();
+               [Version (replacement = "NetworkEnum.from_string", since = "0.5.0")]
+               public static Pk.Network enum_from_string (string network);
+               [Version (replacement = "NetworkEnum.to_string", since = "0.5.0")]
                public unowned string enum_to_string ();
        }
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_OFFLINE_ACTION_", type_id = 
"pk_offline_action_get_type ()")]
@@ -1606,9 +1648,15 @@ namespace Pk {
                SECURITY_SESSION,
                SECURITY_SYSTEM,
                LAST;
+               [CCode (cname = "pk_restart_enum_from_string")]
                [Version (since = "0.5.0")]
-               public static Pk.Restart enum_from_string (string restart);
+               public static Pk.Restart from_string (string restart);
+               [CCode (cname = "pk_restart_enum_to_string")]
                [Version (since = "0.5.0")]
+               public unowned string to_string ();
+               [Version (replacement = "RestartEnum.from_string", since = "0.5.0")]
+               public static Pk.Restart enum_from_string (string restart);
+               [Version (replacement = "RestartEnum.to_string", since = "0.5.0")]
                public unowned string enum_to_string ();
        }
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkRoleEnum", cprefix = 
"PK_ROLE_ENUM_", type_id = "pk_role_enum_get_type ()")]
@@ -1649,15 +1697,24 @@ namespace Pk {
                REPO_REMOVE,
                UPGRADE_SYSTEM,
                LAST;
+               [CCode (cname = "pk_role_enum_from_string")]
+               [Version (since = "0.5.0")]
+               public static Pk.Role from_string (string role);
+               [CCode (cname = "pk_role_enum_to_localised_present")]
+               [Version (since = "0.7.2")]
+               public unowned string to_localised_present ();
+               [CCode (cname = "pk_role_enum_to_string")]
+               [Version (since = "0.5.0")]
+               public unowned string to_string ();
                [Version (since = "0.5.2")]
                public static Pk.Bitfield bitfield_from_string (string roles);
                [Version (since = "0.5.2")]
                public static string bitfield_to_string (Pk.Bitfield roles);
-               [Version (since = "0.5.0")]
+               [Version (replacement = "RoleEnum.from_string", since = "0.5.0")]
                public static Pk.Role enum_from_string (string role);
-               [Version (since = "0.7.2")]
+               [Version (replacement = "RoleEnum.to_localised_present", since = "0.7.2")]
                public unowned string enum_to_localised_present ();
-               [Version (since = "0.5.0")]
+               [Version (replacement = "RoleEnum.to_string", since = "0.5.0")]
                public unowned string enum_to_string ();
        }
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkSigTypeEnum", cprefix = 
"PK_SIGTYPE_ENUM_", type_id = "pk_sig_type_enum_get_type ()")]
@@ -1666,8 +1723,14 @@ namespace Pk {
                UNKNOWN,
                GPG,
                LAST;
-               public static Pk.SigType enum_from_string (string sig_type);
+               [CCode (cname = "pk_sig_type_enum_from_string")]
+               public static Pk.SigType from_string (string sig_type);
+               [CCode (cname = "pk_sig_type_enum_to_string")]
                [Version (since = "0.5.0")]
+               public unowned string to_string ();
+               [Version (replacement = "SigTypeEnum.from_string")]
+               public static Pk.SigType enum_from_string (string sig_type);
+               [Version (replacement = "SigTypeEnum.to_string", since = "0.5.0")]
                public unowned string enum_to_string ();
        }
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkStatusEnum", cprefix = 
"PK_STATUS_ENUM_", type_id = "pk_status_enum_get_type ()")]
@@ -1711,10 +1774,19 @@ namespace Pk {
                COPY_FILES,
                RUN_HOOK,
                LAST;
+               [CCode (cname = "pk_status_enum_from_string")]
                [Version (since = "0.5.0")]
+               public static Pk.Status from_string (string status);
+               [CCode (cname = "pk_status_enum_to_localised_text")]
+               public unowned string to_localised_text ();
+               [CCode (cname = "pk_status_enum_to_string")]
+               [Version (since = "0.5.0")]
+               public unowned string to_string ();
+               [Version (replacement = "StatusEnum.from_string", since = "0.5.0")]
                public static Pk.Status enum_from_string (string status);
+               [Version (replacement = "StatusEnum.to_localised_text")]
                public unowned string enum_to_localised_text ();
-               [Version (since = "0.5.0")]
+               [Version (replacement = "StatusEnum.to_string", since = "0.5.0")]
                public unowned string enum_to_string ();
        }
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkTransactionFlagEnum", cprefix 
= "PK_TRANSACTION_FLAG_ENUM_", type_id = "pk_transaction_flag_enum_get_type ()")]
@@ -1728,13 +1800,19 @@ namespace Pk {
                JUST_REINSTALL,
                ALLOW_DOWNGRADE,
                LAST;
+               [CCode (cname = "pk_transaction_flag_enum_from_string")]
+               [Version (since = "0.8.1")]
+               public static Pk.TransactionFlag from_string (string transaction_flag);
+               [CCode (cname = "pk_transaction_flag_enum_to_string")]
+               [Version (since = "0.8.1")]
+               public unowned string to_string ();
                [Version (since = "0.8.1")]
                public static Pk.Bitfield bitfield_from_string (string transaction_flags);
                [Version (since = "0.8.1")]
                public static string bitfield_to_string (Pk.Bitfield transaction_flags);
-               [Version (since = "0.8.1")]
+               [Version (replacement = "TransactionFlagEnum.from_string", since = "0.8.1")]
                public static Pk.TransactionFlag enum_from_string (string transaction_flag);
-               [Version (since = "0.8.1")]
+               [Version (replacement = "TransactionFlagEnum.to_string", since = "0.8.1")]
                public unowned string enum_to_string ();
        }
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkUpdateStateEnum", cprefix = 
"PK_UPDATE_STATE_ENUM_", type_id = "pk_update_state_enum_get_type ()")]
@@ -1745,9 +1823,15 @@ namespace Pk {
                UNSTABLE,
                TESTING,
                LAST;
+               [CCode (cname = "pk_update_state_enum_from_string")]
                [Version (since = "0.5.0")]
-               public static Pk.UpdateState enum_from_string (string update_state);
+               public static Pk.UpdateState from_string (string update_state);
+               [CCode (cname = "pk_update_state_enum_to_string")]
                [Version (since = "0.5.0")]
+               public unowned string to_string ();
+               [Version (replacement = "UpdateStateEnum.from_string", since = "0.5.0")]
+               public static Pk.UpdateState enum_from_string (string update_state);
+               [Version (replacement = "UpdateStateEnum.to_string", since = "0.5.0")]
                public unowned string enum_to_string ();
        }
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = "PkUpgradeKindEnum", cprefix = 
"PK_UPGRADE_KIND_ENUM_", type_id = "pk_upgrade_kind_enum_get_type ()")]
@@ -1758,9 +1842,15 @@ namespace Pk {
                DEFAULT,
                COMPLETE,
                LAST;
+               [CCode (cname = "pk_upgrade_kind_enum_from_string")]
                [Version (since = "0.6.11")]
-               public static Pk.UpgradeKind enum_from_string (string upgrade_kind);
+               public static Pk.UpgradeKind from_string (string upgrade_kind);
+               [CCode (cname = "pk_upgrade_kind_enum_to_string")]
                [Version (since = "0.6.11")]
+               public unowned string to_string ();
+               [Version (replacement = "UpgradeKindEnum.from_string", since = "0.6.11")]
+               public static Pk.UpgradeKind enum_from_string (string upgrade_kind);
+               [Version (replacement = "UpgradeKindEnum.to_string", since = "0.6.11")]
                public unowned string enum_to_string ();
        }
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_CLIENT_ERROR_")]
@@ -1835,16 +1925,34 @@ namespace Pk {
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h", cname = 
"PK_SYSTEM_PACKAGE_LIST_FILENAME")]
        public const string SYSTEM_PACKAGE_LIST_FILENAME;
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+       [Version (replacement = "ClientError.quark", since = "0.5.2")]
+       public static GLib.Quark client_error_quark ();
+       [CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+       [Version (replacement = "ControlError.quark", since = "0.5.2")]
+       public static GLib.Quark control_error_quark ();
+       [CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
        public static void debug_add_log_domain (string log_domain);
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
        public static bool debug_is_verbose ();
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
        public static void debug_set_verbose (bool verbose);
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+       [Version (replacement = "DistroUpgradeEnum.from_string", since = "0.5.0")]
+       public static Pk.DistroUpgradeEnum distro_upgrade_enum_from_string (string upgrade);
+       [CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+       [Version (replacement = "DistroUpgradeEnum.to_string", since = "0.5.0")]
+       public static unowned string distro_upgrade_enum_to_string (Pk.DistroUpgradeEnum upgrade);
+       [CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
        public static unowned string enum_find_string (Pk.EnumMatch table, uint value);
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
        public static uint enum_find_value (Pk.EnumMatch table, string string);
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+       [Version (replacement = "ErrorEnum.from_string", since = "0.5.0")]
+       public static Pk.ErrorEnum error_enum_from_string (string code);
+       [CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+       [Version (replacement = "ErrorEnum.to_string", since = "0.5.0")]
+       public static unowned string error_enum_to_string (Pk.ErrorEnum code);
+       [CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
        public static string get_distro_id ();
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
        [Version (since = "0.5.2")]
@@ -1853,6 +1961,12 @@ namespace Pk {
        [Version (since = "0.5.2")]
        public static string iso8601_present ();
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+       [Version (replacement = "OfflineAction.from_string", since = "0.9.6")]
+       public static Pk.OfflineAction offline_action_from_string (string action);
+       [CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+       [Version (replacement = "OfflineAction.to_string", since = "0.9.6")]
+       public static unowned string offline_action_to_string (Pk.OfflineAction action);
+       [CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
        public static bool offline_auth_cancel () throws GLib.Error;
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
        public static bool offline_auth_clear_results () throws GLib.Error;
@@ -1877,6 +1991,9 @@ namespace Pk {
        [Version (since = "0.9.6")]
        public static bool offline_clear_results (GLib.Cancellable? cancellable = null) throws GLib.Error;
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
+       [Version (replacement = "OfflineError.quark", since = "0.9.6")]
+       public static GLib.Quark offline_error_quark ();
+       [CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
        [Version (since = "0.9.6")]
        public static Pk.OfflineAction offline_get_action () throws GLib.Error;
        [CCode (cheader_filename = "packagekit-glib2/packagekit.h")]
diff --git a/vapi/pango.vapi b/vapi/pango.vapi
index a9858192e..2d9b286f2 100644
--- a/vapi/pango.vapi
+++ b/vapi/pango.vapi
@@ -51,6 +51,7 @@ namespace Pango {
                public weak string features;
                [CCode (has_construct_function = false, type = "PangoAttribute*")]
                public AttrFontFeatures (string features);
+               public static Pango.Attribute @new (string features);
        }
        [CCode (cheader_filename = "pango/pango.h", has_type_id = false)]
        [Compact]
@@ -76,6 +77,7 @@ namespace Pango {
                public weak Pango.Language value;
                [CCode (has_construct_function = false, type = "PangoAttribute*")]
                public AttrLanguage (Pango.Language language);
+               public static Pango.Attribute @new (Pango.Language language);
        }
        [CCode (cheader_filename = "pango/pango.h", ref_function = "pango_attr_list_ref", type_id = 
"pango_attr_list_get_type ()", unref_function = "pango_attr_list_unref")]
        [Compact]
@@ -110,6 +112,9 @@ namespace Pango {
                public Pango.Rectangle logical_rect;
                [CCode (has_construct_function = false, type = "PangoAttribute*")]
                public AttrShape (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect);
+               public static Pango.Attribute @new (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect);
+               [Version (since = "1.8")]
+               public static Pango.Attribute new_with_data (Pango.Rectangle ink_rect, Pango.Rectangle 
logical_rect, void* data, [CCode (destroy_notify_pos = 4.1)] owned Pango.AttrDataCopyFunc? copy_func);
                [CCode (has_construct_function = false, simple_generics = true, type = "PangoAttribute*")]
                [Version (since = "1.8")]
                public AttrShape.with_data (Pango.Rectangle ink_rect, Pango.Rectangle logical_rect, owned T 
data, Pango.AttrDataCopyFunc<T> copy_func);
@@ -121,6 +126,9 @@ namespace Pango {
                public int size;
                [CCode (has_construct_function = false, type = "PangoAttribute*")]
                public AttrSize (int size);
+               public static Pango.Attribute @new (int size);
+               [Version (since = "1.8")]
+               public static Pango.Attribute new_absolute (int size);
                [CCode (cname = "pango_attr_size_new_absolute", has_construct_function = false, type = 
"PangoAttribute*")]
                [Version (since = "1.8")]
                public AttrSize.with_absolute (int size);
@@ -1195,6 +1203,9 @@ namespace Pango {
        [CCode (cheader_filename = "pango/pango.h")]
        public static Pango.Attribute attr_family_new (string family);
        [CCode (cheader_filename = "pango/pango.h")]
+       [Version (replacement = "AttrFontDesc.new")]
+       public static Pango.Attribute attr_font_desc_new (Pango.FontDescription desc);
+       [CCode (cheader_filename = "pango/pango.h")]
        [Version (since = "1.38")]
        public static Pango.Attribute attr_foreground_alpha_new (uint16 alpha);
        [CCode (cheader_filename = "pango/pango.h")]
@@ -1234,6 +1245,12 @@ namespace Pango {
        [CCode (cheader_filename = "pango/pango.h")]
        public static Pango.Attribute attr_style_new (Pango.Style style);
        [CCode (cheader_filename = "pango/pango.h")]
+       [Version (replacement = "AttrType.get_name", since = "1.22")]
+       public static unowned string? attr_type_get_name (Pango.AttrType type);
+       [CCode (cheader_filename = "pango/pango.h")]
+       [Version (replacement = "AttrType.register")]
+       public static Pango.AttrType attr_type_register (string name);
+       [CCode (cheader_filename = "pango/pango.h")]
        [Version (since = "1.8")]
        public static Pango.Attribute attr_underline_color_new (uint16 red, uint16 green, uint16 blue);
        [CCode (cheader_filename = "pango/pango.h")]
@@ -1243,6 +1260,9 @@ namespace Pango {
        [CCode (cheader_filename = "pango/pango.h")]
        public static Pango.Attribute attr_weight_new (Pango.Weight weight);
        [CCode (cheader_filename = "pango/pango.h")]
+       [Version (replacement = "BidiType.for_unichar", since = "1.22")]
+       public static Pango.BidiType bidi_type_for_unichar (unichar ch);
+       [CCode (cheader_filename = "pango/pango.h")]
        [Version (deprecated = true, deprecated_since = "1.44")]
        public static void @break (string text, int length, Pango.Analysis analysis, [CCode 
(array_length_cname = "attrs_len", array_length_pos = 4.1)] Pango.LogAttr[] attrs);
        [CCode (cheader_filename = "pango/pango.h")]
@@ -1256,10 +1276,25 @@ namespace Pango {
        [CCode (cheader_filename = "pango/pango.h")]
        public static void find_paragraph_boundary (string text, int length, out int 
paragraph_delimiter_index, out int next_paragraph_start);
        [CCode (cheader_filename = "pango/pango.h")]
+       [Version (replacement = "FontDescription.from_string")]
+       public static Pango.FontDescription font_description_from_string (string str);
+       [CCode (cheader_filename = "pango/pango.h")]
        public static void get_log_attrs (string text, int length, int level, Pango.Language language, [CCode 
(array_length_cname = "attrs_len", array_length_pos = 5.1)] Pango.LogAttr[] log_attrs);
        [CCode (cheader_filename = "pango/pango.h")]
        public static bool get_mirror_char (unichar ch, unichar mirrored_ch);
        [CCode (cheader_filename = "pango/pango.h")]
+       [Version (replacement = "Gravity.get_for_matrix", since = "1.16")]
+       public static Pango.Gravity gravity_get_for_matrix (Pango.Matrix? matrix);
+       [CCode (cheader_filename = "pango/pango.h")]
+       [Version (replacement = "Gravity.get_for_script", since = "1.16")]
+       public static Pango.Gravity gravity_get_for_script (Pango.Script script, Pango.Gravity base_gravity, 
Pango.GravityHint hint);
+       [CCode (cheader_filename = "pango/pango.h")]
+       [Version (replacement = "Gravity.get_for_script_and_width", since = "1.26")]
+       public static Pango.Gravity gravity_get_for_script_and_width (Pango.Script script, bool wide, 
Pango.Gravity base_gravity, Pango.GravityHint hint);
+       [CCode (cheader_filename = "pango/pango.h")]
+       [Version (replacement = "Gravity.to_rotation", since = "1.16")]
+       public static double gravity_to_rotation (Pango.Gravity gravity);
+       [CCode (cheader_filename = "pango/pango.h")]
        [Version (since = "1.10")]
        public static bool is_zero_width (unichar ch);
        [CCode (cheader_filename = "pango/pango.h")]
@@ -1268,6 +1303,15 @@ namespace Pango {
        [Version (since = "1.4")]
        public static GLib.List<Pango.Item> itemize_with_base_dir (Pango.Context context, Pango.Direction 
base_dir, string text, int start_index, int length, Pango.AttrList attrs, Pango.AttrIterator? cached_iter);
        [CCode (cheader_filename = "pango/pango.h")]
+       [Version (replacement = "Language.from_string")]
+       public static unowned Pango.Language? language_from_string (string? language);
+       [CCode (cheader_filename = "pango/pango.h")]
+       [Version (replacement = "Language.get_default", since = "1.16")]
+       public static unowned Pango.Language language_get_default ();
+       [CCode (cheader_filename = "pango/pango.h")]
+       [Version (replacement = "Language.get_preferred", since = "1.48")]
+       public static unowned Pango.Language? language_get_preferred ();
+       [CCode (cheader_filename = "pango/pango.h")]
        [Version (since = "1.4")]
        public static uint8 log2vis_get_embedding_levels (string text, int length, ref Pango.Direction 
pbase_dir);
        [CCode (cheader_filename = "pango/pango.h")]
@@ -1307,6 +1351,12 @@ namespace Pango {
        [Version (deprecated = true, deprecated_since = "1.38")]
        public static bool scan_word (ref string pos, GLib.StringBuilder @out);
        [CCode (cheader_filename = "pango/pango.h")]
+       [Version (deprecated = true, deprecated_since = "1.44.", replacement = "Script.for_unichar", since = 
"1.4")]
+       public static Pango.Script script_for_unichar (unichar ch);
+       [CCode (cheader_filename = "pango/pango.h")]
+       [Version (replacement = "Script.get_sample_language", since = "1.4")]
+       public static Pango.Language? script_get_sample_language (Pango.Script script);
+       [CCode (cheader_filename = "pango/pango.h")]
        public static void shape (string text, int length, Pango.Analysis analysis, Pango.GlyphString glyphs);
        [CCode (cheader_filename = "pango/pango.h")]
        [Version (since = "1.32")]
diff --git a/vapi/pangocairo.vapi b/vapi/pangocairo.vapi
index f81c6ee41..524ecc3a6 100644
--- a/vapi/pangocairo.vapi
+++ b/vapi/pangocairo.vapi
@@ -55,13 +55,13 @@ namespace Pango {
        [Version (since = "1.14")]
        public static void cairo_error_underline_path (Cairo.Context cr, double x, double y, double width, 
double height);
        [CCode (cheader_filename = "pango/pangocairo.h")]
-       [Version (since = "1.10")]
+       [Version (replacement = "FontMap.get_default", since = "1.10")]
        public static unowned Pango.FontMap cairo_font_map_get_default ();
        [CCode (cheader_filename = "pango/pangocairo.h")]
-       [Version (since = "1.10")]
+       [Version (replacement = "FontMap.new", since = "1.10")]
        public static Pango.FontMap cairo_font_map_new ();
        [CCode (cheader_filename = "pango/pangocairo.h")]
-       [Version (since = "1.18")]
+       [Version (replacement = "FontMap.new_for_font_type", since = "1.18")]
        public static Pango.FontMap? cairo_font_map_new_for_font_type (Cairo.FontType fonttype);
        [CCode (cheader_filename = "pango/pangocairo.h")]
        [Version (since = "1.10")]
diff --git a/vapi/polkit-gobject-1.vapi b/vapi/polkit-gobject-1.vapi
index 307f173d9..8f2e9d6b4 100644
--- a/vapi/polkit-gobject-1.vapi
+++ b/vapi/polkit-gobject-1.vapi
@@ -217,7 +217,18 @@ namespace Polkit {
                public static GLib.Quark quark ();
        }
        [CCode (cheader_filename = "polkit/polkit.h")]
+       [Version (replacement = "Error.quark")]
+       public static GLib.Quark error_quark ();
+       [CCode (cheader_filename = "polkit/polkit.h")]
+       [Version (replacement = "Identity.from_string")]
        public static Polkit.Identity? identity_from_string (string str) throws GLib.Error;
        [CCode (cheader_filename = "polkit/polkit.h")]
+       [Version (replacement = "ImplicitAuthorization.from_string")]
+       public static bool implicit_authorization_from_string (string string, Polkit.ImplicitAuthorization 
out_implicit_authorization);
+       [CCode (cheader_filename = "polkit/polkit.h")]
+       [Version (replacement = "ImplicitAuthorization.to_string")]
+       public static unowned string implicit_authorization_to_string (Polkit.ImplicitAuthorization 
implicit_authorization);
+       [CCode (cheader_filename = "polkit/polkit.h")]
+       [Version (replacement = "Subject.from_string")]
        public static Polkit.Subject subject_from_string (string str) throws GLib.Error;
 }
diff --git a/vapi/poppler-glib.vapi b/vapi/poppler-glib.vapi
index a9e6f72f8..eb58a2b61 100644
--- a/vapi/poppler-glib.vapi
+++ b/vapi/poppler-glib.vapi
@@ -1512,6 +1512,9 @@ namespace Poppler {
        [Version (since = "0.12")]
        public static bool date_parse (string date, long timet);
        [CCode (cheader_filename = "poppler.h")]
+       [Version (replacement = "Error.quark")]
+       public static GLib.Quark error_quark ();
+       [CCode (cheader_filename = "poppler.h")]
        public static Poppler.Backend get_backend ();
        [CCode (cheader_filename = "poppler.h")]
        public static unowned string get_version ();
diff --git a/vapi/rest-0.7.vapi b/vapi/rest-0.7.vapi
index 015fc6880..903a53631 100644
--- a/vapi/rest-0.7.vapi
+++ b/vapi/rest-0.7.vapi
@@ -261,4 +261,10 @@ namespace Rest {
        public delegate void ProxyCallContinuousCallback (Rest.ProxyCall call, string buf, size_t len, 
GLib.Error? error, GLib.Object? weak_object);
        [CCode (cheader_filename = "rest/rest-proxy-call.h", instance_pos = 5.9)]
        public delegate void ProxyCallUploadCallback (Rest.ProxyCall call, size_t total, size_t uploaded, 
GLib.Error? error, GLib.Object? weak_object);
+       [CCode (cheader_filename = 
"rest/oauth-proxy-call.h,rest/oauth-proxy.h,rest/oauth2-proxy-call.h,rest/oauth2-proxy.h,rest/rest-enum-types.h,rest/rest-param.h,rest/rest-params.h,rest/rest-proxy-auth.h,rest/rest-proxy-call.h,rest/rest-proxy.h,rest/rest-xml-node.h,rest/rest-xml-parser.h")]
+       [Version (replacement = "ProxyCallError.quark")]
+       public static GLib.Quark proxy_call_error_quark ();
+       [CCode (cheader_filename = 
"rest/oauth-proxy-call.h,rest/oauth-proxy.h,rest/oauth2-proxy-call.h,rest/oauth2-proxy.h,rest/rest-enum-types.h,rest/rest-param.h,rest/rest-params.h,rest/rest-proxy-auth.h,rest/rest-proxy-call.h,rest/rest-proxy.h,rest/rest-xml-node.h,rest/rest-xml-parser.h")]
+       [Version (replacement = "ProxyError.quark")]
+       public static GLib.Quark proxy_error_quark ();
 }
diff --git a/vapi/udisks2.vapi b/vapi/udisks2.vapi
index 61ea8868b..34b87b37a 100644
--- a/vapi/udisks2.vapi
+++ b/vapi/udisks2.vapi
@@ -941,53 +941,78 @@ namespace UDisks {
        [CCode (cheader_filename = "udisks/udisks.h", cname = "UDISKS_MINOR_VERSION")]
        public const int MINOR_VERSION;
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "Block.interface_info")]
        public static unowned GLib.DBusInterfaceInfo block_interface_info ();
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "Block.override_properties")]
        public static uint block_override_properties (GLib.ObjectClass klass, uint property_id_begin);
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "DriveAta.interface_info")]
        public static unowned GLib.DBusInterfaceInfo drive_ata_interface_info ();
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "DriveAta.override_properties")]
        public static uint drive_ata_override_properties (GLib.ObjectClass klass, uint property_id_begin);
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "Drive.interface_info")]
        public static unowned GLib.DBusInterfaceInfo drive_interface_info ();
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "Drive.override_properties")]
        public static uint drive_override_properties (GLib.ObjectClass klass, uint property_id_begin);
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "Encrypted.interface_info")]
        public static unowned GLib.DBusInterfaceInfo encrypted_interface_info ();
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "Encrypted.override_properties")]
        public static uint encrypted_override_properties (GLib.ObjectClass klass, uint property_id_begin);
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "Error.quark")]
+       public static GLib.Quark error_quark ();
+       [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "Filesystem.interface_info")]
        public static unowned GLib.DBusInterfaceInfo filesystem_interface_info ();
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "Filesystem.override_properties")]
        public static uint filesystem_override_properties (GLib.ObjectClass klass, uint property_id_begin);
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "Job.interface_info")]
        public static unowned GLib.DBusInterfaceInfo job_interface_info ();
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "Job.override_properties")]
        public static uint job_override_properties (GLib.ObjectClass klass, uint property_id_begin);
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "Loop.interface_info")]
        public static unowned GLib.DBusInterfaceInfo loop_interface_info ();
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "Loop.override_properties")]
        public static uint loop_override_properties (GLib.ObjectClass klass, uint property_id_begin);
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "Manager.interface_info")]
        public static unowned GLib.DBusInterfaceInfo manager_interface_info ();
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "Manager.override_properties")]
        public static uint manager_override_properties (GLib.ObjectClass klass, uint property_id_begin);
        [CCode (cheader_filename = "udisks/udisks.h")]
-       [Version (since = "2.0.0")]
+       [Version (replacement = "MDRaid.interface_info", since = "2.0.0")]
        public static unowned GLib.DBusInterfaceInfo mdraid_interface_info ();
        [CCode (cheader_filename = "udisks/udisks.h")]
-       [Version (since = "2.0.0")]
+       [Version (replacement = "MDRaid.override_properties", since = "2.0.0")]
        public static uint mdraid_override_properties (GLib.ObjectClass klass, uint property_id_begin);
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "Partition.interface_info")]
        public static unowned GLib.DBusInterfaceInfo partition_interface_info ();
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "Partition.override_properties")]
        public static uint partition_override_properties (GLib.ObjectClass klass, uint property_id_begin);
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "PartitionTable.interface_info")]
        public static unowned GLib.DBusInterfaceInfo partition_table_interface_info ();
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "PartitionTable.override_properties")]
        public static uint partition_table_override_properties (GLib.ObjectClass klass, uint 
property_id_begin);
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "Swapspace.interface_info")]
        public static unowned GLib.DBusInterfaceInfo swapspace_interface_info ();
        [CCode (cheader_filename = "udisks/udisks.h")]
+       [Version (replacement = "Swapspace.override_properties")]
        public static uint swapspace_override_properties (GLib.ObjectClass klass, uint property_id_begin);
 }
diff --git a/vapi/webkit2gtk-4.0.vapi b/vapi/webkit2gtk-4.0.vapi
index 69ac6a140..c535c914c 100644
--- a/vapi/webkit2gtk-4.0.vapi
+++ b/vapi/webkit2gtk-4.0.vapi
@@ -2016,21 +2016,51 @@ namespace WebKit {
        [CCode (cheader_filename = "webkit2/webkit2.h", cname = "WEBKIT_MINOR_VERSION")]
        public const int MINOR_VERSION;
        [CCode (cheader_filename = "webkit2/webkit2.h")]
+       [Version (replacement = "DownloadError.quark")]
+       public static GLib.Quark download_error_quark ();
+       [CCode (cheader_filename = "webkit2/webkit2.h")]
+       [Version (replacement = "FaviconDatabaseError.quark")]
+       public static GLib.Quark favicon_database_error_quark ();
+       [CCode (cheader_filename = "webkit2/webkit2.h")]
        public static uint get_major_version ();
        [CCode (cheader_filename = "webkit2/webkit2.h")]
        public static uint get_micro_version ();
        [CCode (cheader_filename = "webkit2/webkit2.h")]
        public static uint get_minor_version ();
        [CCode (cheader_filename = "webkit2/webkit2.h")]
+       [Version (replacement = "JavascriptError.quark")]
+       public static GLib.Quark javascript_error_quark ();
+       [CCode (cheader_filename = "webkit2/webkit2.h")]
        [Version (since = "2.32")]
        public static unowned string media_key_system_permission_get_name 
(WebKit.MediaKeySystemPermissionRequest request);
        [CCode (cheader_filename = "webkit2/webkit2.h")]
+       [Version (replacement = "NetworkError.quark")]
+       public static GLib.Quark network_error_quark ();
+       [CCode (cheader_filename = "webkit2/webkit2.h")]
+       [Version (replacement = "PluginError.quark")]
+       public static GLib.Quark plugin_error_quark ();
+       [CCode (cheader_filename = "webkit2/webkit2.h")]
+       [Version (replacement = "PolicyError.quark")]
+       public static GLib.Quark policy_error_quark ();
+       [CCode (cheader_filename = "webkit2/webkit2.h")]
+       [Version (replacement = "PrintError.quark")]
+       public static GLib.Quark print_error_quark ();
+       [CCode (cheader_filename = "webkit2/webkit2.h")]
+       [Version (replacement = "SnapshotError.quark")]
+       public static GLib.Quark snapshot_error_quark ();
+       [CCode (cheader_filename = "webkit2/webkit2.h")]
        [Version (since = "2.24")]
        public static string? uri_for_display (string uri);
        [CCode (cheader_filename = "webkit2/webkit2.h")]
+       [Version (replacement = "UserContentFilterError.quark")]
+       public static GLib.Quark user_content_filter_error_quark ();
+       [CCode (cheader_filename = "webkit2/webkit2.h")]
        [Version (since = "2.8")]
        public static bool user_media_permission_is_for_audio_device (WebKit.UserMediaPermissionRequest 
request);
        [CCode (cheader_filename = "webkit2/webkit2.h")]
        [Version (since = "2.8")]
        public static bool user_media_permission_is_for_video_device (WebKit.UserMediaPermissionRequest 
request);
+       [CCode (cheader_filename = "webkit2/webkit2.h")]
+       [Version (replacement = "UserMessageError.quark")]
+       public static GLib.Quark user_message_error_quark ();
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]