@img/sharp-libvips-dev-wasm32 1.3.2 → 1.3.3-rc.0

package/include/expat.h

@@ -40,6 +40,8 @@
    DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
    OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
    USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   SPDX-License-Identifier: MIT
 */
 
 #ifndef Expat_INCLUDED
@@ -1094,7 +1096,7 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);
 */
 #  define XML_MAJOR_VERSION 2
 #  define XML_MINOR_VERSION 8
-#  define XML_MICRO_VERSION 2
+#  define XML_MICRO_VERSION 3
 
 #  ifdef __cplusplus
 }

package/include/expat_config.h

@@ -83,7 +83,7 @@
 #define PACKAGE_NAME "expat"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "expat 2.8.2"
+#define PACKAGE_STRING "expat 2.8.3"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "expat"
@@ -92,7 +92,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.8.2"
+#define PACKAGE_VERSION "2.8.3"
 
 /* Define to 1 if all of the C89 standard headers exist (not just the ones
    required in a freestanding environment). This macro is provided for
@@ -100,7 +100,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "2.8.2"
+#define VERSION "2.8.3"
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */

package/include/expat_external.h

@@ -36,6 +36,8 @@
    DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
    OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
    USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+   SPDX-License-Identifier: MIT
 */
 
 #ifndef Expat_External_INCLUDED

package/include/ffi.h

@@ -1,6 +1,6 @@
 /* -----------------------------------------------------------------*-C-*-
-   libffi 3.6.0
-     - Copyright (c) 2011, 2014, 2019, 2021, 2022, 2024, 2025 Anthony Green
+   libffi 3.8.0
+     - Copyright (c) 2011, 2014, 2019, 2021, 2022, 2024, 2025, 2026 Anthony Green
      - Copyright (c) 1996-2003, 2007, 2008 Red Hat, Inc.
 
    Permission is hereby granted, free of charge, to any person
@@ -79,9 +79,10 @@ extern "C" {
 #define FFI_TYPE_COMPLEX    15
 #define FFI_TYPE_UINT128    16
 #define FFI_TYPE_SINT128    17
+#define FFI_TYPE_VECTOR     18
 
 /* This should always refer to the last type code (for sanity checks).  */
-#define FFI_TYPE_LAST       FFI_TYPE_SINT128
+#define FFI_TYPE_LAST       FFI_TYPE_VECTOR
 
 #include <ffitarget.h>
 
@@ -323,8 +324,8 @@ size_t ffi_java_raw_size (ffi_cif *cif) __attribute__((deprecated));
 
 /* ---- Version API ------------------------------------------------------ */
 
-#define FFI_VERSION_STRING "3.5.2"
-#define FFI_VERSION_NUMBER 30502
+#define FFI_VERSION_STRING "3.8.0"
+#define FFI_VERSION_NUMBER 30800
 
 #ifndef LIBFFI_ASM
 /* Return a version string. */
@@ -524,6 +525,39 @@ void ffi_call(ffi_cif *cif,
 	      void *rvalue,
 	      void **avalue);
 
+/* Reusable call plans.
+
+   A plan captures a signature's argument placement once so that repeated
+   calls skip the per-call work that ffi_call would otherwise redo.  Build one
+   with ffi_call_plan_alloc, invoke it as many times as you like, and release
+   it with ffi_call_plan_free.
+
+   The plan is opaque and caller-owned.  The cif must outlive the plan.
+   ffi_call_plan_alloc returns NULL only on allocation failure; a signature
+   with no fast path is still valid and ffi_call_plan_invoke falls back to
+   ffi_call for it.  A plan is immutable once built, so it may be shared and
+   invoked concurrently from multiple threads.
+
+   ffi_call_plan_size reports the total number of bytes libffi allocated for a
+   plan, so that callers tracking the footprint of long-lived plans do not have
+   to guess at the size of an opaque type.  */
+typedef struct ffi_call_plan ffi_call_plan;
+
+FFI_API
+ffi_call_plan *ffi_call_plan_alloc (ffi_cif *cif);
+
+FFI_API
+void ffi_call_plan_invoke (ffi_call_plan *plan,
+			   void (*fn)(void),
+			   void *rvalue,
+			   void **avalue);
+
+FFI_API
+void ffi_call_plan_free (ffi_call_plan *plan);
+
+FFI_API
+size_t ffi_call_plan_size (ffi_call_plan *plan);
+
 FFI_API
 ffi_status ffi_get_struct_offsets (ffi_abi abi, ffi_type *struct_type,
 				   size_t *offsets);

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

