From 1de436684c5682298464a21ce3500ece57d264eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Tue, 26 May 2020 22:20:11 +0200
Subject: [PATCH] clutter: Include clutter-frame-clock.h from clutter.h

So that it can be used by libmutter and gnome-shell.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1285
---
 clutter/clutter/clutter-frame-clock.h            | 6 +++++-
 clutter/clutter/clutter.h                        | 1 +
 clutter/clutter/meson.build                      | 2 +-
 src/tests/clutter/conform/frame-clock-timeline.c | 1 -
 src/tests/clutter/conform/frame-clock.c          | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/clutter/clutter/clutter-frame-clock.h b/clutter/clutter/clutter-frame-clock.h
index 29360f307..20ed79fb2 100644
--- a/clutter/clutter/clutter-frame-clock.h
+++ b/clutter/clutter/clutter-frame-clock.h
@@ -18,11 +18,15 @@
 #ifndef CLUTTER_FRAME_CLOCK_H
 #define CLUTTER_FRAME_CLOCK_H
 
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <clutter/clutter.h> can be included directly."
+#endif
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdint.h>
 
-#include "clutter/clutter.h"
+#include "clutter/clutter-types.h"
 
 typedef enum _ClutterFrameResult
 {
diff --git a/clutter/clutter/clutter.h b/clutter/clutter/clutter.h
index efa52fa49..d09f8afed 100644
--- a/clutter/clutter/clutter.h
+++ b/clutter/clutter/clutter.h
@@ -63,6 +63,7 @@
 #include "clutter-feature.h"
 #include "clutter-fixed-layout.h"
 #include "clutter-flow-layout.h"
+#include "clutter-frame-clock.h"
 #include "clutter-gesture-action.h"
 #include "clutter-grid-layout.h"
 #include "clutter-image.h"
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index af5a0f3ea..42dbaa5c4 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -36,6 +36,7 @@ clutter_headers = [
   'clutter-feature.h',
   'clutter-fixed-layout.h',
   'clutter-flow-layout.h',
+  'clutter-frame-clock.h',
   'clutter-gesture-action.h',
   'clutter-grid-layout.h',
   'clutter-image.h',
@@ -192,7 +193,6 @@ clutter_private_headers = [
   'clutter-effect-private.h',
   'clutter-event-private.h',
   'clutter-flatten-effect.h',
-  'clutter-frame-clock.h',
   'clutter-graphene.h',
   'clutter-gesture-action-private.h',
   'clutter-id-pool.h',
diff --git a/src/tests/clutter/conform/frame-clock-timeline.c b/src/tests/clutter/conform/frame-clock-timeline.c
index 8efea0bf5..766d49f11 100644
--- a/src/tests/clutter/conform/frame-clock-timeline.c
+++ b/src/tests/clutter/conform/frame-clock-timeline.c
@@ -1,4 +1,3 @@
-#include "clutter-frame-clock.h"
 #include "clutter/clutter.h"
 #include "tests/clutter-test-utils.h"
 
diff --git a/src/tests/clutter/conform/frame-clock.c b/src/tests/clutter/conform/frame-clock.c
index 74bcc4228..1943c174a 100644
--- a/src/tests/clutter/conform/frame-clock.c
+++ b/src/tests/clutter/conform/frame-clock.c
@@ -1,4 +1,4 @@
-#include "clutter/clutter-frame-clock.h"
+#include "clutter/clutter.h"
 #include "tests/clutter-test-utils.h"
 
 static const float refresh_rate = 60.0;