@img/sharp-libvips-dev 1.0.1 → 1.0.2

package/include/expat.h

@@ -11,11 +11,14 @@
    Copyright (c) 2000-2005 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
    Copyright (c) 2001-2002 Greg Stein <gstein@users.sourceforge.net>
    Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
-   Copyright (c) 2016-2022 Sebastian Pipping <sebastian@pipping.org>
+   Copyright (c) 2016-2024 Sebastian Pipping <sebastian@pipping.org>
    Copyright (c) 2016      Cristian Rodríguez <crrodriguez@opensuse.org>
    Copyright (c) 2016      Thomas Beutlich <tc@tbeu.de>
    Copyright (c) 2017      Rhodri James <rhodri@wildebeest.org.uk>
    Copyright (c) 2022      Thijs Schreijer <thijs@thijsschreijer.nl>
+   Copyright (c) 2023      Hanno Böck <hanno@gentoo.org>
+   Copyright (c) 2023      Sony Corporation / Snild Dolkow <snild@sony.com>
+   Copyright (c) 2024      Taichi Haradaguchi <20001722@ymail.ne.jp>
    Licensed under the MIT license:
 
    Permission is  hereby granted,  free of charge,  to any  person obtaining
@@ -269,7 +272,7 @@ XML_ParserCreate_MM(const XML_Char *encoding,
                     const XML_Memory_Handling_Suite *memsuite,
                     const XML_Char *namespaceSeparator);
 
-/* Prepare a parser object to be re-used.  This is particularly
+/* Prepare a parser object to be reused.  This is particularly
    valuable when memory allocation overhead is disproportionately high,
    such as when a large number of small documnents need to be parsed.
    All handlers are cleared from the parser, except for the
@@ -951,7 +954,7 @@ XMLPARSEAPI(XML_Index) XML_GetCurrentByteIndex(XML_Parser parser);
 XMLPARSEAPI(int)
 XML_GetCurrentByteCount(XML_Parser parser);
 
-/* If XML_CONTEXT_BYTES is defined, returns the input buffer, sets
+/* If XML_CONTEXT_BYTES is >=1, returns the input buffer, sets
    the integer pointed to by offset to the offset within this buffer
    of the current parse position, and sets the integer pointed to by size
    to the size of this buffer (the number of input bytes). Otherwise
@@ -1025,7 +1028,9 @@ enum XML_FeatureEnum {
   XML_FEATURE_ATTR_INFO,
   /* Added in Expat 2.4.0. */
   XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT,
-  XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT
+  XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT,
+  /* Added in Expat 2.6.0. */
+  XML_FEATURE_GE
   /* Additional features must be added to the end of this enum. */
 };
 
@@ -1038,24 +1043,30 @@ typedef struct {
 XMLPARSEAPI(const XML_Feature *)
 XML_GetFeatureList(void);
 
-#ifdef XML_DTD
-/* Added in Expat 2.4.0. */
+#if defined(XML_DTD) || (defined(XML_GE) && XML_GE == 1)
+/* Added in Expat 2.4.0 for XML_DTD defined and
+ * added in Expat 2.6.0 for XML_GE == 1. */
 XMLPARSEAPI(XML_Bool)
 XML_SetBillionLaughsAttackProtectionMaximumAmplification(
     XML_Parser parser, float maximumAmplificationFactor);
 
-/* Added in Expat 2.4.0. */
+/* Added in Expat 2.4.0 for XML_DTD defined and
+ * added in Expat 2.6.0 for XML_GE == 1. */
 XMLPARSEAPI(XML_Bool)
 XML_SetBillionLaughsAttackProtectionActivationThreshold(
     XML_Parser parser, unsigned long long activationThresholdBytes);
 #endif
 
+/* Added in Expat 2.6.0. */
+XMLPARSEAPI(XML_Bool)
+XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);
+
 /* Expat follows the semantic versioning convention.
-   See http://semver.org.
+   See https://semver.org
 */
 #define XML_MAJOR_VERSION 2
-#define XML_MINOR_VERSION 5
-#define XML_MICRO_VERSION 0
+#define XML_MINOR_VERSION 6
+#define XML_MICRO_VERSION 2
 
 #ifdef __cplusplus
 }

package/include/expat_config.h

@@ -16,6 +16,9 @@
 /* Define to 1 if you have the `arc4random_buf' function. */
 /* #undef HAVE_ARC4RANDOM_BUF */
 
+/* define if the compiler supports basic C++11 syntax */
+/* #undef HAVE_CXX11 */
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
 
@@ -74,13 +77,13 @@
 #define PACKAGE "expat"
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "expat-bugs@libexpat.org"
+#define PACKAGE_BUGREPORT "https://github.com/libexpat/libexpat/issues"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "expat"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "expat 2.5.0"
+#define PACKAGE_STRING "expat 2.6.2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "expat"
@@ -89,7 +92,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.5.0"
+#define PACKAGE_VERSION "2.6.2"
 
 /* Define to 1 if all of the C90 standard headers exist (not just the ones
    required in a freestanding environment). This macro is provided for
@@ -97,7 +100,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "2.5.0"
+#define VERSION "2.6.2"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
@@ -116,7 +119,7 @@
 /* #undef XML_ATTR_INFO */
 
 /* Define to specify how much context to retain around the current parse
-   point. */
+   point, 0 to disable. */
 #define XML_CONTEXT_BYTES 1024
 
 /* Define to include code reading entropy from `/dev/urandom'. */
@@ -125,6 +128,9 @@
 /* Define to make parameter entity parsing functionality available. */
 #define XML_DTD 1
 
