@img/sharp-libvips-dev-wasm32 1.0.4 → 1.0.6

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

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

@@ -48,8 +48,8 @@ typedef enum /*< flags >*/
  * `g_main_context_{prepare,query,check,dispatch}` to integrate GMainContext in
  * other event loops.
  *
- * Flags to pass to g_main_context_new_with_flags() which affect the behaviour
- * of a #GMainContext.
+ * Flags to pass to [ctor@GLib.MainContext.new_with_flags] which affect the
+ * behaviour of a [struct@GLib.MainContext].
  *
  * Since: 2.72
  */
@@ -121,15 +121,17 @@ typedef struct _GSourceCallbackFuncs    GSourceCallbackFuncs;
  *     %TRUE in either its @prepare or its @check function, or if a ready time
  *     has been reached. The @dispatch function receives a callback function and
  *     user data. The callback function may be %NULL if the source was never
- *     connected to a callback using g_source_set_callback(). The @dispatch
- *     function should call the callback function with @user_data and whatever
- *     additional parameters are needed for this type of event source. The
- *     return value of the @dispatch function should be %G_SOURCE_REMOVE if the
- *     source should be removed or %G_SOURCE_CONTINUE to keep it.
+ *     connected to a callback using [method@GLib.Source.set_callback]. The
+ *     @dispatch function should call the callback function with @user_data and
+ *     whatever additional parameters are needed for this type of event source.
+ *     The return value of the @dispatch function should be
+ *     [const@GLib.SOURCE_REMOVE] if the source should be removed or
+ *     [const@GLib.SOURCE_CONTINUE] to keep it.
  * @finalize: Called when the source is finalized. At this point, the source
  *     will have been destroyed, had its callback cleared, and have been removed
- *     from its #GMainContext, but it will still have its final reference count,
- *     so methods can be called on it from within this function.
+ *     from its [struct@GLib.MainContext], but it will still have its final
+ *     reference count, so methods can be called on it from within this
+ *     function.
  *
  * The `GSourceFuncs` struct contains a table of
  * functions used to handle event sources in a generic manner.
@@ -182,15 +184,17 @@ typedef struct _GSourceFuncs            GSourceFuncs;
  * @user_data: data passed to the function, set when the source was
  *     created with one of the above functions
  *
- * Specifies the type of function passed to g_timeout_add(),
- * g_timeout_add_full(), g_idle_add(), and g_idle_add_full().
+ * Specifies the type of function passed to [func@GLib.timeout_add],
+ * [func@GLib.timeout_add_full], [func@GLib.idle_add], and
+ * [func@GLib.idle_add_full].
  *
- * When calling g_source_set_callback(), you may need to cast a function of a
- * different type to this type. Use G_SOURCE_FUNC() to avoid warnings about
- * incompatible function types.
+ * When calling [method@GLib.Source.set_callback], you may need to cast a
+ * function of a different type to this type. Use [func@GLib.SOURCE_FUNC] to
+ * avoid warnings about incompatible function types.
  *
- * Returns: %FALSE if the source should be removed. %G_SOURCE_CONTINUE and
- * %G_SOURCE_REMOVE are more memorable names for the return value.
+ * Returns: %FALSE if the source should be removed.
+ * [const@GLib.SOURCE_CONTINUE] and [const@GLib.SOURCE_REMOVE] are more
+ * memorable names for the return value.
  */
 typedef gboolean (*GSourceFunc)       (gpointer user_data);
 
@@ -202,7 +206,7 @@ typedef gboolean (*GSourceFunc)       (gpointer user_data);
  * A source function that is only called once before being removed from the main
  * context automatically.
  *
- * See: g_idle_add_once(), g_timeout_add_once()
+ * See: [func@GLib.idle_add_once], [func@GLib.timeout_add_once]
  *
  * Since: 2.74
  */
@@ -212,15 +216,16 @@ typedef void (* GSourceOnceFunc) (gpointer user_data);
  * G_SOURCE_FUNC:
  * @f: a function pointer.
  *
