I think there's an additional dash in the subject
>
> From: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
>
> The generic G_DEPRECATED* macros got introduced in 2.32, and spice-gtk
> depends on 2.36. We can drop our own.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
> ---
> doc/reference/spice-gtk-sections.txt | 3 ---
> src/channel-main.h | 8 ++++----
> src/spice-audio.h | 2 +-
> src/spice-channel.h | 5 ++---
> src/spice-util.h | 10 ----------
> src/usb-device-manager.h | 2 +-
> 6 files changed, 8 insertions(+), 22 deletions(-)
>
> diff --git a/doc/reference/spice-gtk-sections.txt
> b/doc/reference/spice-gtk-sections.txt
> index ebc2845..d5538d8 100644
> --- a/doc/reference/spice-gtk-sections.txt
> +++ b/doc/reference/spice-gtk-sections.txt
> @@ -434,10 +434,7 @@ spice_uuid_to_string
> SPICE_DEBUG
> spice_util_get_debug
> SPICE_RESERVED_PADDING
> -SPICE_DEPRECATED_FOR
> spice_g_signal_connect_object
> -SPICE_DEPRECATED
> -SPICE_GNUC_DEPRECATED_FOR
> </SECTION>
>
> <SECTION>
> diff --git a/src/channel-main.h b/src/channel-main.h
> index 3fe8df1..2bb6d10 100644
> --- a/src/channel-main.h
> +++ b/src/channel-main.h
> @@ -101,13 +101,13 @@ gboolean spice_main_file_copy_finish(SpiceMainChannel
> *channel,
> void spice_main_request_mouse_mode(SpiceMainChannel *channel, int mode);
>
> #ifndef SPICE_DISABLE_DEPRECATED
> -SPICE_DEPRECATED_FOR(spice_main_clipboard_selection_grab)
> +G_DEPRECATED_FOR(spice_main_clipboard_selection_grab)
> void spice_main_clipboard_grab(SpiceMainChannel *channel, guint32 *types,
> int ntypes);
> -SPICE_DEPRECATED_FOR(spice_main_clipboard_selection_release)
> +G_DEPRECATED_FOR(spice_main_clipboard_selection_release)
> void spice_main_clipboard_release(SpiceMainChannel *channel);
> -SPICE_DEPRECATED_FOR(spice_main_clipboard_selection_notify)
> +G_DEPRECATED_FOR(spice_main_clipboard_selection_notify)
> void spice_main_clipboard_notify(SpiceMainChannel *channel, guint32 type,
> const guchar *data, size_t size);
> -SPICE_DEPRECATED_FOR(spice_main_clipboard_selection_request)
> +G_DEPRECATED_FOR(spice_main_clipboard_selection_request)
> void spice_main_clipboard_request(SpiceMainChannel *channel, guint32 type);
> #endif
>
> diff --git a/src/spice-audio.h b/src/spice-audio.h
> index 01f564a..ce15eca 100644
> --- a/src/spice-audio.h
> +++ b/src/spice-audio.h
> @@ -104,7 +104,7 @@ GType spice_audio_get_type(void);
> SpiceAudio* spice_audio_get(SpiceSession *session, GMainContext *context);
>
> #ifndef SPICE_DISABLE_DEPRECATED
> -SPICE_DEPRECATED_FOR(spice_audio_get)
> +G_DEPRECATED_FOR(spice_audio_get)
> SpiceAudio* spice_audio_new(SpiceSession *session, GMainContext *context,
> const char *name);
> #endif
>
> diff --git a/src/spice-channel.h b/src/spice-channel.h
> index aa0d9cb..f79ec49 100644
> --- a/src/spice-channel.h
> +++ b/src/spice-channel.h
> @@ -24,7 +24,6 @@
>
> #include <gio/gio.h>
>
> -#include <spice/macros.h>
> #include "spice-types.h"
> #include "spice-glib-enums.h"
> #include "spice-util.h"
> @@ -137,9 +136,9 @@ gboolean
> spice_channel_test_common_capability(SpiceChannel *channel, guint32 cap
> void spice_channel_flush_async(SpiceChannel *channel, GCancellable
> *cancellable, GAsyncReadyCallback callback, gpointer user_data);
> gboolean spice_channel_flush_finish(SpiceChannel *channel, GAsyncResult
> *result, GError **error);
> #ifndef SPICE_DISABLE_DEPRECATED
> -SPICE_GNUC_DEPRECATED
> +G_DEPRECATED
> void spice_channel_set_capability(SpiceChannel *channel, guint32 cap);
> -SPICE_GNUC_DEPRECATED
> +G_DEPRECATED
> void spice_channel_destroy(SpiceChannel *channel);
> #endif
>
> diff --git a/src/spice-util.h b/src/spice-util.h
> index a2a7683..1d80f1c 100644
> --- a/src/spice-util.h
> +++ b/src/spice-util.h
> @@ -40,16 +40,6 @@ gchar* spice_uuid_to_string(const guint8 uuid[16]);
>
> #define SPICE_RESERVED_PADDING (10 * sizeof(void*))
>
> -/* need to be in a public header */
> -#ifndef SPICE_DEPRECATED_FOR
> -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
> -#define SPICE_DEPRECATED_FOR(f) \
> - __attribute__((deprecated("Use " #f " instead")))
> -#else
> -#define SPICE_DEPRECATED_FOR(f) G_GNUC_DEPRECATED
> -#endif /* __GNUC__ */
> -#endif
> -
> G_END_DECLS
>
> #endif /* SPICE_UTIL_H */
> diff --git a/src/usb-device-manager.h b/src/usb-device-manager.h
> index 41f20d8..773208f 100644
> --- a/src/usb-device-manager.h
> +++ b/src/usb-device-manager.h
> @@ -131,7 +131,7 @@ gboolean
> spice_usb_device_manager_disconnect_device_finish(
> SpiceUsbDeviceManager *self, GAsyncResult *res, GError **err);
>
> #ifndef SPICE_DISABLE_DEPRECATED
> -SPICE_DEPRECATED_FOR(spice_usb_device_manager_disconnect_device_async)
> +G_DEPRECATED_FOR(spice_usb_device_manager_disconnect_device_async)
> void spice_usb_device_manager_disconnect_device(SpiceUsbDeviceManager
> *manager,
> SpiceUsbDevice *device);
> #endif
Other than that looks fine.
Frediano
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel