From 3cb81c3573036a3606a4c7a1cedbe3e814a22773 Mon Sep 17 00:00:00 2001
From: "Issam E. Maghni" <issam.e.maghni@mailbox.org>
Date: Fri, 7 May 2021 17:36:07 -0400
Subject: cairo: Replace <cairo/cairo.h> by <cairo.h>

Same as https://github.com/swaywm/sway/pull/6262
---
 background-image.c         |  2 +-
 cairo.c                    |  4 ++--
 include/background-image.h |  2 +-
 include/cairo.h            | 25 -------------------------
 include/cairo_util.h       | 25 +++++++++++++++++++++++++
 include/pool-buffer.h      |  2 +-
 main.c                     |  2 +-
 pool-buffer.c              |  2 +-
 8 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100644 include/cairo.h
 create mode 100644 include/cairo_util.h

diff --git a/background-image.c b/background-image.c
index 63c9810..26cb6ee 100644
--- a/background-image.c
+++ b/background-image.c
@@ -1,6 +1,6 @@
 #include <assert.h>
 #include "background-image.h"
-#include "cairo.h"
+#include "cairo_util.h"
 #include "log.h"
 
 enum background_mode parse_background_mode(const char *mode) {
diff --git a/cairo.c b/cairo.c
index 75314bd..ee7d3ad 100644
--- a/cairo.c
+++ b/cairo.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
-#include <cairo/cairo.h>
-#include "cairo.h"
+#include <cairo.h>
+#include "cairo_util.h"
 #if HAVE_GDK_PIXBUF
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #endif
diff --git a/include/background-image.h b/include/background-image.h
index 15935ff..a97ef37 100644
--- a/include/background-image.h
+++ b/include/background-image.h
@@ -1,6 +1,6 @@
 #ifndef _SWAY_BACKGROUND_IMAGE_H
 #define _SWAY_BACKGROUND_IMAGE_H
-#include "cairo.h"
+#include "cairo_util.h"
 
 enum background_mode {
 	BACKGROUND_MODE_STRETCH,
diff --git a/include/cairo.h b/include/cairo.h
deleted file mode 100644
index 15664cd..0000000
--- a/include/cairo.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _SWAY_CAIRO_H
-#define _SWAY_CAIRO_H
-
-#include "config.h"
-#include <stdint.h>
-#include <cairo/cairo.h>
-#include <wayland-client.h>
-#if HAVE_GDK_PIXBUF
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#endif
-
-void cairo_set_source_u32(cairo_t *cairo, uint32_t color);
-cairo_subpixel_order_t to_cairo_subpixel_order(enum wl_output_subpixel subpixel);
-
-cairo_surface_t *cairo_image_surface_scale(cairo_surface_t *image,
-		int width, int height);
-
-#if HAVE_GDK_PIXBUF
-
-cairo_surface_t* gdk_cairo_image_surface_create_from_pixbuf(
-		const GdkPixbuf *gdkbuf);
-
-#endif // HAVE_GDK_PIXBUF
-
-#endif
diff --git a/include/cairo_util.h b/include/cairo_util.h
new file mode 100644
index 0000000..a64c355
--- /dev/null
+++ b/include/cairo_util.h
@@ -0,0 +1,25 @@
+#ifndef _SWAY_CAIRO_UTIL_H
+#define _SWAY_CAIRO_UTIL_H
+
+#include "config.h"
+#include <stdint.h>
+#include <cairo.h>
+#include <wayland-client.h>
+#if HAVE_GDK_PIXBUF
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#endif
+
+void cairo_set_source_u32(cairo_t *cairo, uint32_t color);
+cairo_subpixel_order_t to_cairo_subpixel_order(enum wl_output_subpixel subpixel);
+
+cairo_surface_t *cairo_image_surface_scale(cairo_surface_t *image,
+		int width, int height);
+
+#if HAVE_GDK_PIXBUF
+
+cairo_surface_t* gdk_cairo_image_surface_create_from_pixbuf(
+		const GdkPixbuf *gdkbuf);
+
+#endif // HAVE_GDK_PIXBUF
+
+#endif
diff --git a/include/pool-buffer.h b/include/pool-buffer.h
index 0ebf787..a3930e0 100644
--- a/include/pool-buffer.h
+++ b/include/pool-buffer.h
@@ -1,6 +1,6 @@
 #ifndef _SWAY_BUFFERS_H
 #define _SWAY_BUFFERS_H
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <wayland-client.h>
diff --git a/main.c b/main.c
index f0519b7..c03c27a 100644
--- a/main.c
+++ b/main.c
@@ -9,7 +9,7 @@
 #include <strings.h>
 #include <wayland-client.h>
 #include "background-image.h"
-#include "cairo.h"
+#include "cairo_util.h"
 #include "log.h"
 #include "pool-buffer.h"
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"
diff --git a/pool-buffer.c b/pool-buffer.c
index b3f1ef2..428ef51 100644
--- a/pool-buffer.c
+++ b/pool-buffer.c
@@ -1,6 +1,6 @@
 #define _POSIX_C_SOURCE 200809
 #include <assert.h>
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
-- 
cgit v1.2.3