@@ -59,7 +59,7 @@ struct _GActionInterface
 };
 
 GIO_AVAILABLE_IN_2_30
-GType                   g_action_get_type                               (void) G_GNUC_CONST;
+GType                   g_action_get_type                               (void);
 
 GIO_AVAILABLE_IN_ALL
 const gchar *           g_action_get_name                               (GAction            *action);

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

@@ -97,7 +97,7 @@ struct _GActionGroupInterface
 };
 
 GIO_AVAILABLE_IN_ALL
-GType                   g_action_group_get_type                         (void) G_GNUC_CONST;
+GType                   g_action_group_get_type                         (void);
 
 GIO_AVAILABLE_IN_ALL
 gboolean                g_action_group_has_action                       (GActionGroup *action_group,

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

@@ -75,7 +75,7 @@ struct _GActionEntry
 };
 
 GIO_AVAILABLE_IN_2_32
-GType                   g_action_map_get_type                           (void) G_GNUC_CONST;
+GType                   g_action_map_get_type                           (void);
 
 GIO_AVAILABLE_IN_2_32
 GAction *               g_action_map_lookup_action                      (GActionMap         *action_map,

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

@@ -155,7 +155,7 @@ struct _GAppInfoIface
 };
 
 GIO_AVAILABLE_IN_ALL
-GType       g_app_info_get_type                     (void) G_GNUC_CONST;
+GType       g_app_info_get_type                     (void);
 GIO_AVAILABLE_IN_ALL
 GAppInfo *  g_app_info_create_from_commandline      (const char           *commandline,
                                                      const char           *application_name,
@@ -332,7 +332,7 @@ struct _GAppLaunchContextClass
 };
 
 GIO_AVAILABLE_IN_ALL
-GType              g_app_launch_context_get_type              (void) G_GNUC_CONST;
+GType              g_app_launch_context_get_type              (void);
 GIO_AVAILABLE_IN_ALL
 GAppLaunchContext *g_app_launch_context_new                   (void);
 

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

@@ -124,7 +124,7 @@ struct _GApplicationClass
 };
 
 GIO_AVAILABLE_IN_ALL
-GType                   g_application_get_type                          (void) G_GNUC_CONST;
+GType                   g_application_get_type                          (void);
 
 GIO_AVAILABLE_IN_ALL
 gboolean                g_application_id_is_valid                       (const gchar              *application_id);

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

@@ -73,7 +73,7 @@ struct _GApplicationCommandLineClass
 };
 
 GIO_AVAILABLE_IN_ALL
-GType                   g_application_command_line_get_type             (void) G_GNUC_CONST;
+GType                   g_application_command_line_get_type             (void);
 
 GIO_AVAILABLE_IN_ALL
 gchar **                g_application_command_line_get_arguments        (GApplicationCommandLine   *cmdline,

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

@@ -68,7 +68,7 @@ struct _GAsyncInitableIface
 };
 
 GIO_AVAILABLE_IN_ALL
-GType    g_async_initable_get_type    (void) G_GNUC_CONST;
+GType    g_async_initable_get_type    (void);
 
 
 GIO_AVAILABLE_IN_ALL

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

@@ -62,7 +62,7 @@ struct _GAsyncResultIface
 };
 
 GIO_AVAILABLE_IN_ALL
-GType    g_async_result_get_type          (void) G_GNUC_CONST;
+GType    g_async_result_get_type          (void);
 
 GIO_AVAILABLE_IN_ALL
 gpointer g_async_result_get_user_data     (GAsyncResult *res);

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

