diff options
author | Issam E. Maghni <issam.e.maghni@mailbox.org> | 2021-05-07 16:57:51 -0400 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2021-06-24 18:21:29 +0200 |
commit | 2b0765b46498706b1b36efb6145949f9d0461e32 (patch) | |
tree | 1b8fd8874d3612a2cac1931fb8f55fdc89c1b1e8 | |
parent | view: handle case where map_ws is NULL (diff) | |
download | sway-2b0765b46498706b1b36efb6145949f9d0461e32.tar.gz sway-2b0765b46498706b1b36efb6145949f9d0461e32.tar.zst sway-2b0765b46498706b1b36efb6145949f9d0461e32.zip |
cairo: Replace <cairo/cairo.h> by <cairo.h>
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.
(cherry picked from commit d45623c2db570b7a2e0582943734d18f3d64b126)
-rw-r--r-- | client/pool-buffer.c | 2 | ||||
-rw-r--r-- | common/background-image.c | 2 | ||||
-rw-r--r-- | common/cairo.c | 4 | ||||
-rw-r--r-- | common/pango.c | 4 | ||||
-rw-r--r-- | include/background-image.h | 2 | ||||
-rw-r--r-- | include/cairo_util.h (renamed from include/cairo.h) | 6 | ||||
-rw-r--r-- | include/pango.h | 2 | ||||
-rw-r--r-- | include/pool-buffer.h | 2 | ||||
-rw-r--r-- | sway/config.c | 2 | ||||
-rw-r--r-- | sway/tree/container.c | 2 | ||||
-rw-r--r-- | swaybar/render.c | 2 | ||||
-rw-r--r-- | swaybar/tray/item.c | 2 | ||||
-rw-r--r-- | swaynag/render.c | 2 |
13 files changed, 17 insertions, 17 deletions
diff --git a/client/pool-buffer.c b/client/pool-buffer.c index fd500c49..ea31edd3 100644 --- a/client/pool-buffer.c +++ b/client/pool-buffer.c | |||
@@ -1,6 +1,6 @@ | |||
1 | #define _POSIX_C_SOURCE 200809 | 1 | #define _POSIX_C_SOURCE 200809 |
2 | #include <assert.h> | 2 | #include <assert.h> |
3 | #include <cairo/cairo.h> | 3 | #include <cairo.h> |
4 | #include <fcntl.h> | 4 | #include <fcntl.h> |
5 | #include <pango/pangocairo.h> | 5 | #include <pango/pangocairo.h> |
6 | #include <stdio.h> | 6 | #include <stdio.h> |
diff --git a/common/background-image.c b/common/background-image.c index de42e8e9..994a0805 100644 --- a/common/background-image.c +++ b/common/background-image.c | |||
@@ -1,6 +1,6 @@ | |||
1 | #include <assert.h> | 1 | #include <assert.h> |
2 | #include "background-image.h" | 2 | #include "background-image.h" |
3 | #include "cairo.h" | 3 | #include "cairo_util.h" |
4 | #include "log.h" | 4 | #include "log.h" |
5 | #if HAVE_GDK_PIXBUF | 5 | #if HAVE_GDK_PIXBUF |
6 | #include <gdk-pixbuf/gdk-pixbuf.h> | 6 | #include <gdk-pixbuf/gdk-pixbuf.h> |
diff --git a/common/cairo.c b/common/cairo.c index 403dcf49..7c59d48c 100644 --- a/common/cairo.c +++ b/common/cairo.c | |||
@@ -1,6 +1,6 @@ | |||
1 | #include <stdint.h> | 1 | #include <stdint.h> |
2 | #include <cairo/cairo.h> | 2 | #include <cairo.h> |
3 | #include "cairo.h" | 3 | #include "cairo_util.h" |
4 | 4 | ||
5 | void cairo_set_source_u32(cairo_t *cairo, uint32_t color) { | 5 | void cairo_set_source_u32(cairo_t *cairo, uint32_t color) { |
6 | cairo_set_source_rgba(cairo, | 6 | cairo_set_source_rgba(cairo, |
diff --git a/common/pango.c b/common/pango.c index fc3d0688..dbc369dc 100644 --- a/common/pango.c +++ b/common/pango.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #include <cairo/cairo.h> | 1 | #include <cairo.h> |
2 | #include <pango/pangocairo.h> | 2 | #include <pango/pangocairo.h> |
3 | #include <stdarg.h> | 3 | #include <stdarg.h> |
4 | #include <stdbool.h> | 4 | #include <stdbool.h> |
@@ -6,7 +6,7 @@ | |||
6 | #include <stdio.h> | 6 | #include <stdio.h> |
7 | #include <stdlib.h> | 7 | #include <stdlib.h> |
8 | #include <string.h> | 8 | #include <string.h> |
9 | #include "cairo.h" | 9 | #include "cairo_util.h" |
10 | #include "log.h" | 10 | #include "log.h" |
11 | #include "stringop.h" | 11 | #include "stringop.h" |
12 | 12 | ||
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 @@ | |||
1 | #ifndef _SWAY_BACKGROUND_IMAGE_H | 1 | #ifndef _SWAY_BACKGROUND_IMAGE_H |
2 | #define _SWAY_BACKGROUND_IMAGE_H | 2 | #define _SWAY_BACKGROUND_IMAGE_H |
3 | #include "cairo.h" | 3 | #include "cairo_util.h" |
4 | 4 | ||
5 | enum background_mode { | 5 | enum background_mode { |
6 | BACKGROUND_MODE_STRETCH, | 6 | BACKGROUND_MODE_STRETCH, |
diff --git a/include/cairo.h b/include/cairo_util.h index c1275db2..dc049c6d 100644 --- a/include/cairo.h +++ b/include/cairo_util.h | |||
@@ -1,8 +1,8 @@ | |||
1 | #ifndef _SWAY_CAIRO_H | 1 | #ifndef _SWAY_CAIRO_UTIL_H |
2 | #define _SWAY_CAIRO_H | 2 | #define _SWAY_CAIRO_UTIL_H |
3 | #include "config.h" | 3 | #include "config.h" |
4 | #include <stdint.h> | 4 | #include <stdint.h> |
5 | #include <cairo/cairo.h> | 5 | #include <cairo.h> |
6 | #include <wayland-client-protocol.h> | 6 | #include <wayland-client-protocol.h> |
7 | 7 | ||
8 | void cairo_set_source_u32(cairo_t *cairo, uint32_t color); | 8 | void cairo_set_source_u32(cairo_t *cairo, uint32_t color); |
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 @@ | |||
3 | #include <stdarg.h> | 3 | #include <stdarg.h> |
4 | #include <stdbool.h> | 4 | #include <stdbool.h> |
5 | #include <stdint.h> | 5 | #include <stdint.h> |
6 | #include <cairo/cairo.h> | 6 | #include <cairo.h> |
7 | #include <pango/pangocairo.h> | 7 | #include <pango/pangocairo.h> |
8 | 8 | ||
9 | /** | 9 | /** |
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 @@ | |||
1 | #ifndef _SWAY_BUFFERS_H | 1 | #ifndef _SWAY_BUFFERS_H |
2 | #define _SWAY_BUFFERS_H | 2 | #define _SWAY_BUFFERS_H |
3 | #include <cairo/cairo.h> | 3 | #include <cairo.h> |
4 | #include <pango/pangocairo.h> | 4 | #include <pango/pangocairo.h> |
5 | #include <stdbool.h> | 5 | #include <stdbool.h> |
6 | #include <stdint.h> | 6 | #include <stdint.h> |
diff --git a/sway/config.c b/sway/config.c index 76b9ec08..39013865 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include "sway/tree/arrange.h" | 26 | #include "sway/tree/arrange.h" |
27 | #include "sway/tree/root.h" | 27 | #include "sway/tree/root.h" |
28 | #include "sway/tree/workspace.h" | 28 | #include "sway/tree/workspace.h" |
29 | #include "cairo.h" | 29 | #include "cairo_util.h" |
30 | #include "pango.h" | 30 | #include "pango.h" |
31 | #include "stringop.h" | 31 | #include "stringop.h" |
32 | #include "list.h" | 32 | #include "list.h" |
diff --git a/sway/tree/container.c b/sway/tree/container.c index 8ca6a50d..2b51a723 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -7,7 +7,7 @@ | |||
7 | #include <strings.h> | 7 | #include <strings.h> |
8 | #include <wayland-server-core.h> | 8 | #include <wayland-server-core.h> |
9 | #include <wlr/types/wlr_output_layout.h> | 9 | #include <wlr/types/wlr_output_layout.h> |
10 | #include "cairo.h" | 10 | #include "cairo_util.h" |
11 | #include "pango.h" | 11 | #include "pango.h" |
12 | #include "sway/config.h" | 12 | #include "sway/config.h" |
13 | #include "sway/desktop.h" | 13 | #include "sway/desktop.h" |
diff --git a/swaybar/render.c b/swaybar/render.c index ebe127a5..fcc8be1d 100644 --- a/swaybar/render.c +++ b/swaybar/render.c | |||
@@ -5,7 +5,7 @@ | |||
5 | #include <stdlib.h> | 5 | #include <stdlib.h> |
6 | #include <stdint.h> | 6 | #include <stdint.h> |
7 | #include <string.h> | 7 | #include <string.h> |
8 | #include "cairo.h" | 8 | #include "cairo_util.h" |
9 | #include "pango.h" | 9 | #include "pango.h" |
10 | #include "pool-buffer.h" | 10 | #include "pool-buffer.h" |
11 | #include "swaybar/bar.h" | 11 | #include "swaybar/bar.h" |
diff --git a/swaybar/tray/item.c b/swaybar/tray/item.c index c9da51d4..19f4beac 100644 --- a/swaybar/tray/item.c +++ b/swaybar/tray/item.c | |||
@@ -13,7 +13,7 @@ | |||
13 | #include "swaybar/tray/item.h" | 13 | #include "swaybar/tray/item.h" |
14 | #include "swaybar/tray/tray.h" | 14 | #include "swaybar/tray/tray.h" |
15 | #include "background-image.h" | 15 | #include "background-image.h" |
16 | #include "cairo.h" | 16 | #include "cairo_util.h" |
17 | #include "list.h" | 17 | #include "list.h" |
18 | #include "log.h" | 18 | #include "log.h" |
19 | #include "wlr-layer-shell-unstable-v1-client-protocol.h" | 19 | #include "wlr-layer-shell-unstable-v1-client-protocol.h" |
diff --git a/swaynag/render.c b/swaynag/render.c index cf2cc9e0..2a7f869a 100644 --- a/swaynag/render.c +++ b/swaynag/render.c | |||
@@ -1,5 +1,5 @@ | |||
1 | #include <stdint.h> | 1 | #include <stdint.h> |
2 | #include "cairo.h" | 2 | #include "cairo_util.h" |
3 | #include "log.h" | 3 | #include "log.h" |
4 | #include "pango.h" | 4 | #include "pango.h" |
5 | #include "pool-buffer.h" | 5 | #include "pool-buffer.h" |