@img/sharp-libvips-dev 0.0.3 → 1.0.1

package/include/glib-2.0/glib-unix.h

@@ -1,5 +1,6 @@
 /* glib-unix.h - Unix specific integration
  * Copyright (C) 2011 Red Hat, Inc.
+ * Copyright 2023 Collabora Ltd.
  *
  * SPDX-License-Identifier: LGPL-2.1-or-later
  *
@@ -33,6 +34,7 @@
 #include <fcntl.h>
 
 #include <glib.h>
+#include <glib/gstdio.h>
 
 #ifndef G_OS_UNIX
 #error "This header may only be used on UNIX"
@@ -120,6 +122,212 @@ GLIB_AVAILABLE_IN_2_64
 struct passwd *g_unix_get_passwd_entry (const gchar  *user_name,
                                         GError      **error);
 
+/**
+ * GUnixPipe:
+ * @fds: A pair of file descriptors, each negative if closed or not yet opened.
+ *  The file descriptor with index %G_UNIX_PIPE_END_READ is readable.
+ *  The file descriptor with index %G_UNIX_PIPE_END_WRITE is writable.
+ *
+ * A Unix pipe. The advantage of this type over `int[2]` is that it can
+ * be closed automatically when it goes out of scope, using `g_auto(GUnixPipe)`,
+ * on compilers that support that feature.
+ *
+ * Since: 2.80
+ */
+GLIB_AVAILABLE_TYPE_IN_2_80
+typedef struct {
+  int fds[2];
+} GUnixPipe;
+
+/**
+ * GUnixPipeEnd:
+ * @G_UNIX_PIPE_END_READ: The readable file descriptor 0
+ * @G_UNIX_PIPE_END_WRITE: The writable file descriptor 1
+ *
+ * Mnemonic constants for the ends of a Unix pipe.
+ *
+ * Since: 2.80
+ */
+GLIB_AVAILABLE_TYPE_IN_2_80
+typedef enum
+{
+  G_UNIX_PIPE_END_READ = 0,
+  G_UNIX_PIPE_END_WRITE = 1
+} GUnixPipeEnd;
+
+/**
+ * G_UNIX_PIPE_INIT:
+ *
+ * Initializer for a #GUnixPipe that has not yet been opened.
+ * Both of its file descriptors are initialized to `-1` (invalid),
+ * the same as if they had been closed.
+ *
+ * Since: 2.80
+ */
+#define G_UNIX_PIPE_INIT { { -1, -1 } } GLIB_AVAILABLE_MACRO_IN_2_80
+
+/* Suppress "Not available before" warnings when declaring the
+ * implementations */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+
+/**
+ * g_unix_pipe_open:
+ * @self: A pair of file descriptors
+ * @flags: Flags to pass to g_unix_open_pipe(), typically `FD_CLOEXEC`
+ * @error: Used to report an error on failure
+ *
+ * Open a pipe. This is the same as g_unix_open_pipe(), but uses the
+ * #GUnixPipe data structure.
+ *
+ * Returns: %TRUE on success
+ *
+ * Since: 2.80
+ */
+GLIB_AVAILABLE_STATIC_INLINE_IN_2_80
+static inline gboolean
+g_unix_pipe_open (GUnixPipe *self,
+                  int flags,
+                  GError **error)
+{
+  return g_unix_open_pipe (self->fds, flags, error);
+}
+
+/**
+ * g_unix_pipe_get:
+ * @self: A pair of file descriptors
+ * @end: One of the ends of the pipe
+ *
+ * Return one of the ends of the pipe. It remains owned by @self.
+ *
+ * This function is async-signal safe (see [`signal(7)`](man:signal(7)) and
+ * [`signal-safety(7)`](man:signal-safety(7))), making it safe to call from a
+ * signal handler or a #GSpawnChildSetupFunc.
+ *
+ * This function preserves the value of `errno`.
+ *
+ * Returns: a non-negative file descriptor owned by @self, which must not
+ *  be closed by the caller, or a negative number if the corresponding
+ *  end of the pipe was already closed or stolen
+ *
+ * Since: 2.80
+ */
+GLIB_AVAILABLE_STATIC_INLINE_IN_2_80
+static inline int
+g_unix_pipe_get (GUnixPipe *self,
+                 GUnixPipeEnd end)
+{
+  return self->fds[end];
+}
+
+/**
+ * g_unix_pipe_steal:
+ * @self: A pair of file descriptors
+ * @end: One of the ends of the pipe
+ *
+ * Return one of the ends of the pipe. It becomes owned by the caller,
+ * and the file descriptor in the data structure is set to `-1`,
+ * similar to g_steal_fd().
+ *
+ * This function is async-signal safe (see [`signal(7)`](man:signal(7)) and
+ * [`signal-safety(7)`](man:signal-safety(7))), making it safe to call from a
+ * signal handler or a #GSpawnChildSetupFunc.
+ *
+ * This function preserves the value of `errno`.
+ *
+ * Returns: a non-negative file descriptor, which becomes owned by the
+ *  caller and must be closed by the caller if required, or a negative
+ *  number if the corresponding end of the pipe was already closed or stolen
+ *
+ * Since: 2.80
+ */
+GLIB_AVAILABLE_STATIC_INLINE_IN_2_80
+static inline int
+g_unix_pipe_steal (GUnixPipe *self,
+                   GUnixPipeEnd end)
+{
+  return g_steal_fd (&self->fds[end]);
+}
+
+/**
+ * g_unix_pipe_close:
+ * @self: A pair of file descriptors
+ * @end: One of the ends of the pipe
+ * @error: Optionally used to report an error on failure
+ *
+ * Close one of the ends of the pipe and set the relevant member of @fds
+ * to `-1` before returning, equivalent to g_clear_fd().
+ *
+ * Like g_close(), if closing the file descriptor fails, the error is
+ * stored in both %errno and @error. If this function succeeds,
+ * %errno is undefined.
+ *
+ * This function is async-signal safe if @error is %NULL and the relevant
+ * member of @fds is either negative or a valid open file descriptor.
+ * This makes it safe to call from a signal handler or a #GSpawnChildSetupFunc
+ * under those conditions.
+ * See [`signal(7)`](man:signal(7)) and
+ * [`signal-safety(7)`](man:signal-safety(7)) for more details.
+ *
+ * To close both file descriptors and ignore any errors, use
+ * g_unix_pipe_clear() instead.
+ *
+ * Returns: %TRUE on success
+ *
+ * Since: 2.80
+ */
+GLIB_AVAILABLE_STATIC_INLINE_IN_2_80
+static inline gboolean
+g_unix_pipe_close (GUnixPipe *self,
+                   GUnixPipeEnd end,
+                   GError **error)
+{
+  return g_clear_fd (&self->fds[end], error);
+}
+
+/**
+ * g_unix_pipe_clear:
+ * @self: a #GUnixPipe
+ *
+ * Close both ends of the pipe, unless they have already been closed or
+ * stolen. Any errors are ignored: use g_unix_pipe_close() or g_clear_fd()
+ * if error-handling is required.
+ *
+ * This function is async-signal safe if @error is %NULL and each member
+ * of @fds are either negative or a valid open file descriptor.
+ * As a result, it is safe to call this function or use `g_auto(GUnixPipe)`
+ * (on compilers that support it) in a signal handler or a
+ * #GSpawnChildSetupFunc, as long as those conditions are ensured to be true.
+ * See [`signal(7)`](man:signal(7)) and
+ * [`signal-safety(7)`](man:signal-safety(7)) for more details.
+ *
+ * This function preserves the value of `errno`.
+ *
+ * Since: 2.80
+ */
+GLIB_AVAILABLE_STATIC_INLINE_IN_2_80
+static inline void
+g_unix_pipe_clear (GUnixPipe *self)
+{
+  /* Don't overwrite thread-local errno if closing the fd fails */
+  int errsv = errno;
+
+  if (!g_unix_pipe_close (self, G_UNIX_PIPE_END_READ, NULL))
+    {
+      /* ignore */
+    }
+
+  if (!g_unix_pipe_close (self, G_UNIX_PIPE_END_WRITE, NULL))
+    {
+      /* ignore */
+    }
+
+  errno = errsv;
+}
+
+G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC (GUnixPipe, g_unix_pipe_clear)
+
+G_GNUC_END_IGNORE_DEPRECATIONS
+
 G_END_DECLS
 
 #endif  /* __G_UNIX_H__ */

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