- * Cast a function pointer to a #GSourceFunc, suppressing warnings from GCC 8
- * onwards with `-Wextra` or `-Wcast-function-type` enabled about the function
- * types being incompatible.
+ * Cast a function pointer to a [callback@GLib.SourceFunc], suppressing
+ * warnings from GCC 8 onwards with `-Wextra` or `-Wcast-function-type` enabled
+ * about the function types being incompatible.
  *
  * For example, the correct type of callback for a source created by
- * g_child_watch_source_new() is #GChildWatchFunc, which accepts more arguments
- * than #GSourceFunc. Casting the function with `(GSourceFunc)` to call
- * g_source_set_callback() will trigger a warning, even though it will be cast
- * back to the correct type before it is called by the source.
+ * [func@GLib.child_watch_source_new] is #GChildWatchFunc, which accepts more
+ * arguments than [callback@GLib.SourceFunc]. Casting the function with
+ * `(GSourceFunc)` to call [method@GLib.Source.set_callback] will trigger a
+ * warning, even though it will be cast back to the correct type before it is
+ * called by the source.
  *
  * Since: 2.58
  */
@@ -231,13 +236,13 @@ typedef void (* GSourceOnceFunc) (gpointer user_data);
  * @pid: the process id of the child process
  * @wait_status: Status information about the child process, encoded
  *               in a platform-specific manner
- * @user_data: user data passed to g_child_watch_add()
+ * @user_data: user data passed to [func@GLib.child_watch_add]
  *
  * Prototype of a #GChildWatchSource callback, called when a child
  * process has exited.
  *
- * To interpret @wait_status, see the documentation
- * for g_spawn_check_wait_status(). In particular,
+ * To interpret @wait_status, see the documentation for
+ * [func@GLib.spawn_check_wait_status]. In particular,
  * on Unix platforms, note that it is usually not equal
  * to the integer passed to `exit()` or returned from `main()`.
  */
