From c01ffdb8ba29e11e346a64a756660571ead89631 Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Thu, 21 Sep 2023 13:20:20 +0200
Subject: [PATCH] cogl/gir: Depend explicitly on Mtk

As it is used now for MtkRegion types making the GIR file not containing
the relevant dependency and not being able to resolve MtkRegion type

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3292>
---
 cogl/cogl-pango/meson.build          | 1 +
 cogl/cogl/meson.build                | 8 +++++++-
 doc/reference/cogl-pango/meson.build | 1 +
 doc/reference/cogl/meson.build       | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/cogl/cogl-pango/meson.build b/cogl/cogl-pango/meson.build
index c270215df..d5f622f40 100644
--- a/cogl/cogl-pango/meson.build
+++ b/cogl/cogl-pango/meson.build
@@ -45,6 +45,7 @@ if have_introspection
     symbol_prefix: 'cogl_pango',
     header: 'cogl-pango.h',
     includes: [
+      libmutter_mtk_gir[0],
       libmutter_cogl_gir[0],
       'Pango-1.0',
       'PangoCairo-1.0'
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index 8d40cc571..e5c2602f7 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -436,7 +436,13 @@ if have_introspection
     sources: cogl_introspected_headers,
     nsversion: libmutter_api_version,
     namespace: 'Cogl',
-    includes: ['cairo-1.0', 'GL-1.0', 'GObject-2.0', 'Graphene-1.0'],
+    includes: [
+      libmutter_mtk_gir[0],
+      'cairo-1.0',
+      'GL-1.0',
+      'GObject-2.0',
+      'Graphene-1.0', 
+    ],
     dependencies: [cogl_deps],
     export_packages: 'mutter-cogl-@0@'.format(libmutter_api_version),
     extra_args: introspection_args + [
diff --git a/doc/reference/cogl-pango/meson.build b/doc/reference/cogl-pango/meson.build
index a5693489b..49f1dddf6 100644
--- a/doc/reference/cogl-pango/meson.build
+++ b/doc/reference/cogl-pango/meson.build
@@ -14,6 +14,7 @@ custom_target('cogl-pango-doc',
     gidocgen,
     'generate',
     gidocgen_common_args,
+    '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../mtk/mtk'),
     '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../cogl/cogl'),
     '--config=@INPUT0@',
     '--output-dir=@OUTPUT@',
diff --git a/doc/reference/cogl/meson.build b/doc/reference/cogl/meson.build
index 90b45cd42..1b378a3df 100644
--- a/doc/reference/cogl/meson.build
+++ b/doc/reference/cogl/meson.build
@@ -14,6 +14,7 @@ custom_target('cogl-doc',
     gidocgen,
     'generate',
     gidocgen_common_args,
+    '--add-include-path=@0@'.format(meson.current_build_dir() / '../../../mtk/mtk'),
     '--config=@INPUT0@',
     '--output-dir=@OUTPUT@',
     '--content-dir=@0@'.format(meson.current_source_dir()),