@@ -80,7 +80,7 @@ struct _GBufferedInputStreamClass
 
 
 GIO_AVAILABLE_IN_ALL
-GType         g_buffered_input_stream_get_type        (void) G_GNUC_CONST;
+GType         g_buffered_input_stream_get_type        (void);
 GIO_AVAILABLE_IN_ALL
 GInputStream* g_buffered_input_stream_new             (GInputStream          *base_stream);
 GIO_AVAILABLE_IN_ALL

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

@@ -61,7 +61,7 @@ struct _GBufferedOutputStreamClass
 
 
 GIO_AVAILABLE_IN_ALL
-GType          g_buffered_output_stream_get_type        (void) G_GNUC_CONST;
+GType          g_buffered_output_stream_get_type        (void);
 GIO_AVAILABLE_IN_ALL
 GOutputStream* g_buffered_output_stream_new             (GOutputStream         *base_stream);
 GIO_AVAILABLE_IN_ALL

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

@@ -36,7 +36,7 @@ G_BEGIN_DECLS
 #define G_IS_BYTES_ICON(inst)     (G_TYPE_CHECK_INSTANCE_TYPE ((inst), G_TYPE_BYTES_ICON))
 
 GIO_AVAILABLE_IN_2_38
-GType   g_bytes_icon_get_type   (void) G_GNUC_CONST;
+GType   g_bytes_icon_get_type   (void);
 
 GIO_AVAILABLE_IN_2_38
 GIcon * g_bytes_icon_new        (GBytes     *bytes);

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

@@ -65,7 +65,7 @@ struct _GCancellableClass
 };
 
 GIO_AVAILABLE_IN_ALL
-GType         g_cancellable_get_type               (void) G_GNUC_CONST;
+GType         g_cancellable_get_type               (void);
 
 GIO_AVAILABLE_IN_ALL
 GCancellable *g_cancellable_new                    (void);

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

@@ -46,7 +46,7 @@ struct _GCharsetConverterClass
 };
 
 GIO_AVAILABLE_IN_ALL
-GType              g_charset_converter_get_type      (void) G_GNUC_CONST;
+GType              g_charset_converter_get_type      (void);
 
 GIO_AVAILABLE_IN_ALL
 GCharsetConverter *g_charset_converter_new            (const gchar  *to_charset,

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

@@ -69,7 +69,7 @@ struct _GConverterIface
 };
 
 GIO_AVAILABLE_IN_ALL
-GType            g_converter_get_type     (void) G_GNUC_CONST;
+GType            g_converter_get_type     (void);
 
 GIO_AVAILABLE_IN_ALL
 GConverterResult g_converter_convert (GConverter       *converter,

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

@@ -64,7 +64,7 @@ struct _GConverterInputStreamClass
 };
 
 GIO_AVAILABLE_IN_ALL
-GType                  g_converter_input_stream_get_type      (void) G_GNUC_CONST;
+GType                  g_converter_input_stream_get_type      (void);
 GIO_AVAILABLE_IN_ALL
 GInputStream          *g_converter_input_stream_new           (GInputStream          *base_stream,
                                                                GConverter            *converter);

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

@@ -64,7 +64,7 @@ struct _GConverterOutputStreamClass
 };
 
 GIO_AVAILABLE_IN_ALL
-GType                   g_converter_output_stream_get_type      (void) G_GNUC_CONST;
+GType                   g_converter_output_stream_get_type      (void);
 GIO_AVAILABLE_IN_ALL
 GOutputStream          *g_converter_output_stream_new           (GOutputStream         *base_stream,
                                                                  GConverter            *converter);

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

@@ -47,7 +47,7 @@ G_BEGIN_DECLS
 typedef struct _GCredentialsClass   GCredentialsClass;
 
 GIO_AVAILABLE_IN_ALL
-GType            g_credentials_get_type           (void) G_GNUC_CONST;
+GType            g_credentials_get_type           (void);
 
 GIO_AVAILABLE_IN_ALL
 GCredentials    *g_credentials_new                (void);

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

@@ -63,7 +63,7 @@ struct _GDataInputStreamClass
 };
 
 GIO_AVAILABLE_IN_ALL
