Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid using xkbcommon headers in libwpe headers #108

Merged
merged 1 commit into from
Jun 1, 2022
Merged

Avoid using xkbcommon headers in libwpe headers #108

merged 1 commit into from
Jun 1, 2022

Conversation

aperezdc
Copy link
Contributor

@aperezdc aperezdc commented Jun 1, 2022

Forward-declare a few opaque types in input-xkb.h in order to avoid needing to list xkbcommon as a public dependency in the generated pkg-config module files. This allows programs which do not use libwpe's xkbcommon functions to skip linking against libxkbcommon, even if libwpe has been built with libxkbcommon support.

Fixes #107

@aperezdc
Avoid using xkbcommon headers in libwpe headers
a482fd5 
Forward-declare a few opaque types in "input-xkb.h" in order to avoid
needing to list "xkbcommon" as a public dependency in the generated
pkg-config module files. This allows programs which do not use libwpe's
xkbcommon functions to skip linking against libxkbcommon, even if libwpe
has been built with libxkbcommon support.

Fixes #107
@aperezdc aperezdc added this to the 1.14 milestone Jun 1, 2022
@aperezdc aperezdc self-assigned this Jun 1, 2022
@ceyusa
Copy link
Contributor

ceyusa commented Jun 1, 2022

lgtm

@aperezdc aperezdc merged commit d4feda6 into master Jun 1, 2022
@aperezdc aperezdc deleted the aperezedc/pkgconf-xkb-dep branch June 1, 2022 15:10
@ceyusa
Copy link
Contributor

ceyusa commented Jul 11, 2022

Testing with this patch I had to add include <xkbcommon/xkbcommon.h> header in WebKit:

diff --git a/Tools/wpe/backends/fdo/WindowViewBackend.cpp b/Tools/wpe/backends/fdo/WindowViewBackend.cpp
index dfae1f93a8ee..840f42397b7e 100644
--- a/Tools/wpe/backends/fdo/WindowViewBackend.cpp
+++ b/Tools/wpe/backends/fdo/WindowViewBackend.cpp
@@ -32,6 +32,7 @@
 #include <mutex>
 #include <sys/mman.h>
 #include <unistd.h>
+#include <xkbcommon/xkbcommon.h>
 
 // This include order is necessary to enforce the Wayland EGL platform.
 #include <wayland-egl.h>

@aperezdc aperezdc mentioned this pull request Sep 24, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@philn philn philn approved these changes

@clopez clopez Awaiting requested review from clopez

@guijemont guijemont Awaiting requested review from guijemont

@alexgcastro alexgcastro Awaiting requested review from alexgcastro

@magomez magomez Awaiting requested review from magomez

Assignees

@aperezdc aperezdc

Labels
None yet
Milestone
1.14
Development

Successfully merging this pull request may close these issues.

1.13.2: missig pkgconfig dependency
3 participants
@aperezdc @ceyusa @philn