+/* Define as 1/0 to enable/disable support for general entities. */
+#define XML_GE 1
+
 /* Define to make XML Namespaces functionality available. */
 #define XML_NS 1
 

package/include/ffi.h

@@ -1,6 +1,6 @@
 /* -----------------------------------------------------------------*-C-*-
-   libffi 3.4.4
-     - Copyright (c) 2011, 2014, 2019, 2021, 2022 Anthony Green
+   libffi 3.4.6
+     - Copyright (c) 2011, 2014, 2019, 2021, 2022, 2024 Anthony Green
      - Copyright (c) 1996-2003, 2007, 2008 Red Hat, Inc.
 
    Permission is hereby granted, free of charge, to any person
@@ -140,13 +140,11 @@ typedef struct _ffi_type
    when using the static version of the library.
    Besides, as a workaround, they can define FFI_BUILDING if they
    *know* they are going to link with the static library.  */
-#if defined _MSC_VER
+#if defined _MSC_VER && !defined(FFI_STATIC_BUILD)
 # if defined FFI_BUILDING_DLL /* Building libffi.DLL with msvcc.sh */
 #  define FFI_API __declspec(dllexport)
-# elif !defined FFI_BUILDING  /* Importing libffi.DLL */
+# else  /* Importing libffi.DLL */
 #  define FFI_API __declspec(dllimport)
-# else                        /* Building/linking static library */
-#  define FFI_API
 # endif
 #else
 # define FFI_API
@@ -222,21 +220,12 @@ FFI_EXTERN ffi_type ffi_type_sint64;
 FFI_EXTERN ffi_type ffi_type_float;
 FFI_EXTERN ffi_type ffi_type_double;
 FFI_EXTERN ffi_type ffi_type_pointer;
-
-#if 1
 FFI_EXTERN ffi_type ffi_type_longdouble;
-#else
-#define ffi_type_longdouble ffi_type_double
-#endif
 
 #ifdef FFI_TARGET_HAS_COMPLEX_TYPE
 FFI_EXTERN ffi_type ffi_type_complex_float;
 FFI_EXTERN ffi_type ffi_type_complex_double;
-#if 1
 FFI_EXTERN ffi_type ffi_type_complex_longdouble;
-#else
-#define ffi_type_complex_longdouble ffi_type_complex_double
-#endif
 #endif
 #endif /* LIBFFI_HIDE_BASIC_TYPES */
 
@@ -363,14 +352,6 @@ typedef struct {
 FFI_API void *ffi_closure_alloc (size_t size, void **code);
 FFI_API void ffi_closure_free (void *);
 
-#if defined(PA_LINUX) || defined(PA_HPUX)
-#define FFI_CLOSURE_PTR(X) ((void *)((unsigned int)(X) | 2))
-#define FFI_RESTORE_PTR(X) ((void *)((unsigned int)(X) & ~3))
-#else
-#define FFI_CLOSURE_PTR(X) (X)
-#define FFI_RESTORE_PTR(X) (X)
-#endif
-
 FFI_API ffi_status
 ffi_prep_closure (ffi_closure*,
 		  ffi_cif *,
@@ -474,7 +455,7 @@ ffi_prep_java_raw_closure_loc (ffi_java_raw_closure*,
 
 #endif /* FFI_CLOSURES */
 
-#if FFI_GO_CLOSURES
+#ifdef FFI_GO_CLOSURES
 
 typedef struct {
   void      *tramp;
@@ -517,8 +498,14 @@ FFI_API
 ffi_status ffi_get_struct_offsets (ffi_abi abi, ffi_type *struct_type,
 				   size_t *offsets);
 
-/* Useful for eliminating compiler warnings.  */
+/* Convert between closure and function pointers.  */
+#if defined(PA_LINUX) || defined(PA_HPUX)
+#define FFI_FN(f) ((void (*)(void))((unsigned int)(f) | 2))
+#define FFI_CL(f) ((void *)((unsigned int)(f) & ~3))
+#else
 #define FFI_FN(f) ((void (*)(void))f)
+#define FFI_CL(f) ((void *)(f))
+#endif
 
 /* ---- Definitions shared with assembly code ---------------------------- */
 

package/include/freetype2/freetype/config/ftoption.h

@@ -290,7 +290,7 @@ FT_BEGIN_HEADER
    *   options set by those programs have precedence, overwriting the value
    *   here with the configured one.
    */
-/* #define FT_CONFIG_OPTION_USE_HARFBUZZ */
+#define FT_CONFIG_OPTION_USE_HARFBUZZ
 
 
   /**************************************************************************

package/include/gio-unix-2.0/gio/gfiledescriptorbased.h

@@ -27,14 +27,15 @@
 
 G_BEGIN_DECLS
 
+typedef struct _GFileDescriptorBased        GFileDescriptorBased;
+typedef struct _GFileDescriptorBasedIface   GFileDescriptorBasedIface;
+
 #define G_TYPE_FILE_DESCRIPTOR_BASED            (g_file_descriptor_based_get_type ())
 #define G_FILE_DESCRIPTOR_BASED(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_FILE_DESCRIPTOR_BASED, GFileDescriptorBased))
 #define G_IS_FILE_DESCRIPTOR_BASED(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_FILE_DESCRIPTOR_BASED))
 #define G_FILE_DESCRIPTOR_BASED_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_FILE_DESCRIPTOR_BASED, GFileDescriptorBasedIface))
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GFileDescriptorBased, g_object_unref)
 
-typedef struct _GFileDescriptorBasedIface   GFileDescriptorBasedIface;
-
 /**
  * GFileDescriptorBasedIface:
  * @g_iface: The parent interface.

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/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/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