@img/sharp-libvips-dev 1.0.1 → 1.0.3

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

@@ -28,6 +28,8 @@
 #error "Only <girepository.h> can be included directly."
 #endif
 
+#include <stdint.h>
+
 #include <glib.h>
 #include <glib-object.h>
 
@@ -39,6 +41,17 @@ G_BEGIN_DECLS
 typedef struct _GIBaseInfo GIBaseInfo;
 typedef struct _GIBaseInfoClass GIBaseInfoClass;
 
+typedef struct
+{
+  /*< private >*/
+  GTypeInstance parent_instance;
+
+  int dummy0;
+  void *dummy1[3];
+  uint32_t dummy2[2];
+  void *dummy3[6];
+} GIBaseInfoStack;
+
 /* Documented in gicallableinfo.c */
 typedef struct _GICallableInfo GICallableInfo;
 GI_AVAILABLE_IN_ALL GType gi_callable_info_get_type (void);
@@ -67,6 +80,10 @@ GI_AVAILABLE_IN_ALL GType gi_union_info_get_type (void);
 typedef struct _GIEnumInfo GIEnumInfo;
 GI_AVAILABLE_IN_ALL GType gi_enum_info_get_type (void);
 
+/* Documented in giflagsinfo.c */
+typedef struct _GIFlagsInfo GIFlagsInfo;
+GI_AVAILABLE_IN_ALL GType gi_flags_info_get_type (void);
+
 /* Documented in giobjectinfo.c */
 typedef struct _GIObjectInfo GIObjectInfo;
 GI_AVAILABLE_IN_ALL GType gi_object_info_get_type (void);
@@ -100,11 +117,23 @@ typedef struct _GIFieldInfo GIFieldInfo;
 GI_AVAILABLE_IN_ALL GType gi_field_info_get_type (void);
 
 /* Documented in giarginfo.c */
-typedef struct _GIArgInfo GIArgInfo;
+typedef struct
+{
+  /*< private >*/
+  GIBaseInfoStack parent;
+
+  void *padding[6];
+} GIArgInfo;
 GI_AVAILABLE_IN_ALL GType gi_arg_info_get_type (void);
 
 /* Documented in gitypeinfo.c */
-typedef struct _GITypeInfo GITypeInfo;
+typedef struct
+{
+  /*< private >*/
+  GIBaseInfoStack parent;
+
+  void *padding[6];
+} GITypeInfo;
 GI_AVAILABLE_IN_ALL GType gi_type_info_get_type (void);
 
 /* Documented in giunresolvedinfo.c */
@@ -113,27 +142,27 @@ GI_AVAILABLE_IN_ALL GType gi_unresolved_info_get_type (void);
 
 union _GIArgument
 {
-  gboolean v_boolean;
-  gint8    v_int8;
-  guint8   v_uint8;
-  gint16   v_int16;
-  guint16  v_uint16;
-  gint32   v_int32;
-  guint32  v_uint32;
-  gint64   v_int64;
-  guint64  v_uint64;
-  gfloat   v_float;
-  gdouble  v_double;
-  gshort   v_short;
-  gushort  v_ushort;
-  gint     v_int;
-  guint    v_uint;
-  glong    v_long;
-  gulong   v_ulong;
-  gssize   v_ssize;
-  gsize    v_size;
-  gchar *  v_string;
-  gpointer v_pointer;
+  gboolean        v_boolean;
+  int8_t          v_int8;
+  uint8_t         v_uint8;
+  int16_t         v_int16;
+  uint16_t        v_uint16;
+  int32_t         v_int32;
+  uint32_t        v_uint32;
+  int64_t         v_int64;
+  uint64_t        v_uint64;
+  float           v_float;
+  double          v_double;
+  short           v_short;
+  unsigned short  v_ushort;
+  int             v_int;
+  unsigned int    v_uint;
+  long            v_long;
+  unsigned long   v_ulong;
+  gssize          v_ssize;
+  size_t          v_size;
+  char           *v_string;
+  void           *v_pointer;
 };
 
 /**
@@ -166,83 +195,6 @@ union _GIArgument
  */
 typedef union _GIArgument GIArgument;
 
