From 6e304f1b7641f65b533a832b700b5eb744690632 Mon Sep 17 00:00:00 2001
From: Jonathan Maw <jonathan.maw@codethink.co.uk>
Date: Thu, 7 May 2015 12:40:21 +0000
Subject: Use the baserock-standard pygobject

Change-Id: Ie2eac8e580010f92d50b684af6e866f10e3a8c23
---
 strata/genivi-demo-platform.morph                 | 13 +------------
 strata/genivi-demo-platform/pygobject.morph       |  8 --------
 systems/genivi-demo-platform-x86_64-generic.morph |  2 ++
 3 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 strata/genivi-demo-platform/pygobject.morph

diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph
index a66beec7..d2d5cd05 100644
--- a/strata/genivi-demo-platform.morph
+++ b/strata/genivi-demo-platform.morph
@@ -9,6 +9,7 @@ build-depends:
 - morph: strata/genivi.morph
 - morph: strata/wayland-generic.morph
 - morph: strata/weston-genivi.morph
+- morph: strata/python-pygobject.morph
 chunks:
 - name: mm-common
   morph: strata/genivi-demo-platform/mm-common.morph
@@ -58,17 +59,6 @@ chunks:
   repo: upstream:dbus-python
   ref: d0d5b5be685dc4c16b21c54335becc87ca4d6f58
   unpetrify-ref: dbus-python-1.2.0
-- name: gnome-common
-  repo: upstream:gnome-common
-  ref: d213283fcb5228d05eb2c796579f18240e8467e8
-  unpetrify-ref: 3.12.0
-- name: pygobject
-  morph: strata/genivi-demo-platform/pygobject.morph
-  repo: upstream:pygobject
-  ref: ecb2e6c64cbc420ed8f0d8dc8d1c3f6c516d6f63
-  unpetrify-ref: pygobject-3-16
-  build-depends:
-  - gnome-common
 - name: automotive-message-broker
   morph: strata/genivi-demo-platform/automotive-message-broker.morph
   repo: upstream:automotive-message-broker
@@ -76,7 +66,6 @@ chunks:
   unpetrify-ref: "0.14"
   build-depends:
   - dbus-python
-  - pygobject
   - boost
 - name: audiomanager-poc
   morph: strata/genivi-demo-platform/audiomanager-poc.morph
diff --git a/strata/genivi-demo-platform/pygobject.morph b/strata/genivi-demo-platform/pygobject.morph
deleted file mode 100644
index d7582bec..00000000
--- a/strata/genivi-demo-platform/pygobject.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: pygobject
-kind: chunk
-build-system: autotools
-pre-configure-commands:
-- sed -i 's/automake-1.11/automake-1.15/g' autogen.sh
-- sed -i 's/aclocal-1.11/aclocal-1.15/g' autogen.sh
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --disable-cairo
diff --git a/systems/genivi-demo-platform-x86_64-generic.morph b/systems/genivi-demo-platform-x86_64-generic.morph
index 567747c3..79843897 100644
--- a/systems/genivi-demo-platform-x86_64-generic.morph
+++ b/systems/genivi-demo-platform-x86_64-generic.morph
@@ -49,6 +49,8 @@ strata:
   morph: strata/qt5-tools-qtwebkit.morph
 - name: gtk2
   morph: strata/gtk2.morph
+- name: python-pygobject
+  morph: strata/python-pygobject.morph
 - name: genivi-demo-platform
   morph: strata/genivi-demo-platform.morph
 - name: tools
-- 
cgit v1.2.1