From fc6a1a3885132829cf95589d4bc8fe89514ed32c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Mon, 21 Dec 2015 11:46:16 +0000
Subject: Move xorg-lib-libxkbfile to x-common

mutter depends on it; this way we can make the GNOME stratum not build
depend in x-generic

Change-Id: I98f1284d8b0a4a1b309f3a046951c1c3d1aa70ba
---
 strata/x-common.morph  | 8 ++++++++
 strata/x-generic.morph | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/strata/x-common.morph b/strata/x-common.morph
index 0845a16a..33254949 100644
--- a/strata/x-common.morph
+++ b/strata/x-common.morph
@@ -344,3 +344,11 @@ chunks:
   - xorg-lib-libXext
   - xorg-proto-xextproto
   - xorg-proto-videoproto
+- name: xorg-lib-libxkbfile
+  repo: upstream:xorg-lib-libxkbfile
+  ref: 7381c2f9013ef7784c78091fa671e652a62ca706
+  unpetrify-ref: baserock/morph
+  build-system: autotools
+  build-depends:
+  - xorg-lib-libX11
+  - xorg-proto-kbproto
diff --git a/strata/x-generic.morph b/strata/x-generic.morph
index 519e9c85..4d93d770 100644
--- a/strata/x-generic.morph
+++ b/strata/x-generic.morph
@@ -7,11 +7,6 @@ build-depends:
 - morph: strata/x-common.morph
 - morph: strata/graphics-common.morph
 chunks:
-- name: xorg-lib-libxkbfile
-  repo: upstream:xorg-lib-libxkbfile
-  ref: 7381c2f9013ef7784c78091fa671e652a62ca706
-  unpetrify-ref: baserock/morph
-  build-system: autotools
 - name: xorg-font-util
   repo: upstream:xorg-font-util
   ref: 5f01ea79f1cb2328bfc4130b1e693f71be916b87
@@ -39,14 +34,11 @@ chunks:
   build-depends:
   - xorg-font-util
   - xorg-lib-libXfont
-  - xorg-lib-libxkbfile
 - name: xorg-app-xkbcomp
   repo: upstream:xorg-app-xkbcomp
   ref: 705b9bbb426410f9510601c7010da51184919b36
   unpetrify-ref: baserock/morph
   build-system: autotools
-  build-depends:
-  - xorg-lib-libxkbfile
 - name: xorg-app-xinit
   repo: upstream:xorg-app-xinit
   ref: 4e85bce64acef1fa0ddff04d59737444e942ff12
-- 
cgit v1.2.1