@@ -950,3 +950,37 @@
 #define GMODULE_AVAILABLE_ENUMERATOR_IN_2_78
 #define GMODULE_AVAILABLE_TYPE_IN_2_78
 #endif
+
+#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_80
+#define GMODULE_DEPRECATED_IN_2_80 GMODULE_DEPRECATED
+#define GMODULE_DEPRECATED_IN_2_80_FOR(f) GMODULE_DEPRECATED_FOR (f)
+#define GMODULE_DEPRECATED_MACRO_IN_2_80 GLIB_DEPRECATED_MACRO
+#define GMODULE_DEPRECATED_MACRO_IN_2_80_FOR(f) GLIB_DEPRECATED_MACRO_FOR (f)
+#define GMODULE_DEPRECATED_ENUMERATOR_IN_2_80 GLIB_DEPRECATED_ENUMERATOR
+#define GMODULE_DEPRECATED_ENUMERATOR_IN_2_80_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR (f)
+#define GMODULE_DEPRECATED_TYPE_IN_2_80 GLIB_DEPRECATED_TYPE
+#define GMODULE_DEPRECATED_TYPE_IN_2_80_FOR(f) GLIB_DEPRECATED_TYPE_FOR (f)
+#else
+#define GMODULE_DEPRECATED_IN_2_80 _GMODULE_EXTERN
+#define GMODULE_DEPRECATED_IN_2_80_FOR(f) _GMODULE_EXTERN
+#define GMODULE_DEPRECATED_MACRO_IN_2_80
+#define GMODULE_DEPRECATED_MACRO_IN_2_80_FOR(f)
+#define GMODULE_DEPRECATED_ENUMERATOR_IN_2_80
+#define GMODULE_DEPRECATED_ENUMERATOR_IN_2_80_FOR(f)
+#define GMODULE_DEPRECATED_TYPE_IN_2_80
+#define GMODULE_DEPRECATED_TYPE_IN_2_80_FOR(f)
+#endif
+
+#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_80
+#define GMODULE_AVAILABLE_IN_2_80 GMODULE_UNAVAILABLE (2, 80)
+#define GMODULE_AVAILABLE_STATIC_INLINE_IN_2_80 GLIB_UNAVAILABLE_STATIC_INLINE (2, 80)
+#define GMODULE_AVAILABLE_MACRO_IN_2_80 GLIB_UNAVAILABLE_MACRO (2, 80)
+#define GMODULE_AVAILABLE_ENUMERATOR_IN_2_80 GLIB_UNAVAILABLE_ENUMERATOR (2, 80)
+#define GMODULE_AVAILABLE_TYPE_IN_2_80 GLIB_UNAVAILABLE_TYPE (2, 80)
+#else
+#define GMODULE_AVAILABLE_IN_2_80 _GMODULE_EXTERN
+#define GMODULE_AVAILABLE_STATIC_INLINE_IN_2_80
+#define GMODULE_AVAILABLE_MACRO_IN_2_80
+#define GMODULE_AVAILABLE_ENUMERATOR_IN_2_80
+#define GMODULE_AVAILABLE_TYPE_IN_2_80
+#endif

