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 | |
| 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.
| -rw-r--r-- | strata/gnome.morph | 6 | ||||
| -rw-r--r-- | strata/input-common.morph | 6 | ||||
| -rw-r--r-- | strata/input-common/libxkbcommon-no-x11.morph | 12 |
3 files changed, 22 insertions, 2 deletions
diff --git a/strata/gnome.morph b/strata/gnome.morph index 84503f7f..f322319a 100644 --- a/strata/gnome.morph +++ b/strata/gnome.morph @@ -244,6 +244,11 @@ chunks: build-depends: - p11-kit build-system: autotools +- name: libxkbcommon-x11 + repo: upstream:xorg-lib-libxkbcommon + ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28 + unpetrify-ref: xkbcommon-0.5.0 + build-system: autotools - name: mutter repo: upstream:mutter ref: 91fbee5d9e2c0ab9eabe9bf9a6e10cd44619c00c @@ -254,6 +259,7 @@ chunks: - gnome-desktop - gnome-settings-daemon - gsettings-desktop-schemas + - libxkbcommon-x11 - startup-notification - upower - zenity 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 diff --git a/strata/input-common/libxkbcommon-no-x11.morph b/strata/input-common/libxkbcommon-no-x11.morph new file mode 100644 index 00000000..1c8a1cb5 --- /dev/null +++ b/strata/input-common/libxkbcommon-no-x11.morph @@ -0,0 +1,12 @@ +name: libxkbcommon-no-x11 +kind: chunk + +description: | + xkbcommon is a library to handle keyboard descriptions. + + This version is built without X11 support. If built with X11 support, + it depends on the xcb-xkb library. + +build-system: autotools +configure-commands: +- ./autogen.sh --prefix="$PREFIX" --disable-x11 |