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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Avoid using xkbcommon headers in libwpe headers 
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
  • Loading branch information
@aperezdc
aperezdc committed Jun 1, 2022
commit a482fd5b22b9c6150e77ce2a901b5968e785a180
8 changes: 6 additions & 2 deletions include/wpe/input-xkb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,17 @@

#include <stdbool.h>
#include <stdint.h>
#include <xkbcommon/xkbcommon.h>
#include <xkbcommon/xkbcommon-compose.h>

#ifdef __cplusplus
extern "C" {
#endif

struct xkb_compose_state;
struct xkb_compose_table;
struct xkb_context;
struct xkb_keymap;
struct xkb_state;

struct wpe_input_xkb_context;

struct wpe_input_xkb_keymap_entry {
Expand Down
2 changes: 1 addition & 1 deletion wpe.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ libdir=${exec_prefix}/lib
Name: wpe-@WPE_API_VERSION@
Description: The wpe library
Version: @PROJECT_VERSION@
Requires: @WPE_PC_REQUIRES@
Requires.private: @WPE_PC_REQUIRES@
Cflags: -I${includedir}/wpe-@WPE_API_VERSION@ @WPE_PC_CFLAGS@
Libs: -L${libdir} -lwpe-@WPE_API_VERSION@