package/include/glib-2.0/gobject/gbinding.h

@@ -38,14 +38,6 @@ G_BEGIN_DECLS
 #define G_BINDING(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_BINDING, GBinding))
 #define G_IS_BINDING(obj)       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_BINDING))
 
-/**
- * GBinding:
- *
- * GBinding is an opaque structure whose members
- * cannot be accessed directly.
- *
- * Since: 2.26
- */
 typedef struct _GBinding        GBinding;
 
 /**

package/include/glib-2.0/gobject/gbindinggroup.h

@@ -36,14 +36,6 @@ G_BEGIN_DECLS
 #define G_IS_BINDING_GROUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_BINDING_GROUP))
 #define G_TYPE_BINDING_GROUP    (g_binding_group_get_type())
 
-/**
- * GBindingGroup:
- *
- * GBindingGroup is an opaque structure whose members
- * cannot be accessed directly.
- *
- * Since: 2.72
- */
 typedef struct _GBindingGroup GBindingGroup;
 
 GOBJECT_AVAILABLE_IN_2_72

package/include/glib-2.0/gobject/gclosure.h

@@ -169,15 +169,7 @@ struct _GClosureNotifyData
   gpointer       data;
   GClosureNotify notify;
 };
-/**
- * GClosure:
- * @in_marshal: Indicates whether the closure is currently being invoked with 
- *  g_closure_invoke()
- * @is_invalid: Indicates whether the closure has been invalidated by 
- *  g_closure_invalidate()
- * 
- * A #GClosure represents a callback supplied by the programmer.
- */
+
 struct _GClosure
 {
   /*< private >*/

package/include/glib-2.0/gobject/glib-types.h

@@ -327,6 +327,33 @@ typedef gsize GType;
  */
 #define G_TYPE_BOOKMARK_FILE (g_bookmark_file_get_type ())
 
+/**
+ * G_TYPE_HMAC:
+ *
+ * The #GType for a boxed type holding a #GHmac.
+ *
+ * Since: 2.80
+ */
+#define G_TYPE_HMAC (g_hmac_get_type ())
+
+/**
+ * G_TYPE_DIR:
+ *
+ * The #GType for a boxed type holding a #GDir.
+ *
+ * Since: 2.80
+ */
+#define G_TYPE_DIR (g_dir_get_type ())
+
+/**
+ * G_TYPE_STRV_BUILDER:
+ *
+ * The #GType for a boxed type holding a #GStrvBuilder.
+ *
+ * Since: 2.80
+ */
+#define G_TYPE_STRV_BUILDER (g_strv_builder_get_type ())
+
 GOBJECT_AVAILABLE_IN_ALL
 GType   g_date_get_type            (void) G_GNUC_CONST;
 GOBJECT_AVAILABLE_IN_ALL
@@ -391,6 +418,12 @@ GOBJECT_AVAILABLE_IN_2_70
 GType g_pattern_spec_get_type (void) G_GNUC_CONST;
 GOBJECT_AVAILABLE_IN_2_76
 GType   g_bookmark_file_get_type   (void) G_GNUC_CONST;
+GOBJECT_AVAILABLE_IN_2_80
+GType   g_hmac_get_type (void) G_GNUC_CONST;
+GOBJECT_AVAILABLE_IN_2_80
+GType   g_dir_get_type (void) G_GNUC_CONST;
+GOBJECT_AVAILABLE_IN_2_80
+GType   g_strv_builder_get_type (void) G_GNUC_CONST;
 
 GOBJECT_DEPRECATED_FOR('G_TYPE_VARIANT')
 GType   g_variant_get_gtype        (void) G_GNUC_CONST;

package/include/glib-2.0/gobject/gobject-autocleanups.h

@@ -23,6 +23,8 @@
 #error "Only <glib-object.h> can be included directly."
 #endif
 
+#ifndef __GI_SCANNER__
+
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GClosure, g_closure_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GEnumClass, g_type_class_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GFlagsClass, g_type_class_unref)
@@ -31,3 +33,5 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GInitiallyUnowned, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GParamSpec, g_param_spec_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GTypeClass, g_type_class_unref)
 G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(GValue, g_value_unset)