@@ -250,8 +255,8 @@ typedef void     (*GChildWatchFunc)   (GPid     pid,
  * GSourceDisposeFunc:
  * @source: #GSource that is currently being disposed
  *
- * Dispose function for @source. See g_source_set_dispose_function() for
- * details.
+ * Dispose function for @source. See [method@GLib.Source.set_dispose_function]
+ * for details.
  *
  * Since: 2.64
  */
@@ -301,15 +306,101 @@ struct _GSourceCallbackFuncs
  */
 typedef void (*GSourceDummyMarshal) (void);
 
+/**
+ * GSourceFuncsPrepareFunc:
+ * @source: The #GSource
+ * @timeout_: (out) (optional): the maximum timeout (in milliseconds) which should be passed to the poll call
+ *
+ * Checks the source for readiness.
+ *
+ * Called before all the file descriptors are polled. If the
+ * source can determine that it is ready here (without waiting for the
+ * results of the poll call) it should return %TRUE. It can also return
+ * a @timeout_ value which should be the maximum timeout (in milliseconds)
+ * which should be passed to the poll call. The actual timeout used will
+ * be `-1` if all sources returned `-1`, or it will be the minimum of all
+ * the @timeout_ values returned which were greater than or equal to `0`.
+ * If the prepare function returns a timeout and the source also has a
+ * ready time set, then the lower of the two will be used.
+ * 
+ * Since 2.36 this may be `NULL`, in which case the effect is as if the
+ * function always returns `FALSE` with a timeout of `-1`.
+ *
+ * Returns: %TRUE if the source is ready, %FALSE otherwise
+ *
+ * Since: 2.82
+ */
+typedef gboolean (*GSourceFuncsPrepareFunc) (GSource *source,
+                                             gint    *timeout_);
+
+/**
+ * GSourceFuncsCheckFunc:
+ * @source: The #GSource
+ *
+ * Checks if the source is ready to be dispatched.
+ *
+ * Called after all the file descriptors are polled. The source
+ * should return %TRUE if it is ready to be dispatched. Note that some
+ * time may have passed since the previous prepare function was called,
+ * so the source should be checked again here.
+ * 
+ * Since 2.36 this may be `NULL`, in which case the effect is
+ * as if the function always returns `FALSE`.
+ *
+ * Returns: %TRUE if ready to be dispatched, %FALSE otherwise
+ *
+ * Since: 2.82
+ */
+typedef gboolean (*GSourceFuncsCheckFunc) (GSource *source);
+
+/**
+ * GSourceFuncsDispatchFunc:
+ * @source: The #GSource
+ * @callback: (nullable): The #GSourceFunc to call
+ * @user_data: (nullable): data to pass to @callback
+ *
+ * Dispatches the source callback.
+ *
+ * Called to dispatch the event source, after it has returned
+ * `TRUE` in either its prepare or its check function, or if a ready time
+ * has been reached. The dispatch function receives a callback function and
+ * user data. The callback function may be `NULL` if the source was never
+ * connected to a callback using [method@GLib.Source.set_callback]. The dispatch
+ * function should call the callback function with @user_data and whatever
+ * additional parameters are needed for this type of event source. The
+ * return value of the dispatch function should be [const@GLib.SOURCE_REMOVE]
+ * if the source should be removed or [const@GLib.SOURCE_CONTINUE] to keep it.
+ *
+ * Returns: [const@GLib.SOURCE_REMOVE] if the source should be removed,
+ *   [const@GLib.SOURCE_CONTINUE] otherwise.
+ *
+ * Since: 2.82
+ */
+typedef gboolean (*GSourceFuncsDispatchFunc) (GSource     *source,
+                                              GSourceFunc  callback,
+                                              gpointer     user_data);
+
+/**
+ * GSourceFuncsFinalizeFunc:
+ * @source: The #GSource
+ *
+ * Finalizes the source.
+ *
+ * Called when the source is finalized. At this point, the source
+ * will have been destroyed, had its callback cleared, and have been removed
+ * from its [type@GLib.MainContext], but it will still have its final reference
+ * count, so methods can be called on it from within this function.
+ *
+ * Since: 2.82
+ */
+typedef void (*GSourceFuncsFinalizeFunc) (GSource *source);
+
 struct _GSourceFuncs
 {
-  gboolean (*prepare)  (GSource    *source,
-                        gint       *timeout_);/* Can be NULL */
-  gboolean (*check)    (GSource    *source);/* Can be NULL */
-  gboolean (*dispatch) (GSource    *source,
-                        GSourceFunc callback,
-                        gpointer    user_data);
-  void     (*finalize) (GSource    *source); /* Can be NULL */
+  GSourceFuncsPrepareFunc prepare; /* Can be NULL */
+  GSourceFuncsCheckFunc check;     /* Can be NULL */
+  GSourceFuncsDispatchFunc dispatch;
+  GSourceFuncsFinalizeFunc finalize; /* Can be NULL */
 
   /*< private >*/
   /* For use by g_source_set_closure */
@@ -334,7 +425,7 @@ struct _GSourceFuncs
  * Use this for default priority event sources.
  *
  * In GLib this priority is used when adding timeout functions
- * with g_timeout_add(). In GDK this priority is used for events
+ * with [func@GLib.timeout_add]. In GDK this priority is used for events
  * from the X server.
  */
 #define G_PRIORITY_DEFAULT          0
@@ -357,7 +448,7 @@ struct _GSourceFuncs
  * Use this for default priority idle functions.
  *
  * In GLib this priority is used when adding idle functions with
- * g_idle_add().
+ * [func@GLib.idle_add].
  */
 #define G_PRIORITY_DEFAULT_IDLE     200
 
@@ -373,8 +464,8 @@ struct _GSourceFuncs
 /**
  * G_SOURCE_REMOVE:
  *
- * Use this macro as the return value of a #GSourceFunc to remove
- * the #GSource from the main loop.
+ * Use this macro as the return value of a [callback@GLib.SourceFunc] to remove
+ * the [struct@GLib.Source] from the main loop.
  *
  * Since: 2.32
  */
@@ -383,8 +474,8 @@ struct _GSourceFuncs
 /**
  * G_SOURCE_CONTINUE:
  *
- * Use this macro as the return value of a #GSourceFunc to leave
- * the #GSource in the main loop.
+ * Use this macro as the return value of a [callback@GLib.SourceFunc] to leave
+ * the [struct@GLib.Source] in the main loop.
  *
  * Since: 2.32
  */
@@ -502,13 +593,13 @@ typedef void GMainContextPusher GLIB_AVAILABLE_TYPE_IN_2_64;
  * @main_context: (transfer none): a main context to push
  *
  * Push @main_context as the new thread-default main context for the current
- * thread, using g_main_context_push_thread_default(), and return a new
- * #GMainContextPusher. Pop with g_main_context_pusher_free(). Using
- * g_main_context_pop_thread_default() on @main_context while a
- * #GMainContextPusher exists for it can lead to undefined behaviour.
+ * thread, using [method@GLib.MainContext.push_thread_default], and return a
+ * new [alias@GLib.MainContextPusher]. Pop with g_main_context_pusher_free().
+ * Using [method@GLib.MainContext.pop_thread_default] on @main_context while a
+ * [alias@GLib.MainContextPusher] exists for it can lead to undefined behaviour.
  *
- * Using two #GMainContextPushers in the same scope is not allowed, as it leads
- * to an undefined pop order.
+ * Using two [alias@GLib.MainContextPusher]s in the same scope is not allowed,
+ * as it leads to an undefined pop order.
  *
  * This is intended to be used with g_autoptr().  Note that g_autoptr()
  * is only available when using GCC or clang, so the following example
@@ -559,8 +650,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS
  * Pop @pusher’s main context as the thread default main context.
  * See g_main_context_pusher_new() for details.
  *
- * This will pop the #GMainContext as the current thread-default main context,
- * but will not call g_main_context_unref() on it.
+ * This will pop the [struct@GLib.MainContext] as the current thread-default
+ * main context, but will not call [method@GLib.MainContext.unref] on it.
  *
  * Since: 2.64
  */
@@ -747,10 +838,10 @@ gboolean g_source_remove_by_funcs_user_data  (GSourceFuncs  *funcs,
  * GClearHandleFunc:
  * @handle_id: the handle ID to clear
  *
- * Specifies the type of function passed to g_clear_handle_id().
- * The implementation is expected to free the resource identified
- * by @handle_id; for instance, if @handle_id is a #GSource ID,
- * g_source_remove() can be used.
+ * Specifies the type of function passed to [func@GLib.clear_handle_id] The
+ * implementation is expected to free the resource identified by @handle_id;
+ * for instance, if @handle_id is a [struct@GLib.Source] ID,
+ * [func@GLib.Source.remove] can be used.
  *
  * Since: 2.56
  */

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

@@ -35,13 +35,20 @@
 
 G_BEGIN_DECLS
 
-GLIB_AVAILABLE_IN_ALL
+GLIB_DEPRECATED_IN_2_82_FOR(g_sort_array)
 void g_qsort_with_data (gconstpointer    pbase,
 			gint             total_elems,
 			gsize            size,
 			GCompareDataFunc compare_func,
 			gpointer         user_data);
 
+GLIB_AVAILABLE_IN_2_82
+void g_sort_array (const void       *array,
+                   size_t            n_elements,
+                   size_t            element_size,
+                   GCompareDataFunc  compare_func,
+                   void             *user_data);
+
 G_END_DECLS
 
 #endif /* __G_QSORT_H__ */

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

@@ -327,21 +327,9 @@ g_strdup_inline (const char *str)
 #endif /* !defined (__GTK_DOC_IGNORE__) */
 #endif /* G_GNUC_CHECK_VERSION (2, 0) */
 
-/* Make a copy of a string interpreting C string -style escape
- * sequences. Inverse of g_strescape. The recognized sequences are \b
- * \f \n \r \t \\ \" and the octal format.
- */
 GLIB_AVAILABLE_IN_ALL
 gchar*                g_strcompress    (const gchar *source) G_GNUC_MALLOC;
 
-/* Copy a string escaping nonprintable characters like in C strings.
- * Inverse of g_strcompress. The exceptions parameter, if non-NULL, points
- * to a string containing characters that are not to be escaped.
- *
- * Deprecated API: gchar* g_strescape (const gchar *source);
- * Luckily this function wasn't used much, using NULL as second parameter
- * provides mostly identical semantics.
- */
 GLIB_AVAILABLE_IN_ALL
 gchar*                g_strescape      (const gchar *source,
 					const gchar *exceptions) G_GNUC_MALLOC;

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

@@ -66,6 +66,8 @@ gchar*       g_string_free_and_steal    (GString         *string) G_GNUC_WARN_UN
 
 #if G_GNUC_CHECK_VERSION (2, 0) && (GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_76)
 
+#if !defined(__cplusplus) || !G_GNUC_CHECK_VERSION (6, 1) || G_GNUC_CHECK_VERSION (7, 3)
+
 #define g_string_free(str, free_segment)        \
   (__builtin_constant_p (free_segment) ?        \
     ((free_segment) ?                           \
@@ -74,6 +76,8 @@ gchar*       g_string_free_and_steal    (GString         *string) G_GNUC_WARN_UN
     :                                           \
     (g_string_free) ((str), (free_segment)))
 
+#endif /* !defined(__cplusplus) || !G_GNUC_CHECK_VERSION (6, 1) || G_GNUC_CHECK_VERSION (7, 3) */
+
 #endif /* G_GNUC_CHECK_VERSION (2, 0) && (GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_76) */
 
 GLIB_AVAILABLE_IN_2_34

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

@@ -38,6 +38,9 @@ GStrvBuilder *g_strv_builder_new (void);
 GLIB_AVAILABLE_IN_2_68
 void g_strv_builder_unref (GStrvBuilder *builder);
 
+GLIB_AVAILABLE_IN_2_82
+GStrv g_strv_builder_unref_to_strv (GStrvBuilder *builder);
+
 GLIB_AVAILABLE_IN_2_68
 GStrvBuilder *g_strv_builder_ref (GStrvBuilder *builder);
 

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

@@ -806,7 +806,7 @@ GLIB_VAR const gchar * const g_utf8_skip;
  * Before using this macro, use g_utf8_validate() to validate strings
  * that may contain invalid UTF-8.
  */
-#define g_utf8_next_char(p) (char *)((p) + g_utf8_skip[*(const guchar *)(p)])
+#define g_utf8_next_char(p) ((p) + g_utf8_skip[*(const guchar *)(p)])
 
 GLIB_AVAILABLE_IN_ALL
 gunichar g_utf8_get_char           (const gchar  *p) G_GNUC_PURE;

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

@@ -395,6 +395,15 @@
 * Since: 2.80
 */
 #define GLIB_VERSION_2_80       (G_ENCODE_VERSION (2, 80))
+/**
+* GLIB_VERSION_2_82:
+*
+* A macro that evaluates to the 2.82 version of GLib, in a format
+* that can be used by the C pre-processor.
+*
+* Since: 2.82
+*/
+#define GLIB_VERSION_2_82       (G_ENCODE_VERSION (2, 82))
 
 /**
  * GLIB_VERSION_CUR_STABLE:

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

@@ -984,3 +984,37 @@
 #define GMODULE_AVAILABLE_ENUMERATOR_IN_2_80
 #define GMODULE_AVAILABLE_TYPE_IN_2_80
 #endif
+
+#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_82
+#define GMODULE_DEPRECATED_IN_2_82 GMODULE_DEPRECATED
+#define GMODULE_DEPRECATED_IN_2_82_FOR(f) GMODULE_DEPRECATED_FOR (f)
+#define GMODULE_DEPRECATED_MACRO_IN_2_82 GLIB_DEPRECATED_MACRO
+#define GMODULE_DEPRECATED_MACRO_IN_2_82_FOR(f) GLIB_DEPRECATED_MACRO_FOR (f)
+#define GMODULE_DEPRECATED_ENUMERATOR_IN_2_82 GLIB_DEPRECATED_ENUMERATOR
+#define GMODULE_DEPRECATED_ENUMERATOR_IN_2_82_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR (f)
+#define GMODULE_DEPRECATED_TYPE_IN_2_82 GLIB_DEPRECATED_TYPE
+#define GMODULE_DEPRECATED_TYPE_IN_2_82_FOR(f) GLIB_DEPRECATED_TYPE_FOR (f)
+#else
+#define GMODULE_DEPRECATED_IN_2_82 _GMODULE_EXTERN
+#define GMODULE_DEPRECATED_IN_2_82_FOR(f) _GMODULE_EXTERN
+#define GMODULE_DEPRECATED_MACRO_IN_2_82
+#define GMODULE_DEPRECATED_MACRO_IN_2_82_FOR(f)
+#define GMODULE_DEPRECATED_ENUMERATOR_IN_2_82
+#define GMODULE_DEPRECATED_ENUMERATOR_IN_2_82_FOR(f)
+#define GMODULE_DEPRECATED_TYPE_IN_2_82
+#define GMODULE_DEPRECATED_TYPE_IN_2_82_FOR(f)
+#endif
+
+#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_82
+#define GMODULE_AVAILABLE_IN_2_82 GMODULE_UNAVAILABLE (2, 82)
+#define GMODULE_AVAILABLE_STATIC_INLINE_IN_2_82 GLIB_UNAVAILABLE_STATIC_INLINE (2, 82)
+#define GMODULE_AVAILABLE_MACRO_IN_2_82 GLIB_UNAVAILABLE_MACRO (2, 82)
+#define GMODULE_AVAILABLE_ENUMERATOR_IN_2_82 GLIB_UNAVAILABLE_ENUMERATOR (2, 82)
+#define GMODULE_AVAILABLE_TYPE_IN_2_82 GLIB_UNAVAILABLE_TYPE (2, 82)
+#else
+#define GMODULE_AVAILABLE_IN_2_82 _GMODULE_EXTERN
+#define GMODULE_AVAILABLE_STATIC_INLINE_IN_2_82
+#define GMODULE_AVAILABLE_MACRO_IN_2_82
+#define GMODULE_AVAILABLE_ENUMERATOR_IN_2_82
+#define GMODULE_AVAILABLE_TYPE_IN_2_82
+#endif

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

@@ -984,3 +984,37 @@
 #define GOBJECT_AVAILABLE_ENUMERATOR_IN_2_80
 #define GOBJECT_AVAILABLE_TYPE_IN_2_80
 #endif
+
+#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_82
+#define GOBJECT_DEPRECATED_IN_2_82 GOBJECT_DEPRECATED
+#define GOBJECT_DEPRECATED_IN_2_82_FOR(f) GOBJECT_DEPRECATED_FOR (f)
+#define GOBJECT_DEPRECATED_MACRO_IN_2_82 GLIB_DEPRECATED_MACRO
+#define GOBJECT_DEPRECATED_MACRO_IN_2_82_FOR(f) GLIB_DEPRECATED_MACRO_FOR (f)
+#define GOBJECT_DEPRECATED_ENUMERATOR_IN_2_82 GLIB_DEPRECATED_ENUMERATOR
+#define GOBJECT_DEPRECATED_ENUMERATOR_IN_2_82_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR (f)
+#define GOBJECT_DEPRECATED_TYPE_IN_2_82 GLIB_DEPRECATED_TYPE
+#define GOBJECT_DEPRECATED_TYPE_IN_2_82_FOR(f) GLIB_DEPRECATED_TYPE_FOR (f)
+#else
+#define GOBJECT_DEPRECATED_IN_2_82 _GOBJECT_EXTERN
+#define GOBJECT_DEPRECATED_IN_2_82_FOR(f) _GOBJECT_EXTERN
+#define GOBJECT_DEPRECATED_MACRO_IN_2_82
+#define GOBJECT_DEPRECATED_MACRO_IN_2_82_FOR(f)
+#define GOBJECT_DEPRECATED_ENUMERATOR_IN_2_82
+#define GOBJECT_DEPRECATED_ENUMERATOR_IN_2_82_FOR(f)
+#define GOBJECT_DEPRECATED_TYPE_IN_2_82
+#define GOBJECT_DEPRECATED_TYPE_IN_2_82_FOR(f)
+#endif
+
+#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_82
+#define GOBJECT_AVAILABLE_IN_2_82 GOBJECT_UNAVAILABLE (2, 82)
+#define GOBJECT_AVAILABLE_STATIC_INLINE_IN_2_82 GLIB_UNAVAILABLE_STATIC_INLINE (2, 82)
+#define GOBJECT_AVAILABLE_MACRO_IN_2_82 GLIB_UNAVAILABLE_MACRO (2, 82)
+#define GOBJECT_AVAILABLE_ENUMERATOR_IN_2_82 GLIB_UNAVAILABLE_ENUMERATOR (2, 82)
+#define GOBJECT_AVAILABLE_TYPE_IN_2_82 GLIB_UNAVAILABLE_TYPE (2, 82)
+#else
+#define GOBJECT_AVAILABLE_IN_2_82 _GOBJECT_EXTERN
+#define GOBJECT_AVAILABLE_STATIC_INLINE_IN_2_82
+#define GOBJECT_AVAILABLE_MACRO_IN_2_82
+#define GOBJECT_AVAILABLE_ENUMERATOR_IN_2_82
+#define GOBJECT_AVAILABLE_TYPE_IN_2_82
+#endif

package/include/glib-2.0/gobject/gobjectnotifyqueue.c

@@ -140,7 +140,7 @@ g_object_notify_queue_thaw (GObject            *object,
 }
 
 static inline void
-g_object_notify_queue_clear (GObject            *object,
+g_object_notify_queue_clear (GObject            *object G_GNUC_UNUSED,
 			     GObjectNotifyQueue *nqueue)
 {
   g_return_if_fail (nqueue->freeze_count > 0);
@@ -155,7 +155,7 @@ g_object_notify_queue_clear (GObject            *object,
 }
 
 static inline void
-g_object_notify_queue_add (GObject            *object,
+g_object_notify_queue_add (GObject            *object G_GNUC_UNUSED,
 			   GObjectNotifyQueue *nqueue,
 			   GParamSpec	      *pspec)
 {

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

@@ -1095,7 +1095,7 @@ typedef enum    /*< skip >*/
  * @base_finalize: Location of the base finalization function (optional)
  * @class_init: Location of the class initialization function for
  *  classed and instantiatable types. Location of the default vtable 
- *  inititalization function for interface types. (optional) This function 
+ *  initialization function for interface types. (optional) This function
  *  is used both to fill in virtual functions in the class or default vtable, 
  *  and to do type-specific setup such as registering signals and object
  *  properties.
@@ -2280,7 +2280,7 @@ static void     type_name##_class_intern_init (gpointer klass, \
 #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) \
+#define _G_DEFINE_TYPE_EXTENDED_BEGIN_PRE(TypeName, type_name) \
 \
 static void     type_name##_init              (TypeName        *self); \
 static void     type_name##_class_init        (TypeName##Class *klass); \
@@ -2337,12 +2337,12 @@ type_name##_get_type_once (void) \
   return g_define_type_id; \
 } /* closes type_name##_get_type_once() */
 
-/* This was defined before we had G_DEFINE_TYPE_WITH_CODE_AND_PRELUDE, it's simplest
- * to keep it.
+/* This was defined before we had _G_DEFINE_TYPE_EXTENDED_WITH_PRELUDE in
+ * gtype-private.h, it's simplest to keep it.
  */
 #define _G_DEFINE_TYPE_EXTENDED_BEGIN(TypeName, type_name, TYPE_PARENT, flags) \
-  _G_DEFINE_TYPE_EXTENDED_BEGIN_PRE(TypeName, type_name, TYPE_PARENT) \
-  _G_DEFINE_TYPE_EXTENDED_BEGIN_REGISTER(TypeName, type_name, TYPE_PARENT, flags) \
+  _G_DEFINE_TYPE_EXTENDED_BEGIN_PRE (TypeName, type_name)                      \
+  _G_DEFINE_TYPE_EXTENDED_BEGIN_REGISTER (TypeName, type_name, TYPE_PARENT, flags)
 
 /* Intentionally using (GTypeFlags) 0 instead of G_TYPE_FLAG_NONE here,
  * to avoid deprecation warnings with older GLIB_VERSION_MAX_ALLOWED */