-/**
- * GIInfoType:
- * @GI_INFO_TYPE_INVALID: invalid type
- * @GI_INFO_TYPE_FUNCTION: function, see [class@GIRepository.FunctionInfo]
- * @GI_INFO_TYPE_CALLBACK: callback, see [class@GIRepository.FunctionInfo]
- * @GI_INFO_TYPE_STRUCT: struct, see [class@GIRepository.StructInfo]
- * @GI_INFO_TYPE_BOXED: boxed, see [class@GIRepository.StructInfo] or
- *   [class@GIRepository.UnionInfo]
- * @GI_INFO_TYPE_ENUM: enum, see [class@GIRepository.EnumInfo]
- * @GI_INFO_TYPE_FLAGS: flags, see [class@GIRepository.EnumInfo]
- * @GI_INFO_TYPE_OBJECT: object, see [class@GIRepository.ObjectInfo]
- * @GI_INFO_TYPE_INTERFACE: interface, see [class@GIRepository.InterfaceInfo]
- * @GI_INFO_TYPE_CONSTANT: constant, see [class@GIRepository.ConstantInfo]
- * @GI_INFO_TYPE_INVALID_0: deleted, used to be `GI_INFO_TYPE_ERROR_DOMAIN`.
- * @GI_INFO_TYPE_UNION: union, see [class@GIRepository.UnionInfo]
- * @GI_INFO_TYPE_VALUE: enum value, see [class@GIRepository.ValueInfo]
- * @GI_INFO_TYPE_SIGNAL: signal, see [class@GIRepository.SignalInfo]
- * @GI_INFO_TYPE_VFUNC: virtual function, see [class@GIRepository.VFuncInfo]
- * @GI_INFO_TYPE_PROPERTY: [class@GObject.Object] property, see
- *   [class@GIRepository.PropertyInfo]
- * @GI_INFO_TYPE_FIELD: struct or union field, see
- *   [class@GIRepository.FieldInfo]
- * @GI_INFO_TYPE_ARG: argument of a function or callback, see
- *   [class@GIRepository.ArgInfo]
- * @GI_INFO_TYPE_TYPE: type information, see [class@GIRepository.TypeInfo]
- * @GI_INFO_TYPE_UNRESOLVED: unresolved type, a type which is not present in
- *   the typelib, or any of its dependencies, see
- *   [class@GIRepository.UnresolvedInfo]
- * @GI_INFO_TYPE_CALLABLE: an abstract type representing any callable (function,
- *   callback, vfunc), see [class@GIRepository.CallableInfo]
- * @GI_INFO_TYPE_REGISTERED_TYPE: an abstract type representing any registered
- *   type (enum, interface, object, struct, union), see
- *   [class@GIRepository.RegisteredTypeInfo]
- *
- * The type of a [class@GIRepository.BaseInfo] struct.
- *
- * See [const@GIRepository.INFO_TYPE_N_TYPES] for the total number of elements
- * in this enum.
- *
- * Since: 2.80
- */
-typedef enum
-{
-  GI_INFO_TYPE_INVALID,
-  GI_INFO_TYPE_FUNCTION,
-  GI_INFO_TYPE_CALLBACK,
-  GI_INFO_TYPE_STRUCT,
-  GI_INFO_TYPE_BOXED,
-  GI_INFO_TYPE_ENUM,         /*  5 */
-  GI_INFO_TYPE_FLAGS,
-  GI_INFO_TYPE_OBJECT,
-  GI_INFO_TYPE_INTERFACE,
-  GI_INFO_TYPE_CONSTANT,
-  GI_INFO_TYPE_INVALID_0,    /* 10 */
-  GI_INFO_TYPE_UNION,
-  GI_INFO_TYPE_VALUE,
-  GI_INFO_TYPE_SIGNAL,
-  GI_INFO_TYPE_VFUNC,
-  GI_INFO_TYPE_PROPERTY,     /* 15 */
-  GI_INFO_TYPE_FIELD,
-  GI_INFO_TYPE_ARG,
-  GI_INFO_TYPE_TYPE,
-  GI_INFO_TYPE_UNRESOLVED,
-  GI_INFO_TYPE_CALLABLE,     /* 20 */
-  GI_INFO_TYPE_REGISTERED_TYPE,
-  /* keep GI_INFO_TYPE_N_TYPES in sync with this */
-} GIInfoType;
-
-/**
- * GI_INFO_TYPE_N_TYPES:
- *
- * Number of entries in [enum@GIRepository.InfoType].
- *
- * Since: 2.80
- */
-#define GI_INFO_TYPE_N_TYPES (GI_INFO_TYPE_REGISTERED_TYPE + 1)
-
 /**
  * GITransfer:
  * @GI_TRANSFER_NOTHING: Transfer nothing from the callee (function or the type
@@ -433,7 +385,6 @@ typedef enum
  * @GI_VFUNC_MUST_CHAIN_UP: chains up to the parent type
  * @GI_VFUNC_MUST_OVERRIDE: overrides
  * @GI_VFUNC_MUST_NOT_OVERRIDE: does not override
- * @GI_VFUNC_THROWS: includes a [type@GLib.Error]
  *
  * Flags of a [class@GIRepository.VFuncInfo] struct.
  *
@@ -444,7 +395,6 @@ typedef enum
   GI_VFUNC_MUST_CHAIN_UP     = 1 << 0,
   GI_VFUNC_MUST_OVERRIDE     = 1 << 1,
   GI_VFUNC_MUST_NOT_OVERRIDE = 1 << 2,
-  GI_VFUNC_THROWS =            1 << 3
 } GIVFuncInfoFlags;
 
 /**
@@ -454,7 +404,6 @@ typedef enum
  * @GI_FUNCTION_IS_GETTER: is a getter of a [class@GIRepository.PropertyInfo].
  * @GI_FUNCTION_IS_SETTER: is a setter of a [class@GIRepository.PropertyInfo].
  * @GI_FUNCTION_WRAPS_VFUNC: represents a virtual function.
- * @GI_FUNCTION_THROWS: the function may throw an error.
  *
  * Flags for a [class@GIRepository.FunctionInfo] struct.
  *
@@ -467,7 +416,6 @@ typedef enum
   GI_FUNCTION_IS_GETTER      = 1 << 2,
   GI_FUNCTION_IS_SETTER      = 1 << 3,
   GI_FUNCTION_WRAPS_VFUNC    = 1 << 4,
-  GI_FUNCTION_THROWS         = 1 << 5
 } GIFunctionInfoFlags;
 
 G_END_DECLS

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

@@ -32,53 +32,69 @@
 
 G_BEGIN_DECLS
 
+#define GI_TYPE_UNION_INFO (gi_union_info_get_type ())
+
+/**
+ * GI_UNION_INFO:
+ * @info: Info object which is subject to casting.
+ *
+ * Casts a [type@GIRepository.UnionInfo] or derived pointer into a
+ * `(GIUnionInfo*)` pointer.
+ *
+ * Depending on the current debugging level, this function may invoke
+ * certain runtime checks to identify invalid casts.
+ *
+ * Since: 2.80
+ */
+#define GI_UNION_INFO(info) (G_TYPE_CHECK_INSTANCE_CAST ((info), GI_TYPE_UNION_INFO, GIUnionInfo))
+
 /**
  * GI_IS_UNION_INFO:
  * @info: an info structure
  *
- * Checks if @info is a [struct@GIRepository.UnionInfo].
+ * Checks if @info is a [struct@GIRepository.UnionInfo] (or a derived type).
  *
  * Since: 2.80
  */