+
+#endif /* __GI_SCANNER__ */

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

@@ -950,3 +950,37 @@
 #define GOBJECT_AVAILABLE_ENUMERATOR_IN_2_78
 #define GOBJECT_AVAILABLE_TYPE_IN_2_78
 #endif
+
+#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_80
+#define GOBJECT_DEPRECATED_IN_2_80 GOBJECT_DEPRECATED
+#define GOBJECT_DEPRECATED_IN_2_80_FOR(f) GOBJECT_DEPRECATED_FOR (f)
+#define GOBJECT_DEPRECATED_MACRO_IN_2_80 GLIB_DEPRECATED_MACRO
+#define GOBJECT_DEPRECATED_MACRO_IN_2_80_FOR(f) GLIB_DEPRECATED_MACRO_FOR (f)
+#define GOBJECT_DEPRECATED_ENUMERATOR_IN_2_80 GLIB_DEPRECATED_ENUMERATOR
+#define GOBJECT_DEPRECATED_ENUMERATOR_IN_2_80_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR (f)
+#define GOBJECT_DEPRECATED_TYPE_IN_2_80 GLIB_DEPRECATED_TYPE
+#define GOBJECT_DEPRECATED_TYPE_IN_2_80_FOR(f) GLIB_DEPRECATED_TYPE_FOR (f)
+#else
+#define GOBJECT_DEPRECATED_IN_2_80 _GOBJECT_EXTERN
+#define GOBJECT_DEPRECATED_IN_2_80_FOR(f) _GOBJECT_EXTERN
+#define GOBJECT_DEPRECATED_MACRO_IN_2_80
+#define GOBJECT_DEPRECATED_MACRO_IN_2_80_FOR(f)
+#define GOBJECT_DEPRECATED_ENUMERATOR_IN_2_80
+#define GOBJECT_DEPRECATED_ENUMERATOR_IN_2_80_FOR(f)
+#define GOBJECT_DEPRECATED_TYPE_IN_2_80
+#define GOBJECT_DEPRECATED_TYPE_IN_2_80_FOR(f)
+#endif
+
+#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_80
+#define GOBJECT_AVAILABLE_IN_2_80 GOBJECT_UNAVAILABLE (2, 80)
+#define GOBJECT_AVAILABLE_STATIC_INLINE_IN_2_80 GLIB_UNAVAILABLE_STATIC_INLINE (2, 80)
+#define GOBJECT_AVAILABLE_MACRO_IN_2_80 GLIB_UNAVAILABLE_MACRO (2, 80)
+#define GOBJECT_AVAILABLE_ENUMERATOR_IN_2_80 GLIB_UNAVAILABLE_ENUMERATOR (2, 80)
+#define GOBJECT_AVAILABLE_TYPE_IN_2_80 GLIB_UNAVAILABLE_TYPE (2, 80)
+#else
+#define GOBJECT_AVAILABLE_IN_2_80 _GOBJECT_EXTERN
+#define GOBJECT_AVAILABLE_STATIC_INLINE_IN_2_80
+#define GOBJECT_AVAILABLE_MACRO_IN_2_80
+#define GOBJECT_AVAILABLE_ENUMERATOR_IN_2_80
+#define GOBJECT_AVAILABLE_TYPE_IN_2_80
+#endif

package/include/glib-2.0/gobject/gobject.h

@@ -248,22 +248,7 @@ typedef void (*GObjectFinalizeFunc)     (GObject      *object);
  */
 typedef void (*GWeakNotify)		(gpointer      data,
 					 GObject      *where_the_object_was);
-/**
- * GObject:
- *
- * The base object type.
- * 
- * All the fields in the `GObject` structure are private to the implementation
- * and should never be accessed directly.
- *
- * Since GLib 2.72, all #GObjects are guaranteed to be aligned to at least the
- * alignment of the largest basic GLib type (typically this is #guint64 or
- * #gdouble). If you need larger alignment for an element in a #GObject, you
- * should allocate it on the heap (aligned), or arrange for your #GObject to be
- * appropriately padded. This guarantee applies to the #GObject (or derived)
- * struct, the #GObjectClass (or derived) struct, and any private data allocated
- * by G_ADD_PRIVATE().
- */
+
 struct  _GObject
 {
   GTypeInstance  g_type_instance;

package/include/glib-2.0/gobject/gparam.h

@@ -203,17 +203,7 @@ typedef struct _GParamSpec      GParamSpec;
 typedef struct _GParamSpecClass GParamSpecClass;
 typedef struct _GParameter	GParameter GOBJECT_DEPRECATED_TYPE_IN_2_54;
 typedef struct _GParamSpecPool  GParamSpecPool;
-/**
- * GParamSpec: (ref-func g_param_spec_ref_sink) (unref-func g_param_spec_unref) (set-value-func g_value_set_param) (get-value-func g_value_get_param)
- * @g_type_instance: private #GTypeInstance portion
- * @name: name of this parameter: always an interned string
- * @flags: #GParamFlags flags for this parameter
- * @value_type: the #GValue type for this parameter
- * @owner_type: #GType type that uses (introduces) this parameter
- * 
- * All other fields of the GParamSpec struct are private and
- * should not be used directly.
- */
+
 struct _GParamSpec
 {
   GTypeInstance  g_type_instance;
@@ -453,7 +443,8 @@ GOBJECT_AVAILABLE_IN_ALL
 GParamSpec**	g_param_spec_pool_list		(GParamSpecPool	*pool,
 						 GType		 owner_type,
 						 guint		*n_pspecs_p);
-
+GOBJECT_AVAILABLE_IN_2_80
+void            g_param_spec_pool_free          (GParamSpecPool *pool);
 
 /* contracts:
  *

package/include/glib-2.0/gobject/gsignal.h

@@ -504,7 +504,7 @@ void   g_signal_chain_from_overridden_handler (gpointer           instance,
  * 
  * The handler will be called synchronously, before the default handler of the signal. g_signal_emit() will not return control until all handlers are called.
  *
- * See [memory management of signal handlers][signal-memory-management] for
+ * See [memory management of signal handlers][signals.html#Memory_management_of_signal_handlers] for
  * details on how to handle the return value and memory management of @data.
  * 
  * Returns: the handler ID, of type #gulong (always greater than 0 for successful connections)

package/include/glib-2.0/gobject/gsignalgroup.h

@@ -36,14 +36,6 @@ G_BEGIN_DECLS
 #define G_IS_SIGNAL_GROUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_SIGNAL_GROUP))
 #define G_TYPE_SIGNAL_GROUP    (g_signal_group_get_type())
 
-/**
- * GSignalGroup:
- *
- * #GSignalGroup is an opaque structure whose members
- * cannot be accessed directly.
- *
- * Since: 2.72
- */
 typedef struct _GSignalGroup GSignalGroup;
 
 GOBJECT_AVAILABLE_IN_2_72

package/include/glib-2.0/gobject/gtype.h

@@ -421,9 +421,11 @@ G_BEGIN_DECLS
  * A numerical value which represents the unique identifier of a registered
  * type.
  */
-#if     GLIB_SIZEOF_SIZE_T != GLIB_SIZEOF_LONG || !defined (G_CXX_STD_VERSION)
+#if     GLIB_SIZEOF_VOID_P > GLIB_SIZEOF_SIZE_T
+typedef guintptr                        GType;
+#elif     GLIB_SIZEOF_SIZE_T != GLIB_SIZEOF_LONG || !defined (G_CXX_STD_VERSION)
 typedef gsize                           GType;
-#else   /* for historic reasons, C++ links against gulong GTypes */
+#else   /* for historic reasons, C++ on non-Morello/CHERI systems links against gulong GTypes */
 typedef gulong                          GType;
 #endif
 typedef struct _GValue                  GValue;
@@ -2009,8 +2011,8 @@ guint     g_type_get_type_registration_serial (void);
  * GType
  * gtk_gadget_get_type (void)
  * {
- *   static gsize static_g_define_type_id = 0;
- *   if (g_once_init_enter (&static_g_define_type_id))
+ *   static GType static_g_define_type_id = 0;
+ *   if (g_once_init_enter_pointer (&static_g_define_type_id))
  *     {
  *       GType g_define_type_id =
  *         g_type_register_static_simple (GTK_TYPE_WIDGET,
@@ -2030,7 +2032,7 @@ guint     g_type_get_type_registration_serial (void);
  *         };
  *         g_type_add_interface_static (g_define_type_id, TYPE_GIZMO, &g_implement_interface_info);
  *       }
- *       g_once_init_leave (&static_g_define_type_id, g_define_type_id);
+ *       g_once_init_leave_pointer (&static_g_define_type_id, g_define_type_id);
  *     }
  *   return static_g_define_type_id;
  * }
@@ -2265,6 +2267,16 @@ static void     type_name##_class_intern_init (gpointer klass) \
 }
 #endif /* GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 */
 
