From eb2c33af1b56b322524d058dd6f560cb21d98a0d Mon Sep 17 00:00:00 2001
From: Javier Jardon <jjardon@gnome.org>
Date: Mon, 30 Mar 2015 13:32:22 +0000
Subject: Move XCB libraries to x-common and update to latest stable (0.4.x)

So we have all the xcb libraries together

Change-Id: I31712c4a68d1b75a104bcf758989f63b3aca39a0
---
 strata/x-common.morph               | 26 ++++++++++++++++++++++++++
 strata/x-generic.morph              | 19 -------------------
 strata/x-generic/util-keysyms.morph |  9 ---------
 3 files changed, 26 insertions(+), 28 deletions(-)
 delete mode 100644 strata/x-generic/util-keysyms.morph

diff --git a/strata/x-common.morph b/strata/x-common.morph
index 9836961f..c98a9e4a 100644
--- a/strata/x-common.morph
+++ b/strata/x-common.morph
@@ -119,6 +119,32 @@ chunks:
   build-depends:
   - xcb-proto
   - xorg-lib-libXau
+- name: xcb-util
+  repo: upstream:xcb-util
+  ref: 4de010f122da40e17b52866d07d1d501a66bf007
+  unpetrify-ref: baserock/0.4.0
+  build-depends:
+  - xcb-libxcb
+- name: util-wm
+  repo: upstream:util-wm
+  ref: fb7afc3f291c8cc072d327cd8d97ab1db3283c21
+  unpetrify-ref: baserock/0.4.1
+  build-depends:
+  - xcb-libxcb
+- name: util-keysyms
+  morph: strata/x-common/util-keysyms.morph
+  repo: upstream:util-keysyms
+  ref: edb763a8837d3932690b9d6d77cb7e20a9ab8013
+  unpetrify-ref: baserock/0.4.0
+  build-depends:
+  - xcb-libxcb
+- name: util-image
+  repo: upstream:util-image
+  ref: f20f25a1c017c58d5d7dfffc6e9adc8d31879152
+  unpetrify-ref: baserock/0.4.0
+  build-depends:
+  - xcb-libxcb
+  - xcb-util
 - name: xorg-lib-libxtrans
   repo: upstream:xorg-lib-libxtrans
   ref: 7cbad9fe2e61cd9d5caeaf361826a6f4bd320f03
diff --git a/strata/x-generic.morph b/strata/x-generic.morph
index a8a0660a..27a7c7b6 100644
--- a/strata/x-generic.morph
+++ b/strata/x-generic.morph
@@ -47,22 +47,3 @@ chunks:
   unpetrify-ref: baserock/morph
   build-depends:
   - xorg-lib-libxkbfile
-- name: xcb-util
-  repo: upstream:xcb-util
-  ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3
-  unpetrify-ref: baserock/morph
-- name: util-wm
-  repo: upstream:util-wm
-  ref: 18bde07dc7cb44617c0d159ccd9ef640804296e3
-  unpetrify-ref: baserock/morph
-- name: util-keysyms
-  morph: strata/x-generic/util-keysyms.morph
-  repo: upstream:util-keysyms
-  ref: 0be179eff4eadb99ee303891d1c29c4e4dd6fbab
-  unpetrify-ref: baserock/morph
-- name: util-image
-  repo: upstream:util-image
-  ref: 66b0caa72eb5011d89d0346424ea40b9e8e93816
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - xcb-util
diff --git a/strata/x-generic/util-keysyms.morph b/strata/x-generic/util-keysyms.morph
deleted file mode 100644
index ddae3707..00000000
--- a/strata/x-generic/util-keysyms.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: util-keysyms
-kind: chunk
-configure-commands:
-- git submodule update --init
-- ./autogen.sh --prefix=/usr
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
-- 
cgit v1.2.1