-GType                  g_data_input_stream_get_type             (void) G_GNUC_CONST;
+GType                  g_data_input_stream_get_type             (void);
 GIO_AVAILABLE_IN_ALL
 GDataInputStream *     g_data_input_stream_new                  (GInputStream            *base_stream);
 

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

@@ -65,7 +65,7 @@ struct _GDataOutputStreamClass
 
 
 GIO_AVAILABLE_IN_ALL
-GType                g_data_output_stream_get_type       (void) G_GNUC_CONST;
+GType                g_data_output_stream_get_type       (void);
 GIO_AVAILABLE_IN_ALL
 GDataOutputStream *  g_data_output_stream_new            (GOutputStream         *base_stream);
 

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

@@ -31,20 +31,9 @@
 
 G_BEGIN_DECLS
 
-#define G_TYPE_DBUS_ACTION_GROUP                            (g_dbus_action_group_get_type ())
-#define G_DBUS_ACTION_GROUP(inst)                           (G_TYPE_CHECK_INSTANCE_CAST ((inst),                     \
-                                                             G_TYPE_DBUS_ACTION_GROUP, GDBusActionGroup))
-#define G_DBUS_ACTION_GROUP_CLASS(class)                    (G_TYPE_CHECK_CLASS_CAST ((class),                       \
-                                                             G_TYPE_DBUS_ACTION_GROUP, GDBusActionGroupClass))
-#define G_IS_DBUS_ACTION_GROUP(inst)                        (G_TYPE_CHECK_INSTANCE_TYPE ((inst),                     \
-                                                             G_TYPE_DBUS_ACTION_GROUP))
-#define G_IS_DBUS_ACTION_GROUP_CLASS(class)                 (G_TYPE_CHECK_CLASS_TYPE ((class),                       \
-                                                             G_TYPE_DBUS_ACTION_GROUP))
-#define G_DBUS_ACTION_GROUP_GET_CLASS(inst)                 (G_TYPE_INSTANCE_GET_CLASS ((inst),                      \
-                                                             G_TYPE_DBUS_ACTION_GROUP, GDBusActionGroupClass))
-
+#define G_TYPE_DBUS_ACTION_GROUP (g_dbus_action_group_get_type ())
 GIO_AVAILABLE_IN_ALL
-GType                   g_dbus_action_group_get_type                  (void) G_GNUC_CONST;
+G_DECLARE_FINAL_TYPE (GDBusActionGroup, g_dbus_action_group, G, DBUS_ACTION_GROUP, GObject)
 
 GIO_AVAILABLE_IN_2_32
 GDBusActionGroup *      g_dbus_action_group_get                       (GDBusConnection        *connection,

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

@@ -36,7 +36,7 @@ G_BEGIN_DECLS
 #define G_IS_DBUS_AUTH_OBSERVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_AUTH_OBSERVER))
 
 GIO_AVAILABLE_IN_ALL
-GType              g_dbus_auth_observer_get_type                     (void) G_GNUC_CONST;
+GType              g_dbus_auth_observer_get_type                     (void);
 GIO_AVAILABLE_IN_ALL
 GDBusAuthObserver *g_dbus_auth_observer_new                          (void);
 GIO_AVAILABLE_IN_ALL

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

@@ -36,7 +36,7 @@ G_BEGIN_DECLS
 #define G_IS_DBUS_CONNECTION(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_CONNECTION))
 
 GIO_AVAILABLE_IN_ALL
-GType            g_dbus_connection_get_type                   (void) G_GNUC_CONST;
+GType            g_dbus_connection_get_type                   (void);
 
 /* ---------------------------------------------------------------------------------------------------- */
 

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

@@ -59,7 +59,7 @@ struct _GDBusInterfaceIface
 };
 
 GIO_AVAILABLE_IN_ALL
-GType                 g_dbus_interface_get_type         (void) G_GNUC_CONST;
+GType                 g_dbus_interface_get_type         (void);
 GIO_AVAILABLE_IN_ALL
 GDBusInterfaceInfo   *g_dbus_interface_get_info         (GDBusInterface      *interface_);
 GIO_AVAILABLE_IN_ALL

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

