From 156fe0fdd8e85bb7b4cdee1e38dedf8e44a99d38 Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <belmouss@redhat.com>
Date: Mon, 4 Sep 2023 18:19:55 +0200
Subject: [PATCH] mtk: Make Rectangle no longer a typedef

Now that we provide our own Region type which uses
MtkRectangle directly, there is no longer a need to go through cairo

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3292>
---
 mtk/meson.build         |  1 -
 mtk/mtk/mtk-rectangle.h | 13 +------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/mtk/meson.build b/mtk/meson.build
index 1b2609c50..6e7e347d6 100644
--- a/mtk/meson.build
+++ b/mtk/meson.build
@@ -28,7 +28,6 @@ supported_mtk_debug_c_args = cc.get_supported_arguments(mtk_debug_c_args)
 mtk_c_args += mtk_debug_c_args
 
 mtk_pkg_deps = [
-  cairo_gobject_dep,
   glib_dep,
   gobject_dep,
   gio_dep,
diff --git a/mtk/mtk/mtk-rectangle.h b/mtk/mtk/mtk-rectangle.h
index 420ad73a0..e8c5f59ab 100644
--- a/mtk/mtk/mtk-rectangle.h
+++ b/mtk/mtk/mtk-rectangle.h
@@ -21,7 +21,6 @@
 
 #pragma once
 
-#include <cairo.h>
 #include <glib-object.h>
 #include <graphene.h>
 
@@ -44,14 +43,6 @@ typedef enum _MtkRoundingStrategy
  * @width: Width of the rectangle
  * @height: Height of the rectangle
  */
-#ifdef __GI_SCANNER__
-/* The introspection scanner is currently unable to lookup how
- * cairo_rectangle_int_t is actually defined. This prevents
- * introspection data for the GdkRectangle type to include fields
- * descriptions. To workaround this issue, we define it with the same
- * content as cairo_rectangle_int_t, but only under the introspection
- * define.
- */
 struct _MtkRectangle
 {
   int x;
@@ -59,10 +50,8 @@ struct _MtkRectangle
   int width;
   int height;
 };
+
 typedef struct _MtkRectangle MtkRectangle;
-#else
-typedef cairo_rectangle_int_t MtkRectangle;
-#endif
 
 #define MTK_RECTANGLE_INIT(_x, _y, _width, _height) \
         (MtkRectangle) { \