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 /swaybar | |
| 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)
Diffstat (limited to 'swaybar')
| -rw-r--r-- | swaybar/render.c | 2 | ||||
| -rw-r--r-- | swaybar/tray/item.c | 2 |
2 files changed, 2 insertions, 2 deletions
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" |