From c1edf4be1f13e0775380c58c3d59c65c8e97435d Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jp.nurmi@canonical.com>
Date: Fri, 16 Sep 2022 17:17:04 +0200
Subject: [PATCH] Use G_DECLARE_FINAL_TYPE to fix build with flutter-snap
 (#211)

The Clang version in core18-based flutter-snap is not happy with
`G_DEFINE_AUTOPTR_CLEANUP_FUNC`. Using `G_DECLARE_FINAL_TYPE` gives
autoptr support in a way that makes the old Clang happy.

Fixes: #210
---
 linux/include/yaru/yaru_plugin.h | 5 +----
 linux/yaru_plugin.cc             | 5 -----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/linux/include/yaru/yaru_plugin.h b/linux/include/yaru/yaru_plugin.h
index b285b4923..4ddb526f6 100644
--- a/linux/include/yaru/yaru_plugin.h
+++ b/linux/include/yaru/yaru_plugin.h
@@ -11,10 +11,7 @@ G_BEGIN_DECLS
 #define FLUTTER_PLUGIN_EXPORT
 #endif
 
-typedef struct _YaruPlugin YaruPlugin;
-typedef struct {
-  GObjectClass parent_class;
-} YaruPluginClass;
+G_DECLARE_FINAL_TYPE(YaruPlugin, yaru_plugin, YARU, PLUGIN, GObject)
 
 FLUTTER_PLUGIN_EXPORT GType yaru_plugin_get_type();
 
diff --git a/linux/yaru_plugin.cc b/linux/yaru_plugin.cc
index bf7db812a..fb92df402 100644
--- a/linux/yaru_plugin.cc
+++ b/linux/yaru_plugin.cc
@@ -3,11 +3,6 @@
 #include <flutter_linux/flutter_linux.h>
 #include <gtk/gtk.h>
 
-#define YARU_PLUGIN(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), yaru_plugin_get_type(), YaruPlugin))
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(YaruPlugin, g_object_unref)
-
 struct _YaruPlugin {
   GObject parent_instance;
   gint theme_name_changed_id;