-#define GI_IS_UNION_INFO(info) \
-    (gi_base_info_get_info_type ((GIBaseInfo*) info) ==  GI_INFO_TYPE_UNION)
+#define GI_IS_UNION_INFO(info) (G_TYPE_CHECK_INSTANCE_TYPE ((info), GI_TYPE_UNION_INFO))
 
 GI_AVAILABLE_IN_ALL
-guint            gi_union_info_get_n_fields             (GIUnionInfo *info);
+unsigned int     gi_union_info_get_n_fields             (GIUnionInfo *info);
 
 GI_AVAILABLE_IN_ALL
 GIFieldInfo *    gi_union_info_get_field                (GIUnionInfo *info,
-                                                         guint        n);
+                                                         unsigned int n);
 
 GI_AVAILABLE_IN_ALL
-guint            gi_union_info_get_n_methods            (GIUnionInfo *info);
+unsigned int     gi_union_info_get_n_methods            (GIUnionInfo *info);
 
 GI_AVAILABLE_IN_ALL
 GIFunctionInfo * gi_union_info_get_method               (GIUnionInfo *info,
-                                                         guint        n);
+                                                         unsigned int n);
 
 GI_AVAILABLE_IN_ALL
 gboolean         gi_union_info_is_discriminated         (GIUnionInfo *info);
 
 GI_AVAILABLE_IN_ALL
