@img/sharp-libvips-dev 1.0.1 → 1.0.3

package/include/glib-2.0/gio/gappinfo.h

@@ -49,32 +49,47 @@ typedef struct _GAppLaunchContextPrivate GAppLaunchContextPrivate;
 /**
  * GAppInfoIface:
  * @g_iface: The parent interface.
- * @dup: Copies a #GAppInfo.
- * @equal: Checks two #GAppInfos for equality.
- * @get_id: Gets a string identifier for a #GAppInfo.
- * @get_name: Gets the name of the application for a #GAppInfo.
- * @get_description: Gets a short description for the application described by the #GAppInfo.
- * @get_executable: Gets the executable name for the #GAppInfo.
- * @get_icon: Gets the #GIcon for the #GAppInfo.
- * @launch: Launches an application specified by the #GAppInfo.
- * @supports_uris: Indicates whether the application specified supports launching URIs.
- * @supports_files: Indicates whether the application specified accepts filename arguments.
+ * @dup: Copies a [iface@Gio.AppInfo].
+ * @equal: Checks two [iface@Gio.AppInfo]s for equality.
+ * @get_id: Gets a string identifier for a [iface@Gio.AppInfo].
+ * @get_name: Gets the name of the application for a [iface@Gio.AppInfo].
+ * @get_description: Gets a short description for the application described by
+ *   the [iface@Gio.AppInfo].
+ * @get_executable: Gets the executable name for the [iface@Gio.AppInfo].
+ * @get_icon: Gets the [iface@Gio.Icon] for the [iface@Gio.AppInfo].
+ * @launch: Launches an application specified by the [iface@Gio.AppInfo].
+ * @supports_uris: Indicates whether the application specified supports
+ *   launching URIs.
+ * @supports_files: Indicates whether the application specified accepts
+ *   filename arguments.
  * @launch_uris: Launches an application with a list of URIs.
- * @should_show: Returns whether an application should be shown (e.g. when getting a list of installed applications).
- * [FreeDesktop.Org Startup Notification Specification](http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt).
- * @set_as_default_for_type: Sets an application as default for a given content type.
- * @set_as_default_for_extension: Sets an application as default for a given file extension.
- * @add_supports_type: Adds to the #GAppInfo information about supported file types.
- * @can_remove_supports_type: Checks for support for removing supported file types from a #GAppInfo.
- * @remove_supports_type: Removes a supported application type from a #GAppInfo.
- * @can_delete: Checks if a #GAppInfo can be deleted. Since 2.20
- * @do_delete: Deletes a #GAppInfo. Since 2.20
- * @get_commandline: Gets the commandline for the #GAppInfo. Since 2.20
- * @get_display_name: Gets the display name for the #GAppInfo. Since 2.24
- * @set_as_last_used_for_type: Sets the application as the last used. See g_app_info_set_as_last_used_for_type().
- * @get_supported_types: Retrieves the list of content types that @app_info claims to support.
- * @launch_uris_async: Asynchronously launches an application with a list of URIs. (Since: 2.60)
- * @launch_uris_finish: Finishes an operation started with @launch_uris_async. (Since: 2.60)
+ * @should_show: Returns whether an application should be shown (e.g. when
+ *   getting a list of installed applications).
+ *   [FreeDesktop.Org Startup Notification Specification](http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt).
+ * @set_as_default_for_type: Sets an application as default for a given content
+ *   type.
+ * @set_as_default_for_extension: Sets an application as default for a given
+ *   file extension.
+ * @add_supports_type: Adds to the [iface@Gio.AppInfo] information about
+ *   supported file types.
+ * @can_remove_supports_type: Checks for support for removing supported file
+ *   types from a [iface@Gio.AppInfo].
+ * @remove_supports_type: Removes a supported application type from a
+ *   [iface@Gio.AppInfo].
+ * @can_delete: Checks if a [iface@Gio.AppInfo] can be deleted. (Since 2.20)
+ * @do_delete: Deletes a [iface@Gio.AppInfo]. (Since 2.20)
+ * @get_commandline: Gets the commandline for the [iface@Gio.AppInfo].
+ *   (Since 2.20)
+ * @get_display_name: Gets the display name for the [iface@Gio.AppInfo].
+ *   (Since 2.24)
+ * @set_as_last_used_for_type: Sets the application as the last used. See
+ *   [method@Gio.AppInfo.set_as_last_used_for_type].
+ * @get_supported_types: Retrieves the list of content types that @app_info
+ *   claims to support.
+ * @launch_uris_async: Asynchronously launches an application with a list of
+ *   URIs. (Since: 2.60)
+ * @launch_uris_finish: Finishes an operation started with @launch_uris_async.
+ *   (Since: 2.60)
 
  * Application Information interface, for operating system portability.
  */

