From 60b575347de21167e0778a63ef75f4bb0a721d68 Mon Sep 17 00:00:00 2001
From: Tristan Van Berkom <tristan.vanberkom@codethink.co.uk>
Date: Fri, 16 Oct 2015 13:10:59 +0900
Subject: Removing ICU from gnome stratum, using icu-common instead

Also including icu-common stratum in gnome-system-x86_64 build

Change-Id: I648fb3582fac8d0a7fcd0706ff32850c7420f445
---
 strata/gnome.morph                | 7 +------
 strata/gnome/icu.morph            | 8 --------
 systems/gnome-system-x86_64.morph | 2 ++
 3 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 strata/gnome/icu.morph

diff --git a/strata/gnome.morph b/strata/gnome.morph
index ed215746..79abcb5a 100644
--- a/strata/gnome.morph
+++ b/strata/gnome.morph
@@ -2,6 +2,7 @@ name: gnome
 kind: stratum
 description: GNOME stratum
 build-depends:
+- morph: strata/icu-common.morph
 - morph: strata/input-common.morph
 - morph: strata/tools.morph
 - morph: strata/gtk3.morph
@@ -312,11 +313,6 @@ chunks:
   - clutter
   - libgee
   - libxklavier
-- name: icu
-  morph: strata/gnome/icu.morph
-  repo: upstream:icu
-  ref: ba023548a3bff7277cbea4acade3042ce9d8949e
-  unpetrify-ref: baserock/morph
 - name: libsecret
   morph: strata/gnome/libsecret.morph
   repo: upstream:gnome/libsecret
@@ -329,7 +325,6 @@ chunks:
   unpetrify-ref: master
   build-depends:
   - gcr
-  - icu
   - libgweather
   - libsecret
 - name: gnome-shell
diff --git a/strata/gnome/icu.morph b/strata/gnome/icu.morph
deleted file mode 100644
index 5a9b069a..00000000
--- a/strata/gnome/icu.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: icu
-kind: chunk
-configure-commands:
-- cd source; ./runConfigureICU Linux --prefix=/usr --sysconfdir=/etc
-build-commands:
-- cd source; unset TARGET ; make
-install-commands:
-- cd source; unset TARGET ; make DESTDIR="$DESTDIR" install
diff --git a/systems/gnome-system-x86_64.morph b/systems/gnome-system-x86_64.morph
index 8c1e4a75..da9f0fa3 100644
--- a/systems/gnome-system-x86_64.morph
+++ b/systems/gnome-system-x86_64.morph
@@ -57,6 +57,8 @@ strata:
   morph: strata/x-generic.morph
 - name: network-security
   morph: strata/network-security.morph
+- name: icu-common
+  morph: strata/icu-common.morph
 configuration-extensions:
 - extensions/set-hostname
 - extensions/add-config-files
-- 
cgit v1.2.1