diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-09-22 10:20:15 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-09-24 16:59:12 +0000 |
commit | 31d0966a86773ba554e47b7ef522c66348139152 (patch) | |
tree | e806976f3180bc344c588fa24e34b136c483f2d4 /strata/input-common.morph | |
parent | edc6de1bdf8e6436a08bbde9f57dff19f4031041 (diff) | |
download | definitions-31d0966a86773ba554e47b7ef522c66348139152.tar.gz |
Fix libxkbcommon build
In commit bfbe004a3edb08b, libxkbcommon was moved to the input-common
stratum. This failed to build for me with the following error:
configure: error: xkbcommon-x11 requires xcb-xkb >= 1.10 which
was not found. You can disable X11 support with --disable-x11.
Commit 14c0c70aed1bd9ac enables X11 support in libxkbcommon, because
the Mutter compositor needs this enabled. It seems that the best thing
to do at present is to build the X11 variant of the library just for
Mutter, as we don't want the input-common stratum to depend on the
whole of X11.
Diffstat (limited to 'strata/input-common.morph')
-rw-r--r-- | strata/input-common.morph | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/strata/input-common.morph b/strata/input-common.morph index 97721db7..c2ac35d7 100644 --- a/strata/input-common.morph +++ b/strata/input-common.morph @@ -28,8 +28,10 @@ chunks: build-depends: - mtdev - libevdev -- name: libxkbcommon +- name: libxkbcommon-no-x11 repo: upstream:xorg-lib-libxkbcommon ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28 + morph: strata/input-common/libxkbcommon-no-x11.morph unpetrify-ref: xkbcommon-0.5.0 - build-system: autotools + build-depends: + - xkeyboard-config |