-guint            gi_union_info_get_discriminator_offset (GIUnionInfo *info);
+gboolean         gi_union_info_get_discriminator_offset (GIUnionInfo *info,
+                                                         size_t      *out_offset);
 
 GI_AVAILABLE_IN_ALL
 GITypeInfo *     gi_union_info_get_discriminator_type   (GIUnionInfo *info);
 
 GI_AVAILABLE_IN_ALL
 GIConstantInfo * gi_union_info_get_discriminator        (GIUnionInfo *info,
-                                                         guint        n);
+                                                         size_t       n);
 
 GI_AVAILABLE_IN_ALL
 GIFunctionInfo * gi_union_info_find_method              (GIUnionInfo *info,
-							const gchar *name);
+                                                         const char  *name);
 
 GI_AVAILABLE_IN_ALL
-gsize            gi_union_info_get_size                 (GIUnionInfo *info);
+size_t           gi_union_info_get_size                 (GIUnionInfo *info);
 
 GI_AVAILABLE_IN_ALL
-gsize            gi_union_info_get_alignment            (GIUnionInfo *info);
+size_t           gi_union_info_get_alignment            (GIUnionInfo *info);
 
 GI_AVAILABLE_IN_ALL
 const char *     gi_union_info_get_copy_function_name   (GIUnionInfo *info);

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

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

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

@@ -0,0 +1,65 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
+ * GObject introspection: Enum and Enum values
+ *
+ * Copyright (C) 2005 Matthias Clasen
+ * Copyright (C) 2008,2009 Red Hat, Inc.
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#pragma once
+
+#if !defined (__GIREPOSITORY_H_INSIDE__) && !defined (GI_COMPILATION)
+#error "Only <girepository.h> can be included directly."
+#endif
+
+#include <girepository/gitypes.h>
+
+G_BEGIN_DECLS
+
+#define GI_TYPE_VALUE_INFO (gi_value_info_get_type ())
+
+/**
+ * GI_VALUE_INFO:
+ * @info: Info object which is subject to casting.
+ *
+ * Casts a [type@GIRepository.ValueInfo] or derived pointer into a
+ * `(GIValueInfo*)` pointer.
+ *
+ * Depending on the current debugging level, this function may invoke
+ * certain runtime checks to identify invalid casts.
+ *
+ * Since: 2.80
+ */
+#define GI_VALUE_INFO(info) (G_TYPE_CHECK_INSTANCE_CAST ((info), GI_TYPE_VALUE_INFO, GIValueInfo))
+
+/**
+ * GI_IS_VALUE_INFO:
+ * @info: an info structure
+ *
+ * Checks if @info is a [class@GIRepository.ValueInfo] (or a derived type).
+ *
+ * Since: 2.80
+ */
+#define GI_IS_VALUE_INFO(info) (G_TYPE_CHECK_INSTANCE_TYPE ((info), GI_TYPE_VALUE_INFO))
+
+
+GI_AVAILABLE_IN_ALL
+int64_t        gi_value_info_get_value        (GIValueInfo *info);
+
+G_END_DECLS

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

@@ -32,22 +32,37 @@
 
 G_BEGIN_DECLS
 