package/include/glib-2.0/gio/gapplication.h

@@ -139,6 +139,12 @@ GIO_AVAILABLE_IN_ALL
 void                    g_application_set_application_id                (GApplication             *application,
                                                                          const gchar              *application_id);
 
+GIO_AVAILABLE_IN_2_80
+const gchar *           g_application_get_version                       (GApplication             *application);
+GIO_AVAILABLE_IN_2_80
+void                    g_application_set_version                       (GApplication             *application,
+                                                                         const gchar              *version);
+
 GIO_AVAILABLE_IN_2_34
 GDBusConnection *       g_application_get_dbus_connection               (GApplication             *application);
 GIO_AVAILABLE_IN_2_34

package/include/glib-2.0/gio/gasyncresult.h

@@ -46,7 +46,7 @@ typedef struct _GAsyncResultIface    GAsyncResultIface;
  * @get_source_object: Gets the source object that issued the asynchronous operation.
  * @is_tagged: Checks if a result is tagged with a particular source.
  *
- * Interface definition for #GAsyncResult.
+ * Interface definition for [iface@Gio.AsyncResult].
  **/
 struct _GAsyncResultIface
 {

package/include/glib-2.0/gio/gconverter.h

@@ -84,6 +84,11 @@ GConverterResult g_converter_convert (GConverter       *converter,
 GIO_AVAILABLE_IN_ALL
 void             g_converter_reset   (GConverter       *converter);
 
+GIO_AVAILABLE_IN_2_82
+GBytes *         g_converter_convert_bytes (GConverter  *converter,
+                                            GBytes      *bytes,
+                                            GError     **error);
+
 
 G_END_DECLS
 

package/include/glib-2.0/gio/gdbusintrospection.h

@@ -79,7 +79,7 @@ struct _GDBusArgInfo
  * @out_args: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusArgInfo structures or %NULL if there are no out arguments.
  * @annotations: (array zero-terminated=1): A pointer to a %NULL-terminated array of pointers to #GDBusAnnotationInfo structures or %NULL if there are no annotations.
  *
- * Information about a method on an D-Bus interface.
+ * Information about a method on a D-Bus interface.
  *
  * Since: 2.26
  */

package/include/glib-2.0/gio/gfile.h

@@ -944,6 +944,14 @@ void                    g_file_copy_async                 (GFile
 							   gpointer                    progress_callback_data,
 							   GAsyncReadyCallback         callback,
 							   gpointer                    user_data);
+GIO_AVAILABLE_IN_2_82
+void g_file_copy_async_with_closures (GFile *source,
+                                      GFile *destination,
+                                      GFileCopyFlags flags,
+                                      int io_priority,
+                                      GCancellable *cancellable,
+                                      GClosure *progress_callback_closure,
+                                      GClosure *ready_callback_closure);
 GIO_AVAILABLE_IN_ALL
 gboolean                g_file_copy_finish                (GFile                      *file,
 							   GAsyncResult               *res,
@@ -966,6 +974,14 @@ void                    g_file_move_async                 (GFile
 							                                             gpointer                    progress_callback_data,
 							                                             GAsyncReadyCallback         callback,
 							                                             gpointer                    user_data);
+GIO_AVAILABLE_IN_2_82
+void g_file_move_async_with_closures (GFile *source,
+                                      GFile *destination,
+                                      GFileCopyFlags flags,
+                                      int io_priority,
+                                      GCancellable *cancellable,
+                                      GClosure *progress_callback_closure,
+                                      GClosure *ready_callback_closure);
 GIO_AVAILABLE_IN_2_72
 gboolean                g_file_move_finish                (GFile                      *file,
 							                                             GAsyncResult               *result,

package/include/glib-2.0/gio/gio-visibility.h

@@ -984,3 +984,37 @@
 #define GIO_AVAILABLE_ENUMERATOR_IN_2_80
 #define GIO_AVAILABLE_TYPE_IN_2_80
 #endif
+
+#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_82
+#define GIO_DEPRECATED_IN_2_82 GIO_DEPRECATED
+#define GIO_DEPRECATED_IN_2_82_FOR(f) GIO_DEPRECATED_FOR (f)
+#define GIO_DEPRECATED_MACRO_IN_2_82 GLIB_DEPRECATED_MACRO
+#define GIO_DEPRECATED_MACRO_IN_2_82_FOR(f) GLIB_DEPRECATED_MACRO_FOR (f)
+#define GIO_DEPRECATED_ENUMERATOR_IN_2_82 GLIB_DEPRECATED_ENUMERATOR
+#define GIO_DEPRECATED_ENUMERATOR_IN_2_82_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR (f)
+#define GIO_DEPRECATED_TYPE_IN_2_82 GLIB_DEPRECATED_TYPE
+#define GIO_DEPRECATED_TYPE_IN_2_82_FOR(f) GLIB_DEPRECATED_TYPE_FOR (f)
+#else
+#define GIO_DEPRECATED_IN_2_82 _GIO_EXTERN
+#define GIO_DEPRECATED_IN_2_82_FOR(f) _GIO_EXTERN
+#define GIO_DEPRECATED_MACRO_IN_2_82
+#define GIO_DEPRECATED_MACRO_IN_2_82_FOR(f)
+#define GIO_DEPRECATED_ENUMERATOR_IN_2_82
+#define GIO_DEPRECATED_ENUMERATOR_IN_2_82_FOR(f)
+#define GIO_DEPRECATED_TYPE_IN_2_82
+#define GIO_DEPRECATED_TYPE_IN_2_82_FOR(f)
+#endif
+
+#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_82
+#define GIO_AVAILABLE_IN_2_82 GIO_UNAVAILABLE (2, 82)
+#define GIO_AVAILABLE_STATIC_INLINE_IN_2_82 GLIB_UNAVAILABLE_STATIC_INLINE (2, 82)
+#define GIO_AVAILABLE_MACRO_IN_2_82 GLIB_UNAVAILABLE_MACRO (2, 82)
+#define GIO_AVAILABLE_ENUMERATOR_IN_2_82 GLIB_UNAVAILABLE_ENUMERATOR (2, 82)
+#define GIO_AVAILABLE_TYPE_IN_2_82 GLIB_UNAVAILABLE_TYPE (2, 82)
+#else
+#define GIO_AVAILABLE_IN_2_82 _GIO_EXTERN
+#define GIO_AVAILABLE_STATIC_INLINE_IN_2_82
+#define GIO_AVAILABLE_MACRO_IN_2_82
+#define GIO_AVAILABLE_ENUMERATOR_IN_2_82
+#define GIO_AVAILABLE_TYPE_IN_2_82
+#endif

package/include/glib-2.0/gio/giotypes.h

@@ -82,7 +82,6 @@ typedef struct _GFileInfo                     GFileInfo;
 typedef struct _GFileAttributeMatcher         GFileAttributeMatcher;
 typedef struct _GFileAttributeInfo            GFileAttributeInfo;
 typedef struct _GFileAttributeInfoList        GFileAttributeInfoList;
-typedef struct _GFileDescriptorBased          GFileDescriptorBased;
 typedef struct _GFileInputStream              GFileInputStream;
 typedef struct _GFileOutputStream             GFileOutputStream;
 typedef struct _GFileIOStream                 GFileIOStream;

package/include/glib-2.0/gio/gsettings.h

@@ -322,6 +322,14 @@ void                    g_settings_bind_with_mapping                    (GSettin
                                                                          GSettingsBindSetMapping  set_mapping,
                                                                          gpointer                 user_data,
                                                                          GDestroyNotify           destroy);
+GIO_AVAILABLE_IN_2_82
+void g_settings_bind_with_mapping_closures (GSettings *settings,
+                                            const char *key,
+                                            GObject *object,
+                                            const char *property,
+                                            GSettingsBindFlags flags,
+                                            GClosure *get_mapping,
+                                            GClosure *set_mapping);
 GIO_AVAILABLE_IN_ALL
 void                    g_settings_bind_writable                        (GSettings               *settings,
                                                                          const gchar             *key,

package/include/glib-2.0/gio/gvfs.h

@@ -42,11 +42,11 @@ G_BEGIN_DECLS
  * GVfsFileLookupFunc:
  * @vfs: a #GVfs
  * @identifier: the identifier to look up a #GFile for. This can either
- *     be an URI or a parse name as returned by g_file_get_parse_name()
+ *     be a URI or a parse name as returned by g_file_get_parse_name()
  * @user_data: user data passed to the function
  *
  * This function type is used by g_vfs_register_uri_scheme() to make it
- * possible for a client to associate an URI scheme to a different #GFile
+ * possible for a client to associate a URI scheme to a different #GFile
  * implementation.
  *
  * The client should return a reference to the new file that has been

package/include/glib-2.0/girepository/gi-visibility.h

@@ -984,3 +984,37 @@
 #define GI_AVAILABLE_ENUMERATOR_IN_2_80
 #define GI_AVAILABLE_TYPE_IN_2_80
 #endif
+
+#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_82
+#define GI_DEPRECATED_IN_2_82 GI_DEPRECATED
+#define GI_DEPRECATED_IN_2_82_FOR(f) GI_DEPRECATED_FOR (f)
+#define GI_DEPRECATED_MACRO_IN_2_82 GLIB_DEPRECATED_MACRO
+#define GI_DEPRECATED_MACRO_IN_2_82_FOR(f) GLIB_DEPRECATED_MACRO_FOR (f)
+#define GI_DEPRECATED_ENUMERATOR_IN_2_82 GLIB_DEPRECATED_ENUMERATOR
+#define GI_DEPRECATED_ENUMERATOR_IN_2_82_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR (f)
+#define GI_DEPRECATED_TYPE_IN_2_82 GLIB_DEPRECATED_TYPE
+#define GI_DEPRECATED_TYPE_IN_2_82_FOR(f) GLIB_DEPRECATED_TYPE_FOR (f)
+#else
+#define GI_DEPRECATED_IN_2_82 _GI_EXTERN
+#define GI_DEPRECATED_IN_2_82_FOR(f) _GI_EXTERN
+#define GI_DEPRECATED_MACRO_IN_2_82
+#define GI_DEPRECATED_MACRO_IN_2_82_FOR(f)
+#define GI_DEPRECATED_ENUMERATOR_IN_2_82
+#define GI_DEPRECATED_ENUMERATOR_IN_2_82_FOR(f)
+#define GI_DEPRECATED_TYPE_IN_2_82
+#define GI_DEPRECATED_TYPE_IN_2_82_FOR(f)
+#endif
+
+#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_82
+#define GI_AVAILABLE_IN_2_82 GI_UNAVAILABLE (2, 82)
+#define GI_AVAILABLE_STATIC_INLINE_IN_2_82 GLIB_UNAVAILABLE_STATIC_INLINE (2, 82)
+#define GI_AVAILABLE_MACRO_IN_2_82 GLIB_UNAVAILABLE_MACRO (2, 82)
+#define GI_AVAILABLE_ENUMERATOR_IN_2_82 GLIB_UNAVAILABLE_ENUMERATOR (2, 82)
+#define GI_AVAILABLE_TYPE_IN_2_82 GLIB_UNAVAILABLE_TYPE (2, 82)
+#else
+#define GI_AVAILABLE_IN_2_82 _GI_EXTERN
+#define GI_AVAILABLE_STATIC_INLINE_IN_2_82
+#define GI_AVAILABLE_MACRO_IN_2_82
+#define GI_AVAILABLE_ENUMERATOR_IN_2_82
+#define GI_AVAILABLE_TYPE_IN_2_82
+#endif

package/include/glib-2.0/girepository/giarginfo.h

@@ -32,16 +32,31 @@
 
 G_BEGIN_DECLS
 
+#define GI_TYPE_ARG_INFO (gi_arg_info_get_type ())
+
+/**
+ * GI_ARG_INFO:
+ * @info: Info object which is subject to casting.
+ *
+ * Casts a [type@GIRepository.ArgInfo] or derived pointer into a
+ * `(GIArgInfo*)` pointer.
+ *
+ * Depending on the current debugging level, this function may invoke
+ * certain runtime checks to identify invalid casts.
+ *
+ * Since: 2.80
+ */
+#define GI_ARG_INFO(info) (G_TYPE_CHECK_INSTANCE_CAST ((info), GI_TYPE_ARG_INFO, GIArgInfo))
+
 /**
  * GI_IS_ARG_INFO:
  * @info: an info structure
  *
- * Checks if @info is a [class@GIRepository.ArgInfo].
+ * Checks if @info is a [class@GIRepository.ArgInfo] (or a derived type).
  *
  * Since: 2.80
  */
-#define GI_IS_ARG_INFO(info) \
-    (gi_base_info_get_info_type ((GIBaseInfo*) info) ==  GI_INFO_TYPE_ARG)
+#define GI_IS_ARG_INFO(info) (G_TYPE_CHECK_INSTANCE_TYPE ((info), GI_TYPE_ARG_INFO))
 
 
 GI_AVAILABLE_IN_ALL
@@ -69,15 +84,17 @@ GI_AVAILABLE_IN_ALL
 GIScopeType            gi_arg_info_get_scope              (GIArgInfo *info);
 
 GI_AVAILABLE_IN_ALL
-gint                   gi_arg_info_get_closure_index      (GIArgInfo *info);
+gboolean               gi_arg_info_get_closure_index      (GIArgInfo *info,
+                                                           unsigned int *out_closure_index);
 
 GI_AVAILABLE_IN_ALL
-gint                   gi_arg_info_get_destroy_index      (GIArgInfo *info);
+gboolean               gi_arg_info_get_destroy_index      (GIArgInfo *info,
+                                                           unsigned int *out_destroy_index);
 
 GI_AVAILABLE_IN_ALL
 GITypeInfo *           gi_arg_info_get_type_info          (GIArgInfo *info);
 
 GI_AVAILABLE_IN_ALL
-void                   gi_arg_info_load_type              (GIArgInfo *info,
+void                   gi_arg_info_load_type_info         (GIArgInfo *info,
                                                            GITypeInfo *type);
 G_END_DECLS

package/include/glib-2.0/girepository/gibaseinfo.h

@@ -44,39 +44,71 @@ G_BEGIN_DECLS
  */
 typedef struct {
   /*< private >*/
-  gpointer data;
-  gpointer data2;
-  gpointer data3;
-  gpointer data4;
+  void *data;
+  void *_dummy[4];
 } GIAttributeIter;
 
-#define GI_TYPE_BASE_INFO	(gi_base_info_get_type ())
+/**
+ * GI_ATTRIBUTE_ITER_INIT:
+ *
+ * Initialise a stack-allocated [type@GIRepository.AttributeIter] to a value
+ * suitable for passing to the first call to an ‘iterate’ function.
+ *
+ * Since: 2.80
+ */
+#define GI_ATTRIBUTE_ITER_INIT { NULL, { NULL, } }
+
+#define GI_TYPE_BASE_INFO        (gi_base_info_get_type ())
+
+/**
+ * GI_BASE_INFO:
+ * @info: Info object which is subject to casting.
+ *
+ * Casts a [type@GIRepository.BaseInfo] or derived pointer into a
+ * `(GIBaseInfo*)` pointer.
+ *
+ * Depending on the current debugging level, this function may invoke
+ * certain runtime checks to identify invalid casts.
+ *
+ * Since: 2.80
+ */
+#define GI_BASE_INFO(info)       (G_TYPE_CHECK_INSTANCE_CAST ((info), GI_TYPE_BASE_INFO, GIBaseInfo))
 
+/**
+ * GI_IS_BASE_INFO:
+ * @info: Instance to check for being a `GI_TYPE_BASE_INFO`.
+ *
+ * Checks whether a valid [type@GObject.TypeInstance] pointer is of type
+ * `GI_TYPE_BASE_INFO` (or a derived type).
+ *
+ * Since: 2.80
+ */
+#define GI_IS_BASE_INFO(info)    (G_TYPE_CHECK_INSTANCE_TYPE ((info), GI_TYPE_BASE_INFO))
 
 GI_AVAILABLE_IN_ALL
 GType                  gi_base_info_get_type         (void) G_GNUC_CONST;
 
 GI_AVAILABLE_IN_ALL
-GIBaseInfo *           gi_base_info_ref              (GIBaseInfo   *info);
+GIBaseInfo *           gi_base_info_ref              (void         *info);
 
 GI_AVAILABLE_IN_ALL
-void                   gi_base_info_unref            (GIBaseInfo   *info);
+void                   gi_base_info_unref            (void         *info);
 
 GI_AVAILABLE_IN_ALL
-GIInfoType             gi_base_info_get_info_type    (GIBaseInfo   *info);
+void                   gi_base_info_clear            (void         *info);
 
 GI_AVAILABLE_IN_ALL
-const gchar *          gi_base_info_get_name         (GIBaseInfo   *info);
+const char *           gi_base_info_get_name         (GIBaseInfo   *info);
 
 GI_AVAILABLE_IN_ALL
-const gchar *          gi_base_info_get_namespace    (GIBaseInfo   *info);
+const char *           gi_base_info_get_namespace    (GIBaseInfo   *info);
 
 GI_AVAILABLE_IN_ALL
 gboolean               gi_base_info_is_deprecated    (GIBaseInfo   *info);
 
 GI_AVAILABLE_IN_ALL
-const gchar *          gi_base_info_get_attribute    (GIBaseInfo  *info,
-                                                      const gchar *name);
+const char *           gi_base_info_get_attribute    (GIBaseInfo  *info,
+                                                      const char  *name);
 
 GI_AVAILABLE_IN_ALL
 gboolean               gi_base_info_iterate_attributes (GIBaseInfo       *info,
@@ -94,10 +126,4 @@ GI_AVAILABLE_IN_ALL
 gboolean               gi_base_info_equal            (GIBaseInfo *info1,
                                                       GIBaseInfo *info2);
 
-GI_AVAILABLE_IN_ALL
-GIBaseInfo *           gi_info_new                   (GIInfoType  type,
-                                                      GIBaseInfo *container,
-                                                      GITypelib  *typelib,
-                                                      guint32     offset);
-
 G_END_DECLS

package/include/glib-2.0/girepository/gicallableinfo.h

@@ -32,6 +32,22 @@
 
 G_BEGIN_DECLS
 
+#define GI_TYPE_CALLABLE_INFO (gi_callable_info_get_type ())
+
+/**
+ * GI_CALLABLE_INFO:
+ * @info: Info object which is subject to casting.
+ *
+ * Casts a [type@GIRepository.CallableInfo] or derived pointer into a
+ * `(GICallableInfo*)` pointer.
+ *
+ * Depending on the current debugging level, this function may invoke
+ * certain runtime checks to identify invalid casts.
+ *
+ * Since: 2.80
+ */
+#define GI_CALLABLE_INFO(info) (G_TYPE_CHECK_INSTANCE_CAST ((info), GI_TYPE_CALLABLE_INFO, GICallableInfo))
+
 /**
  * GI_IS_CALLABLE_INFO:
  * @info: an info structure
@@ -40,11 +56,7 @@ G_BEGIN_DECLS
  *
  * Since: 2.80
  */
-#define GI_IS_CALLABLE_INFO(info)					\
-    ((gi_base_info_get_info_type ((GIBaseInfo*) info) == GI_INFO_TYPE_FUNCTION) || \
-     (gi_base_info_get_info_type ((GIBaseInfo*) info) == GI_INFO_TYPE_CALLBACK) || \
-     (gi_base_info_get_info_type ((GIBaseInfo*) info) == GI_INFO_TYPE_SIGNAL) || \
-     (gi_base_info_get_info_type ((GIBaseInfo*) info) == GI_INFO_TYPE_VFUNC))
+#define GI_IS_CALLABLE_INFO(info) (G_TYPE_CHECK_INSTANCE_TYPE ((info), GI_TYPE_CALLABLE_INFO))
 
 
 GI_AVAILABLE_IN_ALL
@@ -61,8 +73,8 @@ void                   gi_callable_info_load_return_type (GICallableInfo *info,
                                                           GITypeInfo     *type);
 
 GI_AVAILABLE_IN_ALL
-const gchar *          gi_callable_info_get_return_attribute (GICallableInfo *info,
-                                                              const gchar    *name);
+const char  *          gi_callable_info_get_return_attribute (GICallableInfo *info,
+                                                              const char     *name);
 
 GI_AVAILABLE_IN_ALL
 gboolean               gi_callable_info_iterate_return_attributes (GICallableInfo   *info,
@@ -80,27 +92,25 @@ GI_AVAILABLE_IN_ALL
 gboolean               gi_callable_info_skip_return     (GICallableInfo *info);
 
 GI_AVAILABLE_IN_ALL
-guint                  gi_callable_info_get_n_args      (GICallableInfo *info);
+unsigned int           gi_callable_info_get_n_args      (GICallableInfo *info);
 
 GI_AVAILABLE_IN_ALL
 GIArgInfo *            gi_callable_info_get_arg         (GICallableInfo *info,
-                                                         guint           n);
+                                                         unsigned int    n);
 
 GI_AVAILABLE_IN_ALL
 void                   gi_callable_info_load_arg        (GICallableInfo *info,
-                                                         guint           n,
+                                                         unsigned int    n,
                                                          GIArgInfo      *arg);
 
 GI_AVAILABLE_IN_ALL
 gboolean               gi_callable_info_invoke          (GICallableInfo    *info,
-                                                         gpointer           function,
+                                                         void              *function,
                                                          const GIArgument  *in_args,
-                                                         gsize              n_in_args,
-                                                         const GIArgument  *out_args,
-                                                         gsize              n_out_args,
+                                                         size_t             n_in_args,
+                                                         GIArgument        *out_args,
+                                                         size_t             n_out_args,
                                                          GIArgument        *return_value,
-                                                         gboolean           is_method,
-                                                         gboolean           throws,
                                                          GError           **error);
 
 GI_AVAILABLE_IN_ALL

package/include/glib-2.0/girepository/gicallbackinfo.h

@@ -31,6 +31,22 @@
 
 G_BEGIN_DECLS
 
+#define GI_TYPE_CALLBACK_INFO (gi_callback_info_get_type ())
+
+/**
+ * GI_CALLBACK_INFO:
+ * @info: Info object which is subject to casting.
+ *
+ * Casts a [type@GIRepository.CallbackInfo] or derived pointer into a
+ * `(GICallbackInfo*)` pointer.
+ *
+ * Depending on the current debugging level, this function may invoke
+ * certain runtime checks to identify invalid casts.
+ *
+ * Since: 2.80
+ */
+#define GI_CALLBACK_INFO(info) (G_TYPE_CHECK_INSTANCE_CAST ((info), GI_TYPE_CALLBACK_INFO, GICallbackInfo))
+
 /**
  * GI_IS_CALLBACK_INFO:
  * @info: an info structure
@@ -39,7 +55,6 @@ G_BEGIN_DECLS
  *
  * Since: 2.80
  */
-#define GI_IS_CALLBACK_INFO(info)					\
-    (gi_base_info_get_info_type ((GIBaseInfo*) info) == GI_INFO_TYPE_CALLBACK)
+#define GI_IS_CALLBACK_INFO(info) (G_TYPE_CHECK_INSTANCE_TYPE ((info), GI_TYPE_CALLBACK_INFO))
 
 G_END_DECLS

package/include/glib-2.0/girepository/giconstantinfo.h

@@ -32,16 +32,31 @@
 
 G_BEGIN_DECLS
 
+#define GI_TYPE_CONSTANT_INFO (gi_constant_info_get_type ())
+
+/**
+ * GI_CONSTANT_INFO:
+ * @info: Info object which is subject to casting.
+ *
+ * Casts a [type@GIRepository.ConstantInfo] or derived pointer into a
+ * `(GIConstantInfo*)` pointer.
+ *
+ * Depending on the current debugging level, this function may invoke
+ * certain runtime checks to identify invalid casts.
+ *
+ * Since: 2.80
+ */
+#define GI_CONSTANT_INFO(info) (G_TYPE_CHECK_INSTANCE_CAST ((info), GI_TYPE_CONSTANT_INFO, GIConstantInfo))
+
 /**
  * GI_IS_CONSTANT_INFO:
  * @info: an info structure
  *
- * Checks if @info is a [class@GIRepository.ConstantInfo].
+ * Checks if @info is a [class@GIRepository.ConstantInfo] (or a derived type).
  *
  * Since: 2.80
  */
-#define GI_IS_CONSTANT_INFO(info) \
-    (gi_base_info_get_info_type ((GIBaseInfo*) info) ==  GI_INFO_TYPE_CONSTANT)
+#define GI_IS_CONSTANT_INFO(info) (G_TYPE_CHECK_INSTANCE_TYPE ((info), GI_TYPE_CONSTANT_INFO))
 
 
 GI_AVAILABLE_IN_ALL
@@ -52,6 +67,6 @@ void         gi_constant_info_free_value (GIConstantInfo *info,
                                           GIArgument     *value);
 
 GI_AVAILABLE_IN_ALL
-gsize        gi_constant_info_get_value (GIConstantInfo *info,
+size_t       gi_constant_info_get_value (GIConstantInfo *info,
                                          GIArgument     *value);
 G_END_DECLS

package/include/glib-2.0/girepository/gienuminfo.h

@@ -32,52 +32,51 @@
 
 G_BEGIN_DECLS
 
+#define GI_TYPE_ENUM_INFO (gi_enum_info_get_type ())
+
 /**
- * GI_IS_ENUM_INFO:
- * @info: an info structure
+ * GI_ENUM_INFO:
+ * @info: Info object which is subject to casting.
+ *
+ * Casts a [type@GIRepository.EnumInfo] or derived pointer into a
+ * `(GIEnumInfo*)` pointer.
  *
- * Checks if @info is a [class@GIRepository.EnumInfo].
+ * Depending on the current debugging level, this function may invoke
+ * certain runtime checks to identify invalid casts.
  *
  * Since: 2.80
  */
-#define GI_IS_ENUM_INFO(info) \
-    ((gi_base_info_get_info_type ((GIBaseInfo*) info) ==  GI_INFO_TYPE_ENUM) || \
-     (gi_base_info_get_info_type ((GIBaseInfo*) info) ==  GI_INFO_TYPE_FLAGS))
+#define GI_ENUM_INFO(info) (G_TYPE_CHECK_INSTANCE_CAST ((info), GI_TYPE_ENUM_INFO, GIEnumInfo))
 
 /**
- * GI_IS_VALUE_INFO:
+ * GI_IS_ENUM_INFO:
  * @info: an info structure
  *
- * Checks if @info is a [class@GIRepository.ValueInfo].
+ * Checks if @info is a [class@GIRepository.EnumInfo] (or a derived type).
  *
  * Since: 2.80
  */
-#define GI_IS_VALUE_INFO(info) \
-    (gi_base_info_get_info_type ((GIBaseInfo*) info) ==  GI_INFO_TYPE_VALUE)
+#define GI_IS_ENUM_INFO(info) (G_TYPE_CHECK_INSTANCE_TYPE ((info), GI_TYPE_ENUM_INFO))
 
 
 GI_AVAILABLE_IN_ALL
-guint          gi_enum_info_get_n_values      (GIEnumInfo  *info);
+unsigned int   gi_enum_info_get_n_values      (GIEnumInfo  *info);
 
 GI_AVAILABLE_IN_ALL
-GIValueInfo  * gi_enum_info_get_value         (GIEnumInfo *info,
-                                               guint       n);
+GIValueInfo  * gi_enum_info_get_value         (GIEnumInfo  *info,
+                                               unsigned int n);
 
 GI_AVAILABLE_IN_ALL
-guint             gi_enum_info_get_n_methods  (GIEnumInfo  *info);
+unsigned int      gi_enum_info_get_n_methods  (GIEnumInfo  *info);
 
 GI_AVAILABLE_IN_ALL
-GIFunctionInfo  * gi_enum_info_get_method     (GIEnumInfo *info,
-                                               guint       n);
+GIFunctionInfo  * gi_enum_info_get_method     (GIEnumInfo  *info,
+                                               unsigned int n);
 
 GI_AVAILABLE_IN_ALL
 GITypeTag      gi_enum_info_get_storage_type  (GIEnumInfo  *info);
 
 GI_AVAILABLE_IN_ALL
-const gchar *  gi_enum_info_get_error_domain  (GIEnumInfo  *info);
-
-
-GI_AVAILABLE_IN_ALL
-gint64         gi_value_info_get_value        (GIValueInfo *info);
+const char *   gi_enum_info_get_error_domain   (GIEnumInfo  *info);
 
 G_END_DECLS