@@ -87,7 +87,7 @@ struct _GDBusInterfaceSkeletonClass
 };
 
 GIO_AVAILABLE_IN_ALL
-GType                        g_dbus_interface_skeleton_get_type        (void) G_GNUC_CONST;
+GType                        g_dbus_interface_skeleton_get_type        (void);
 GIO_AVAILABLE_IN_ALL
 GDBusInterfaceSkeletonFlags  g_dbus_interface_skeleton_get_flags       (GDBusInterfaceSkeleton      *interface_);
 GIO_AVAILABLE_IN_ALL

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

@@ -308,19 +308,19 @@ void                 g_dbus_annotation_info_unref          (GDBusAnnotationInfo
 #define G_TYPE_DBUS_ANNOTATION_INFO (g_dbus_annotation_info_get_type ())
 
 GIO_AVAILABLE_IN_ALL
-GType g_dbus_node_info_get_type       (void) G_GNUC_CONST;
+GType g_dbus_node_info_get_type       (void);
 GIO_AVAILABLE_IN_ALL
-GType g_dbus_interface_info_get_type  (void) G_GNUC_CONST;
+GType g_dbus_interface_info_get_type  (void);
 GIO_AVAILABLE_IN_ALL
-GType g_dbus_method_info_get_type     (void) G_GNUC_CONST;
+GType g_dbus_method_info_get_type     (void);
 GIO_AVAILABLE_IN_ALL
-GType g_dbus_signal_info_get_type     (void) G_GNUC_CONST;
+GType g_dbus_signal_info_get_type     (void);
 GIO_AVAILABLE_IN_ALL
-GType g_dbus_property_info_get_type   (void) G_GNUC_CONST;
+GType g_dbus_property_info_get_type   (void);
 GIO_AVAILABLE_IN_ALL
-GType g_dbus_arg_info_get_type        (void) G_GNUC_CONST;
+GType g_dbus_arg_info_get_type        (void);
 GIO_AVAILABLE_IN_ALL
-GType g_dbus_annotation_info_get_type (void) G_GNUC_CONST;
+GType g_dbus_annotation_info_get_type (void);
 
 G_END_DECLS
 

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

@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 typedef struct _GDBusMenuModel GDBusMenuModel;
 
 GIO_AVAILABLE_IN_ALL
-GType                   g_dbus_menu_model_get_type     (void) G_GNUC_CONST;
+GType                   g_dbus_menu_model_get_type     (void);
 
 GIO_AVAILABLE_IN_ALL
 GDBusMenuModel *        g_dbus_menu_model_get          (GDBusConnection *connection,

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

@@ -36,7 +36,7 @@ G_BEGIN_DECLS
 #define G_IS_DBUS_MESSAGE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_MESSAGE))
 
 GIO_AVAILABLE_IN_ALL
-GType                     g_dbus_message_get_type           (void) G_GNUC_CONST;
+GType                     g_dbus_message_get_type           (void);
 GIO_AVAILABLE_IN_ALL
 GDBusMessage             *g_dbus_message_new                (void);
 GIO_AVAILABLE_IN_ALL

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

@@ -71,7 +71,7 @@ G_BEGIN_DECLS
 #define G_DBUS_METHOD_INVOCATION_UNHANDLED FALSE GIO_AVAILABLE_MACRO_IN_2_68
 
 GIO_AVAILABLE_IN_ALL
-GType                  g_dbus_method_invocation_get_type             (void) G_GNUC_CONST;
+GType                  g_dbus_method_invocation_get_type             (void);
 GIO_AVAILABLE_IN_ALL
 const gchar           *g_dbus_method_invocation_get_sender           (GDBusMethodInvocation *invocation);
 GIO_AVAILABLE_IN_ALL

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

@@ -66,7 +66,7 @@ struct _GDBusObjectIface
 };
 
 GIO_AVAILABLE_IN_ALL
-GType            g_dbus_object_get_type        (void) G_GNUC_CONST;
+GType            g_dbus_object_get_type        (void);
 GIO_AVAILABLE_IN_ALL
 const gchar     *g_dbus_object_get_object_path (GDBusObject  *object);
 GIO_AVAILABLE_IN_ALL

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

@@ -78,7 +78,7 @@ struct _GDBusObjectManagerIface
 };
 
 GIO_AVAILABLE_IN_ALL
