From d45623c2db570b7a2e0582943734d18f3d64b126 Mon Sep 17 00:00:00 2001
From: "Issam E. Maghni" <issam.e.maghni@mailbox.org>
Date: Fri, 7 May 2021 16:57:51 -0400
Subject: cairo: Replace <cairo/cairo.h> by <cairo.h>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For full context, read
https://gitlab.freedesktop.org/cairo/cairo/-/issues/479
TL;DR, cairo’s pc file adds `/cairo` to CFLAGS.
So namespace cairo shouldn’t be used.
---
 include/background-image.h |  2 +-
 include/cairo.h            | 14 --------------
 include/cairo_util.h       | 14 ++++++++++++++
 include/pango.h            |  2 +-
 include/pool-buffer.h      |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 include/cairo.h
 create mode 100644 include/cairo_util.h

(limited to 'include')

diff --git a/include/background-image.h b/include/background-image.h
index 15935ffd..a97ef375 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 c1275db2..00000000
--- a/include/cairo.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _SWAY_CAIRO_H
-#define _SWAY_CAIRO_H
-#include "config.h"
-#include <stdint.h>
-#include <cairo/cairo.h>
-#include <wayland-client-protocol.h>
-
-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);
-
-#endif
diff --git a/include/cairo_util.h b/include/cairo_util.h
new file mode 100644
index 00000000..dc049c6d
--- /dev/null
+++ b/include/cairo_util.h
@@ -0,0 +1,14 @@
+#ifndef _SWAY_CAIRO_UTIL_H
+#define _SWAY_CAIRO_UTIL_H
+#include "config.h"
+#include <stdint.h>
+#include <cairo.h>
+#include <wayland-client-protocol.h>
+
+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);
+
+#endif
diff --git a/include/pango.h b/include/pango.h
index 6ab83c16..75dbba27 100644
--- a/include/pango.h
+++ b/include/pango.h
@@ -3,7 +3,7 @@
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <cairo/cairo.h>
+#include <cairo.h>
 #include <pango/pangocairo.h>
 
 /**
diff --git a/include/pool-buffer.h b/include/pool-buffer.h
index 54f5be06..b7a95afe 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 <pango/pangocairo.h>
 #include <stdbool.h>
 #include <stdint.h>
-- 
cgit v1.2.3-54-g00ecf