+#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_80
+#define _g_type_once_init_type GType
+#define _g_type_once_init_enter g_once_init_enter_pointer
+#define _g_type_once_init_leave g_once_init_leave_pointer
+#else  /* if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_80 */
+#define _g_type_once_init_type gsize
+#define _g_type_once_init_enter g_once_init_enter
+#define _g_type_once_init_leave g_once_init_leave
+#endif  /* GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_80 */
+
 /* Added for _G_DEFINE_TYPE_EXTENDED_WITH_PRELUDE */
 #define _G_DEFINE_TYPE_EXTENDED_BEGIN_PRE(TypeName, type_name, TYPE_PARENT) \
 \
@@ -2286,15 +2298,15 @@ type_name##_get_instance_private (TypeName *self) \
 GType \
 type_name##_get_type (void) \
 { \
-  static gsize static_g_define_type_id = 0;
+  static _g_type_once_init_type static_g_define_type_id = 0;
   /* Prelude goes here */
 
 /* Added for _G_DEFINE_TYPE_EXTENDED_WITH_PRELUDE */
 #define _G_DEFINE_TYPE_EXTENDED_BEGIN_REGISTER(TypeName, type_name, TYPE_PARENT, flags) \
-  if (g_once_init_enter (&static_g_define_type_id)) \
+  if (_g_type_once_init_enter (&static_g_define_type_id)) \
     { \
       GType g_define_type_id = type_name##_get_type_once (); \
-      g_once_init_leave (&static_g_define_type_id, g_define_type_id); \
+      _g_type_once_init_leave (&static_g_define_type_id, g_define_type_id); \
     }					\
   return static_g_define_type_id; \
 } /* closes type_name##_get_type() */ \