-GType            g_dbus_object_manager_get_type        (void) G_GNUC_CONST;
+GType            g_dbus_object_manager_get_type        (void);
 GIO_AVAILABLE_IN_ALL
 const gchar     *g_dbus_object_manager_get_object_path (GDBusObjectManager    *manager);
 GIO_AVAILABLE_IN_ALL

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

@@ -77,7 +77,7 @@ struct _GDBusObjectManagerClientClass
 };
 
 GIO_AVAILABLE_IN_ALL
-GType                         g_dbus_object_manager_client_get_type           (void) G_GNUC_CONST;
+GType                         g_dbus_object_manager_client_get_type           (void);
 GIO_AVAILABLE_IN_ALL
 void                          g_dbus_object_manager_client_new                (GDBusConnection               *connection,
                                                                                GDBusObjectManagerClientFlags  flags,

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

@@ -61,7 +61,7 @@ struct _GDBusObjectManagerServerClass
 };
 
 GIO_AVAILABLE_IN_ALL
-GType                     g_dbus_object_manager_server_get_type            (void) G_GNUC_CONST;
+GType                     g_dbus_object_manager_server_get_type            (void);
 GIO_AVAILABLE_IN_ALL
 GDBusObjectManagerServer *g_dbus_object_manager_server_new                 (const gchar               *object_path);
 GIO_AVAILABLE_IN_ALL

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

@@ -61,7 +61,7 @@ struct _GDBusObjectProxyClass
 };
 
 GIO_AVAILABLE_IN_ALL
-GType             g_dbus_object_proxy_get_type       (void) G_GNUC_CONST;
+GType             g_dbus_object_proxy_get_type       (void);
 GIO_AVAILABLE_IN_ALL
 GDBusObjectProxy *g_dbus_object_proxy_new            (GDBusConnection   *connection,
                                                       const gchar       *object_path);

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

@@ -67,7 +67,7 @@ struct _GDBusObjectSkeletonClass
 };
 
 GIO_AVAILABLE_IN_ALL
-GType                g_dbus_object_skeleton_get_type                  (void) G_GNUC_CONST;
+GType                g_dbus_object_skeleton_get_type                  (void);
 GIO_AVAILABLE_IN_ALL
 GDBusObjectSkeleton *g_dbus_object_skeleton_new                       (const gchar            *object_path);
 GIO_AVAILABLE_IN_ALL

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

@@ -79,7 +79,7 @@ struct _GDBusProxyClass
 };
 
 GIO_AVAILABLE_IN_ALL
-GType            g_dbus_proxy_get_type                  (void) G_GNUC_CONST;
+GType            g_dbus_proxy_get_type                  (void);
 GIO_AVAILABLE_IN_ALL
 void             g_dbus_proxy_new                       (GDBusConnection     *connection,
                                                          GDBusProxyFlags      flags,

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

@@ -36,7 +36,7 @@ G_BEGIN_DECLS
 #define G_IS_DBUS_SERVER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_DBUS_SERVER))
 
 GIO_AVAILABLE_IN_ALL
-GType             g_dbus_server_get_type           (void) G_GNUC_CONST;
+GType             g_dbus_server_get_type           (void);
 GIO_AVAILABLE_IN_ALL
 GDBusServer      *g_dbus_server_new_sync           (const gchar       *address,
                                                     GDBusServerFlags   flags,

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

@@ -171,7 +171,7 @@ struct _GDriveIface
 };
 
 GIO_AVAILABLE_IN_ALL
-GType    g_drive_get_type                 (void) G_GNUC_CONST;
+GType    g_drive_get_type                 (void);
 
 GIO_AVAILABLE_IN_ALL
 char *   g_drive_get_name                 (GDrive               *drive);

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

@@ -51,7 +51,7 @@ struct _GDtlsClientConnectionInterface
 };
 
 GIO_AVAILABLE_IN_2_48
