cairo: Replace <cairo/cairo.h> by <cairo.h> #6262
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
emersion
reviewed
May 7, 2021
include/cairo_renderer.h
Outdated
| @@ -2,7 +2,7 @@ | |||
| #define _SWAY_CAIRO_H | |||
There was a problem hiding this comment.
The include guard needs to be updated as well.
Maybe cairo_util.h would be a better name?
There was a problem hiding this comment.
I chose cairo_renderer.h just like @Cloudef did in Cloudef/bemenu@ebd7338. Should I rename it to cairo_util.h?
There was a problem hiding this comment.
Yes. "Renderer" doesn't make much sense to me for Sway.
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.
concatime
force-pushed
the
fix-cairo-namespace
branch
from
c31cf9e to
927ddc5
Compare
concatime
added a commit
to concatime/swaybg
that referenced
this pull request
May 7, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For full context, read Cloudef/bemenu#170 and https://gitlab.freedesktop.org/cairo/cairo/-/issues/479.
TL;DR, cairo’s pc file adds
/cairoto CFLAGS.So namespace cairo shouldn’t be used.
It was working simply because
/usr/includeis always used, not because of Meson + pkg-config.A similar patch will land in swaybg too.
Thank you.