@@ -2334,8 +2346,8 @@ static void     type_name##_default_init        (TypeName##Interface *klass); \
 GType \
 type_name##_get_type (void) \
 { \
-  static gsize static_g_define_type_id = 0; \
-  if (g_once_init_enter (&static_g_define_type_id)) \
+  static _g_type_once_init_type static_g_define_type_id = 0; \
+  if (_g_type_once_init_enter (&static_g_define_type_id)) \
     { \
       GType g_define_type_id = \
         g_type_register_static_simple (G_TYPE_INTERFACE, \
@@ -2351,7 +2363,7 @@ type_name##_get_type (void) \
 #define _G_DEFINE_INTERFACE_EXTENDED_END()	\
         /* following custom code */		\
       }						\
-      g_once_init_leave (&static_g_define_type_id, g_define_type_id); \
+      _g_type_once_init_leave (&static_g_define_type_id, g_define_type_id); \
     }						\
   return static_g_define_type_id; \
 } /* closes type_name##_get_type() */
@@ -2460,11 +2472,11 @@ static GType type_name##_get_type_once (void); \
 GType \
 type_name##_get_type (void) \
 { \
-  static gsize static_g_define_type_id = 0; \
-  if (g_once_init_enter (&static_g_define_type_id)) \
+  static _g_type_once_init_type static_g_define_type_id = 0; \
+  if (_g_type_once_init_enter (&static_g_define_type_id)) \
     { \
       GType g_define_type_id = type_name##_get_type_once (); \
-      g_once_init_leave (&static_g_define_type_id, g_define_type_id); \
+      _g_type_once_init_leave (&static_g_define_type_id, g_define_type_id); \
     } \
   return static_g_define_type_id; \
 } \
