summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-09-07 19:58:59 +0100
committerJavier Jardón <jjardon@gnome.org>2015-09-07 20:01:37 +0100
commitbfbe004a3edb08bc8c8e285eb829fad3a057ffb0 (patch)
treeff0b906ff367ca04ce88a85bc5b67bbb2c82aae0
parent18242ab38f8514eb36852b29e2dd676f605ae523 (diff)
downloaddefinitions-bfbe004a3edb08bc8c8e285eb829fad3a057ffb0.tar.gz
Move libxkbcommon from wayland-generic to input-common
Its not a wayland dependency and it belongs to the input system Change-Id: I60765b8bc00c262bfa7c178b87dd11a2463a67a5
-rw-r--r--strata/input-common.morph5
-rw-r--r--strata/input-common/libxkbcommon.morph (renamed from strata/wayland-generic/libxkbcommon.morph)0
-rw-r--r--strata/wayland-generic.morph8
3 files changed, 5 insertions, 8 deletions
diff --git a/strata/input-common.morph b/strata/input-common.morph
index ee866f43..4a0326dd 100644
--- a/strata/input-common.morph
+++ b/strata/input-common.morph
@@ -27,3 +27,8 @@ chunks:
build-depends:
- mtdev
- libevdev
+- name: libxkbcommon
+ morph: strata/input-common/libxkbcommon.morph
+ repo: upstream:xorg-lib-libxkbcommon
+ ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28
+ unpetrify-ref: xkbcommon-0.5.0
diff --git a/strata/wayland-generic/libxkbcommon.morph b/strata/input-common/libxkbcommon.morph
index 04048abb..04048abb 100644
--- a/strata/wayland-generic/libxkbcommon.morph
+++ b/strata/input-common/libxkbcommon.morph
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
index 37a57c5b..cf89a1b5 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.morph
@@ -2,17 +2,9 @@ name: wayland-generic
kind: stratum
build-depends:
- morph: strata/core.morph
-- morph: strata/xorg-util-macros-common.morph
chunks:
-- name: libxkbcommon
- morph: strata/wayland-generic/libxkbcommon.morph
- repo: upstream:xorg-lib-libxkbcommon
- ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28
- unpetrify-ref: xkbcommon-0.5.0
- name: wayland
morph: strata/wayland-generic/wayland.morph
repo: upstream:wayland
ref: 60024af597b68974c451c89f960a7c11de11c33a
unpetrify-ref: 1.8.0
- build-depends:
- - libxkbcommon