mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cairo: Replace <cairo/cairo.h> by <cairo.h>

Browse source 
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 d45623c2db)
This commit is contained in:
Issam E. Maghni 2021-05-07 16:57:51 -04:00 • committed by Simon Ser
parent f0dd271ccf
commit 2b0765b464
13 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/pool-buffer.c
View file

@ -1,6 +1,6 @@
#define _POSIX_C_SOURCE 200809 #define _POSIX_C_SOURCE 200809
#include <assert.h> #include <assert.h>
#include <cairo/cairo.h> #include <cairo.h>
#include <fcntl.h> #include <fcntl.h>
#include <pango/pangocairo.h> #include <pango/pangocairo.h>
#include <stdio.h> #include <stdio.h>

2
common/background-image.c
View file

@ -1,6 +1,6 @@
#include <assert.h> #include <assert.h>
#include "background-image.h" #include "background-image.h"
#include "cairo.h" #include "cairo_util.h"
#include "log.h" #include "log.h"
#if HAVE_GDK_PIXBUF #if HAVE_GDK_PIXBUF
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>

4
common/cairo.c
View file

@ -1,6 +1,6 @@
#include <stdint.h> #include <stdint.h>
#include <cairo/cairo.h> #include <cairo.h>
#include "cairo.h" #include "cairo_util.h"
void cairo_set_source_u32(cairo_t *cairo, uint32_t color) { void cairo_set_source_u32(cairo_t *cairo, uint32_t color) {
cairo_set_source_rgba(cairo, cairo_set_source_rgba(cairo,

4
common/pango.c
View file

@ -1,4 +1,4 @@
#include <cairo/cairo.h> #include <cairo.h>
#include <pango/pangocairo.h> #include <pango/pangocairo.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdbool.h> #include <stdbool.h>
@ -6,7 +6,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "cairo.h" #include "cairo_util.h"
#include "log.h" #include "log.h"
#include "stringop.h" #include "stringop.h"

2
include/background-image.h
View file

@ -1,6 +1,6 @@
#ifndef _SWAY_BACKGROUND_IMAGE_H #ifndef _SWAY_BACKGROUND_IMAGE_H
#define _SWAY_BACKGROUND_IMAGE_H #define _SWAY_BACKGROUND_IMAGE_H
#include "cairo.h" #include "cairo_util.h"
enum background_mode { enum background_mode {
BACKGROUND_MODE_STRETCH, BACKGROUND_MODE_STRETCH,

6
include/cairo.h → include/cairo_util.h
View file

@ -1,8 +1,8 @@
#ifndef _SWAY_CAIRO_H #ifndef _SWAY_CAIRO_UTIL_H
#define _SWAY_CAIRO_H #define _SWAY_CAIRO_UTIL_H
#include "config.h" #include "config.h"
#include <stdint.h> #include <stdint.h>
#include <cairo/cairo.h> #include <cairo.h>
#include <wayland-client-protocol.h> #include <wayland-client-protocol.h>
void cairo_set_source_u32(cairo_t *cairo, uint32_t color); void cairo_set_source_u32(cairo_t *cairo, uint32_t color);

2
include/pango.h
View file

@ -3,7 +3,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <cairo/cairo.h> #include <cairo.h>
#include <pango/pangocairo.h> #include <pango/pangocairo.h>
/** /**

2
include/pool-buffer.h
View file

@ -1,6 +1,6 @@
#ifndef _SWAY_BUFFERS_H #ifndef _SWAY_BUFFERS_H
#define _SWAY_BUFFERS_H #define _SWAY_BUFFERS_H
#include <cairo/cairo.h> #include <cairo.h>
#include <pango/pangocairo.h> #include <pango/pangocairo.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>

2
sway/config.c
View file

@ -26,7 +26,7 @@
#include "sway/tree/arrange.h" #include "sway/tree/arrange.h"
#include "sway/tree/root.h" #include "sway/tree/root.h"
#include "sway/tree/workspace.h" #include "sway/tree/workspace.h"
#include "cairo.h" #include "cairo_util.h"
#include "pango.h" #include "pango.h"
#include "stringop.h" #include "stringop.h"
#include "list.h" #include "list.h"

2
sway/tree/container.c
View file

@ -7,7 +7,7 @@
#include <strings.h> #include <strings.h>
#include <wayland-server-core.h> #include <wayland-server-core.h>
#include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_output_layout.h>
#include "cairo.h" #include "cairo_util.h"
#include "pango.h" #include "pango.h"
#include "sway/config.h" #include "sway/config.h"
#include "sway/desktop.h" #include "sway/desktop.h"

2
swaybar/render.c
View file

@ -5,7 +5,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include "cairo.h" #include "cairo_util.h"
#include "pango.h" #include "pango.h"
#include "pool-buffer.h" #include "pool-buffer.h"
#include "swaybar/bar.h" #include "swaybar/bar.h"

2
swaybar/tray/item.c
View file

@ -13,7 +13,7 @@
#include "swaybar/tray/item.h" #include "swaybar/tray/item.h"
#include "swaybar/tray/tray.h" #include "swaybar/tray/tray.h"
#include "background-image.h" #include "background-image.h"
#include "cairo.h" #include "cairo_util.h"
#include "list.h" #include "list.h"
#include "log.h" #include "log.h"
#include "wlr-layer-shell-unstable-v1-client-protocol.h" #include "wlr-layer-shell-unstable-v1-client-protocol.h"

2
swaynag/render.c
View file

@ -1,5 +1,5 @@
#include <stdint.h> #include <stdint.h>
#include "cairo.h" #include "cairo_util.h"
#include "log.h" #include "log.h"
#include "pango.h" #include "pango.h"
#include "pool-buffer.h" #include "pool-buffer.h"