From 8ae87ce041d4491dccf2be7aecdc7359db5d6dec Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Wed, 10 Jan 2024 12:18:10 +0100
Subject: [PATCH] clutter: Mark FixedLayout as derivable

As GNOME Shell derives this type

Fixes: 5b527ac89 ("fixed-layout: Use macros for subclassing
boilerplate")

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3509>
---
 clutter/clutter/clutter-fixed-layout.c | 11 +++--------
 clutter/clutter/clutter-fixed-layout.h | 14 ++++++++++----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/clutter/clutter/clutter-fixed-layout.c b/clutter/clutter/clutter-fixed-layout.c
index f082a6164..2fed3d514 100644
--- a/clutter/clutter/clutter-fixed-layout.c
+++ b/clutter/clutter/clutter-fixed-layout.c
@@ -39,14 +39,9 @@
 #include "clutter/clutter-fixed-layout.h"
 #include "clutter/clutter-private.h"
 
-struct _ClutterFixedLayout
-{
-  ClutterLayoutManager parent_instance;
-};
-
-G_DEFINE_FINAL_TYPE (ClutterFixedLayout,
-                     clutter_fixed_layout,
-                     CLUTTER_TYPE_LAYOUT_MANAGER);
+G_DEFINE_TYPE (ClutterFixedLayout,
+               clutter_fixed_layout,
+               CLUTTER_TYPE_LAYOUT_MANAGER);
 
 static void
 clutter_fixed_layout_get_preferred_width (ClutterLayoutManager *manager,
diff --git a/clutter/clutter/clutter-fixed-layout.h b/clutter/clutter/clutter-fixed-layout.h
index 789a4732e..92c19b866 100644
--- a/clutter/clutter/clutter-fixed-layout.h
+++ b/clutter/clutter/clutter-fixed-layout.h
@@ -35,10 +35,16 @@ G_BEGIN_DECLS
 #define CLUTTER_TYPE_FIXED_LAYOUT               (clutter_fixed_layout_get_type ())
 
 CLUTTER_EXPORT
-G_DECLARE_FINAL_TYPE (ClutterFixedLayout,
-                      clutter_fixed_layout,
-                      CLUTTER, FIXED_LAYOUT,
-                      ClutterLayoutManager)
+G_DECLARE_DERIVABLE_TYPE (ClutterFixedLayout,
+                          clutter_fixed_layout,
+                          CLUTTER, FIXED_LAYOUT,
+                          ClutterLayoutManager)
+
+struct _ClutterFixedLayoutClass
+{
+  /*< private >*/
+  ClutterLayoutManagerClass parent_class;
+};
 
 CLUTTER_EXPORT
 ClutterLayoutManager *clutter_fixed_layout_new (void);