+#define GI_TYPE_VFUNC_INFO (gi_vfunc_info_get_type ())
+
+/**
+ * GI_VFUNC_INFO:
+ * @info: Info object which is subject to casting.
+ *
+ * Casts a [type@GIRepository.VFuncInfo] or derived pointer into a
+ * `(GIVFuncInfo*)` pointer.
+ *
+ * Depending on the current debugging level, this function may invoke
+ * certain runtime checks to identify invalid casts.
+ *
+ * Since: 2.80
+ */
+#define GI_VFUNC_INFO(info) (G_TYPE_CHECK_INSTANCE_CAST ((info), GI_TYPE_VFUNC_INFO, GIVFuncInfo))
+
 /**
  * GI_IS_VFUNC_INFO:
  * @info: an info structure
  *
- * Checks if @info is a [struct@GIRepository.VFuncInfo].
+ * Checks if @info is a [struct@GIRepository.VFuncInfo] (or a derived type).
  *
  * Since: 2.80
  */
-#define GI_IS_VFUNC_INFO(info) \
-    (gi_base_info_get_info_type ((GIBaseInfo*) info) ==  GI_INFO_TYPE_VFUNC)
+#define GI_IS_VFUNC_INFO(info) (G_TYPE_CHECK_INSTANCE_TYPE ((info), GI_TYPE_VFUNC_INFO))
 
 GI_AVAILABLE_IN_ALL
 GIVFuncInfoFlags  gi_vfunc_info_get_flags   (GIVFuncInfo *info);
 
 GI_AVAILABLE_IN_ALL
-guint             gi_vfunc_info_get_offset  (GIVFuncInfo *info);
+size_t            gi_vfunc_info_get_offset  (GIVFuncInfo *info);
 
 GI_AVAILABLE_IN_ALL
 GISignalInfo *    gi_vfunc_info_get_signal  (GIVFuncInfo *info);
@@ -56,7 +71,7 @@ GI_AVAILABLE_IN_ALL
 GIFunctionInfo *  gi_vfunc_info_get_invoker (GIVFuncInfo *info);
 
 GI_AVAILABLE_IN_ALL
-gpointer          gi_vfunc_info_get_address (GIVFuncInfo *info,
+void *            gi_vfunc_info_get_address (GIVFuncInfo *info,
                                              GType        implementor_gtype,
                                              GError     **error);
 
@@ -64,9 +79,9 @@ GI_AVAILABLE_IN_ALL
 gboolean          gi_vfunc_info_invoke      (GIVFuncInfo      *info,
                                              GType             implementor,
                                              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,
                                              GError          **error);
 

package/include/glib-2.0/glib/deprecated/gthread.h

@@ -135,10 +135,12 @@ void     g_thread_foreach      (GFunc             thread_func,
 typedef struct
 {
   GMutex *mutex;
-#ifndef G_OS_WIN32
+#ifndef __GI_SCANNER__
+# ifndef G_OS_WIN32
   /* only for ABI compatibility reasons */
   pthread_mutex_t unused;
-#endif
+# endif /* !G_OS_WIN32 */
+#endif /* !__GI_SCANNER__ */
 } GStaticMutex GLIB_DEPRECATED_TYPE_IN_2_32_FOR(GMutex);
 
 #define g_static_mutex_lock(mutex) \
@@ -162,15 +164,17 @@ struct _GStaticRecMutex
   GStaticMutex mutex;
   guint depth;
 
+#ifndef __GI_SCANNER__
   /* ABI compat only */
   union {
-#ifdef G_OS_WIN32
+# ifdef G_OS_WIN32
     void *owner;
-#else
+# else
     pthread_t owner;
-#endif
+# endif /* !G_OS_WIN32 */
     gdouble dummy;
   } unused;
+#endif /* !__GI_SCANNER__ */
 } GLIB_DEPRECATED_TYPE_IN_2_32_FOR(GRecMutex);
 
 #define G_STATIC_REC_MUTEX_INIT { G_STATIC_MUTEX_INIT, 0, { 0 } } GLIB_DEPRECATED_MACRO_IN_2_32_FOR(g_rec_mutex_init)

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

@@ -44,6 +44,12 @@ void      g_bit_unlock                    (volatile gint *address,
 GLIB_AVAILABLE_IN_ALL
 void      g_pointer_bit_lock              (volatile void *address,
                                            gint           lock_bit);
+
+GLIB_AVAILABLE_IN_2_80
+void      g_pointer_bit_lock_and_get      (gpointer address,
+                                           guint lock_bit,
+                                           guintptr *out_ptr);
+
 GLIB_AVAILABLE_IN_ALL
 gboolean  g_pointer_bit_trylock           (volatile void *address,
                                            gint           lock_bit);
@@ -51,6 +57,19 @@ GLIB_AVAILABLE_IN_ALL
 void      g_pointer_bit_unlock            (volatile void *address,
                                            gint           lock_bit);
 
+GLIB_AVAILABLE_IN_2_80
+gpointer  g_pointer_bit_lock_mask_ptr     (gpointer ptr,
+                                           guint lock_bit,
+                                           gboolean set,
+                                           guintptr preserve_mask,
+                                           gpointer preserve_ptr);
+
+GLIB_AVAILABLE_IN_2_80
+void g_pointer_bit_unlock_and_set         (void *address,
+                                           guint lock_bit,
+                                           gpointer ptr,
+                                           guintptr preserve_mask);
+
 #ifdef __GNUC__
 
 #define g_pointer_bit_lock(address, lock_bit) \
@@ -59,6 +78,12 @@ void      g_pointer_bit_unlock            (volatile void *address,
     g_pointer_bit_lock ((address), (lock_bit));                              \
   }))
 
+#define g_pointer_bit_lock_and_get(address, lock_bit, out_ptr)     \
+  (G_GNUC_EXTENSION ({                                             \
+    G_STATIC_ASSERT (sizeof *(address) == sizeof (gpointer));      \
+    g_pointer_bit_lock_and_get ((address), (lock_bit), (out_ptr)); \
+  }))
+
 #define g_pointer_bit_trylock(address, lock_bit) \
   (G_GNUC_EXTENSION ({                                                       \
     G_STATIC_ASSERT (sizeof *(address) == sizeof (gpointer));                \
@@ -71,6 +96,12 @@ void      g_pointer_bit_unlock            (volatile void *address,
     g_pointer_bit_unlock ((address), (lock_bit));                            \
   }))
 
+#define g_pointer_bit_unlock_and_set(address, lock_bit, ptr, preserve_mask)       \
+  (G_GNUC_EXTENSION ({                                                            \
+    G_STATIC_ASSERT (sizeof *(address) == sizeof (gpointer));                     \
+    g_pointer_bit_unlock_and_set ((address), (lock_bit), (ptr), (preserve_mask)); \
+  }))
+
 #endif
 
 G_END_DECLS

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

@@ -81,7 +81,7 @@ GQuark g_bookmark_file_error_quark (void);
  * pointed by the URI like its MIME type, the application that is registering
  * the bookmark and the icon that should be used to represent the bookmark.
  * The data is stored using the
- * [Desktop Bookmark Specification](http://www.gnome.org/~ebassi/bookmark-spec).
+ * [Desktop Bookmark Specification](https://www.freedesktop.org/wiki/Specifications/desktop-bookmark-spec/).
  *
  * The syntax of the bookmark files is described in detail inside the
  * Desktop Bookmark Specification, here is a quick summary: bookmark

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

@@ -118,7 +118,7 @@ struct _GIOChannel
   /* Group the flags together, immediately after partial_write_buf, to save memory */
 
   guint use_buffer     : 1;	/* The encoding uses the buffers */
-  guint do_encode      : 1;	/* The encoding uses the GIConv coverters */
+  guint do_encode      : 1;	/* The encoding uses the GIConv converters */
   guint close_on_unref : 1;	/* Close the channel on final unref */
   guint is_readable    : 1;	/* Cached GIOFlag */
   guint is_writeable   : 1;	/* ditto */
@@ -370,7 +370,7 @@ GIOChannel *g_io_channel_win32_new_messages (guint hwnd);
 #endif
 
 /* Create an IO channel for C runtime (emulated Unix-like) file
- * descriptors. After calling g_io_add_watch() on a IO channel
+ * descriptors. After calling g_io_add_watch() on an IO channel
  * returned by this function, you shouldn't call read() on the file
  * descriptor. This is because adding polling for a file descriptor is
  * implemented on Win32 by starting a thread that sits blocked in a

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

@@ -984,3 +984,37 @@
 #define GLIB_AVAILABLE_ENUMERATOR_IN_2_80
 #define GLIB_AVAILABLE_TYPE_IN_2_80
 #endif
+
+#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_82
+#define GLIB_DEPRECATED_IN_2_82 GLIB_DEPRECATED
+#define GLIB_DEPRECATED_IN_2_82_FOR(f) GLIB_DEPRECATED_FOR (f)
+#define GLIB_DEPRECATED_MACRO_IN_2_82 GLIB_DEPRECATED_MACRO
+#define GLIB_DEPRECATED_MACRO_IN_2_82_FOR(f) GLIB_DEPRECATED_MACRO_FOR (f)
+#define GLIB_DEPRECATED_ENUMERATOR_IN_2_82 GLIB_DEPRECATED_ENUMERATOR
+#define GLIB_DEPRECATED_ENUMERATOR_IN_2_82_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR (f)
+#define GLIB_DEPRECATED_TYPE_IN_2_82 GLIB_DEPRECATED_TYPE
+#define GLIB_DEPRECATED_TYPE_IN_2_82_FOR(f) GLIB_DEPRECATED_TYPE_FOR (f)
+#else
+#define GLIB_DEPRECATED_IN_2_82 _GLIB_EXTERN
+#define GLIB_DEPRECATED_IN_2_82_FOR(f) _GLIB_EXTERN
+#define GLIB_DEPRECATED_MACRO_IN_2_82
+#define GLIB_DEPRECATED_MACRO_IN_2_82_FOR(f)
+#define GLIB_DEPRECATED_ENUMERATOR_IN_2_82
+#define GLIB_DEPRECATED_ENUMERATOR_IN_2_82_FOR(f)
+#define GLIB_DEPRECATED_TYPE_IN_2_82
+#define GLIB_DEPRECATED_TYPE_IN_2_82_FOR(f)
+#endif
+
+#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_82
+#define GLIB_AVAILABLE_IN_2_82 GLIB_UNAVAILABLE (2, 82)
+#define GLIB_AVAILABLE_STATIC_INLINE_IN_2_82 GLIB_UNAVAILABLE_STATIC_INLINE (2, 82)
+#define GLIB_AVAILABLE_MACRO_IN_2_82 GLIB_UNAVAILABLE_MACRO (2, 82)
+#define GLIB_AVAILABLE_ENUMERATOR_IN_2_82 GLIB_UNAVAILABLE_ENUMERATOR (2, 82)
+#define GLIB_AVAILABLE_TYPE_IN_2_82 GLIB_UNAVAILABLE_TYPE (2, 82)
+#else
+#define GLIB_AVAILABLE_IN_2_82 _GLIB_EXTERN
+#define GLIB_AVAILABLE_STATIC_INLINE_IN_2_82
+#define GLIB_AVAILABLE_MACRO_IN_2_82
+#define GLIB_AVAILABLE_ENUMERATOR_IN_2_82
+#define GLIB_AVAILABLE_TYPE_IN_2_82
+#endif

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

@@ -861,9 +861,10 @@
 #define G_STRINGIFY(macro_or_string)	G_STRINGIFY_ARG (macro_or_string)
 #define	G_STRINGIFY_ARG(contents)	#contents
 
-#ifndef __GI_SCANNER__ /* The static assert macro really confuses the introspection parser */
 #define G_PASTE_ARGS(identifier1,identifier2) identifier1 ## identifier2
 #define G_PASTE(identifier1,identifier2)      G_PASTE_ARGS (identifier1, identifier2)
+
+#ifndef __GI_SCANNER__ /* The static assert macro really confuses the introspection parser */
 #if G_CXX_STD_CHECK_VERSION (11)
 #define G_STATIC_ASSERT(expr) static_assert (expr, "Expression evaluates to false")
 #elif (G_C_STD_CHECK_VERSION (11) || \
@@ -877,7 +878,10 @@
 #endif
 #endif /* G_CXX_STD_CHECK_VERSION (11) */
 #define G_STATIC_ASSERT_EXPR(expr) ((void) sizeof (char[(expr) ? 1 : -1]))
-#endif /* !__GI_SCANNER__ */
+#else /* __GI_SCANNER__ */
+#define G_STATIC_ASSERT(expr) static int G_PASTE (_GStaticAssertGiScannerNoop, __LINE__) G_GNUC_UNUSED
+#define G_STATIC_ASSERT_EXPR(expr) static int G_PASTE (_GStaticAssertGiScannerNoop, __LINE__) G_GNUC_UNUSED
+#endif /* __GI_SCANNER__ */
 
 /* Provide a string identifying the current code position */
 #if defined (__GNUC__) && (__GNUC__ < 3) && !defined (G_CXX_STD_VERSION)
@@ -1337,6 +1341,7 @@
 /* these macros are private; note that gstdio.h also uses _GLIB_CLEANUP */
 #define _GLIB_AUTOPTR_FUNC_NAME(TypeName) glib_autoptr_cleanup_##TypeName
 #define _GLIB_AUTOPTR_CLEAR_FUNC_NAME(TypeName) glib_autoptr_clear_##TypeName
+#define _GLIB_AUTOPTR_DESTROY_FUNC_NAME(TypeName) glib_autoptr_destroy_##TypeName
 #define _GLIB_AUTOPTR_TYPENAME(TypeName)  TypeName##_autoptr
 #define _GLIB_AUTOPTR_LIST_FUNC_NAME(TypeName) glib_listautoptr_cleanup_##TypeName
 #define _GLIB_AUTOPTR_LIST_TYPENAME(TypeName)  TypeName##_listautoptr
@@ -1356,12 +1361,14 @@
     { if (_ptr) (cleanup) ((ParentName *) _ptr); }                                                              \
   static G_GNUC_UNUSED inline void _GLIB_AUTOPTR_FUNC_NAME(TypeName) (TypeName **_ptr)                          \
     { _GLIB_AUTOPTR_CLEAR_FUNC_NAME(TypeName) (*_ptr); }                                                        \
+  static G_GNUC_UNUSED inline void _GLIB_AUTOPTR_DESTROY_FUNC_NAME(TypeName) (void *_ptr)                       \
+    { (cleanup) ((ParentName *) _ptr); }                                                                        \
   static G_GNUC_UNUSED inline void _GLIB_AUTOPTR_LIST_FUNC_NAME(TypeName) (GList **_l)                          \
-    { g_list_free_full (*_l, (GDestroyNotify) (void(*)(void)) cleanup); }                                       \
+    { g_list_free_full (*_l, _GLIB_AUTOPTR_DESTROY_FUNC_NAME(TypeName)); }                                      \
   static G_GNUC_UNUSED inline void _GLIB_AUTOPTR_SLIST_FUNC_NAME(TypeName) (GSList **_l)                        \
-    { g_slist_free_full (*_l, (GDestroyNotify) (void(*)(void)) cleanup); }                                      \
+    { g_slist_free_full (*_l, _GLIB_AUTOPTR_DESTROY_FUNC_NAME(TypeName)); }                                     \
   static G_GNUC_UNUSED inline void _GLIB_AUTOPTR_QUEUE_FUNC_NAME(TypeName) (GQueue **_q)                        \
-    { if (*_q) g_queue_free_full (*_q, (GDestroyNotify) (void(*)(void)) cleanup); }                             \
+    { if (*_q) g_queue_free_full (*_q, _GLIB_AUTOPTR_DESTROY_FUNC_NAME(TypeName)); }                            \
   G_GNUC_END_IGNORE_DEPRECATIONS
 #define _GLIB_DEFINE_AUTOPTR_CHAINUP(ModuleObjName, ParentName) \
   _GLIB_DEFINE_AUTOPTR_CLEANUP_FUNCS(ModuleObjName, ParentName, _GLIB_AUTOPTR_CLEAR_FUNC_NAME(ParentName))