-GType                g_dtls_client_connection_get_type             (void) G_GNUC_CONST;
+GType                g_dtls_client_connection_get_type             (void);
 
 GIO_AVAILABLE_IN_2_48
 GDatagramBased      *g_dtls_client_connection_new                  (GDatagramBased         *base_socket,

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

@@ -108,7 +108,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 };
 
 GIO_AVAILABLE_IN_2_48
-GType                 g_dtls_connection_get_type                    (void) G_GNUC_CONST;
+GType                 g_dtls_connection_get_type                    (void);
 
 GIO_AVAILABLE_IN_2_48
 void                  g_dtls_connection_set_database                (GDtlsConnection       *conn,

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

@@ -51,7 +51,7 @@ struct _GDtlsServerConnectionInterface
 };
 
 GIO_AVAILABLE_IN_2_48
-GType           g_dtls_server_connection_get_type (void) G_GNUC_CONST;
+GType           g_dtls_server_connection_get_type (void);
 
 GIO_AVAILABLE_IN_2_48
 GDatagramBased *g_dtls_server_connection_new      (GDatagramBased   *base_socket,

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

@@ -30,18 +30,9 @@
 
 G_BEGIN_DECLS
 
-#define G_TYPE_EMBLEM         (g_emblem_get_type ())
-#define G_EMBLEM(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_EMBLEM, GEmblem))
-#define G_EMBLEM_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_EMBLEM, GEmblemClass))
-#define G_IS_EMBLEM(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_EMBLEM))
-#define G_IS_EMBLEM_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_EMBLEM))
-#define G_EMBLEM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_EMBLEM, GEmblemClass))
-
-typedef struct _GEmblem        GEmblem;
-typedef struct _GEmblemClass   GEmblemClass;
-
+#define G_TYPE_EMBLEM (g_emblem_get_type ())
 GIO_AVAILABLE_IN_ALL
-GType          g_emblem_get_type        (void) G_GNUC_CONST;
+G_DECLARE_FINAL_TYPE (GEmblem, g_emblem, G, EMBLEM, GObject)
 
 GIO_AVAILABLE_IN_ALL
 GEmblem       *g_emblem_new             (GIcon         *icon);

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

@@ -58,7 +58,7 @@ struct _GEmblemedIconClass
 };
 
 GIO_AVAILABLE_IN_ALL
-GType  g_emblemed_icon_get_type    (void) G_GNUC_CONST;
+GType  g_emblemed_icon_get_type    (void);
 
 GIO_AVAILABLE_IN_ALL
 GIcon *g_emblemed_icon_new         (GIcon         *icon,

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

@@ -605,7 +605,7 @@ struct _GFileIface
 };
 
 GIO_AVAILABLE_IN_ALL
-GType                   g_file_get_type                   (void) G_GNUC_CONST;
+GType                   g_file_get_type                   (void);
 
 GIO_AVAILABLE_IN_ALL
 GFile *                 g_file_new_for_path               (const char                 *path);

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

@@ -92,7 +92,7 @@ struct _GFileEnumeratorClass
 };
 
 GIO_AVAILABLE_IN_ALL
-GType      g_file_enumerator_get_type          (void) G_GNUC_CONST;
+GType      g_file_enumerator_get_type          (void);
 
 GIO_AVAILABLE_IN_ALL
 GFileInfo *g_file_enumerator_next_file         (GFileEnumerator      *enumerator,

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

@@ -41,7 +41,7 @@ G_BEGIN_DECLS
 typedef struct _GFileIconClass   GFileIconClass;
 
 GIO_AVAILABLE_IN_ALL
-GType   g_file_icon_get_type (void) G_GNUC_CONST;
+GType   g_file_icon_get_type (void);
 
 GIO_AVAILABLE_IN_ALL
 GIcon * g_file_icon_new      (GFile     *file);