@@ -2497,11 +2509,11 @@ static GType type_name##_get_type_once (void); \
 GType \
 type_name##_get_type (void) \
 { \
-  static gsize static_g_define_type_id = 0; \
-  if (g_once_init_enter (&static_g_define_type_id)) \
+  static _g_type_once_init_type static_g_define_type_id = 0; \
+  if (_g_type_once_init_enter (&static_g_define_type_id)) \
     { \
       GType g_define_type_id = type_name##_get_type_once (); \
-      g_once_init_leave (&static_g_define_type_id, g_define_type_id); \
+      _g_type_once_init_leave (&static_g_define_type_id, g_define_type_id); \
     } \
   return static_g_define_type_id; \
 } \
@@ -2550,11 +2562,11 @@ static GType type_name##_get_type_once (void); \
 GType \
 type_name##_get_type (void) \
 { \
-  static gsize static_g_define_type_id = 0; \
-  if (g_once_init_enter (&static_g_define_type_id)) \
+  static _g_type_once_init_type static_g_define_type_id = 0; \
+  if (_g_type_once_init_enter (&static_g_define_type_id)) \
     { \
       GType g_define_type_id = type_name##_get_type_once (); \
-      g_once_init_leave (&static_g_define_type_id, g_define_type_id); \
+      _g_type_once_init_leave (&static_g_define_type_id, g_define_type_id); \
     } \
   return static_g_define_type_id; \
 } \
@@ -2698,6 +2710,27 @@ const gchar *    g_type_name_from_class         (GTypeClass	*g_class);
  */
 #define	G_TYPE_FLAG_RESERVED_ID_BIT	((GType) (1 << 0))
 
+/**
+ * GPOINTER_TO_TYPE:
+ * @p: The pointer to convert to a #GType
+ *
+ * This macro should be used instead of GPOINTER_TO_SIZE() to ensure
+ * portability since #GType is not guaranteed to be the same as #gsize.
+ *
+ * Since: 2.80
+ */
+#define GPOINTER_TO_TYPE(p) ((GType) (guintptr) (p)) GOBJECT_AVAILABLE_MACRO_IN_2_80
+/**
+ * GTYPE_TO_POINTER:
+ * @t: The #GType to convert to a pointer
+ *
+ * This macro should be used instead of GSIZE_TO_POINTER() to ensure
+ * portability since #GType is not guaranteed to be the same as #gsize.
+ *
+ * Since: 2.80
+ */
+#define GTYPE_TO_POINTER(t) ((gpointer) (guintptr) (t)) GOBJECT_AVAILABLE_MACRO_IN_2_80
+
 G_END_DECLS
 
 #endif /* __G_TYPE_H__ */

package/include/glib-2.0/gobject/gtypemodule.h

@@ -40,13 +40,6 @@ typedef struct _GTypeModuleClass GTypeModuleClass;
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GTypeModule, g_object_unref)
 
-/**
- * GTypeModule:
- * @name: the name of the module
- * 
- * The members of the GTypeModule structure should not 
- * be accessed directly, except for the @name field.
- */
 struct _GTypeModule 
 {
   GObject parent_instance;

package/include/glib-2.0/gobject/gtypeplugin.h

@@ -80,12 +80,6 @@ typedef void  (*GTypePluginCompleteInterfaceInfo) (GTypePlugin     *plugin,
 						   GType            instance_type,
 						   GType            interface_type,
 						   GInterfaceInfo  *info);
-/**
- * GTypePlugin:
- * 
- * The GTypePlugin typedef is used as a placeholder 
- * for objects that implement the GTypePlugin interface.
- */
 /**
  * GTypePluginClass:
  * @use_plugin: Increases the use count of the plugin.