From bd62a234a5cd6224c4d1ca065a74caa8c84e32dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 31 Jul 2014 13:48:28 +0100
Subject: gtk2.morph: librsvg is not a GTK+ dependency

Move to xfce stratum for now as seems to be the only stratum that
requires it
---
 gtk2.morph | 17 -----------------
 xfce.morph | 10 ++++++++++
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/gtk2.morph b/gtk2.morph
index 01eef819..8389cec4 100644
--- a/gtk2.morph
+++ b/gtk2.morph
@@ -21,12 +21,6 @@ chunks:
   ref: 2f83c385ff3d5493602308b62ca6d7707725b4fd
   unpetrify-ref: Release-v4-0-3
   build-depends: []
-- name: libcroco
-  repo: upstream:libcroco
-  ref: 611f624a6e15065792b41eb5ce14811293f3fb0a
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - gnome-common
 - name: gdk-pixbuf
   repo: upstream:gdk-pixbuf
   ref: bc45874c7ba5a6a95f032b48ab78115b3e2238ad
@@ -90,14 +84,3 @@ chunks:
   - cairo
   - atk
   - at-spi2-atk
-- name: librsvg
-  repo: upstream:librsvg
-  ref: 61171ca59d02b58b7da1697ca1d924bff93e66cb
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - cairo
-  - gdk-pixbuf
-  - gnome-common
-  - gtk+
-  - libcroco
-  - pango
diff --git a/xfce.morph b/xfce.morph
index e3dcb8ee..535a6aca 100644
--- a/xfce.morph
+++ b/xfce.morph
@@ -6,6 +6,16 @@ build-depends:
 - morph: gtk2
 - morph: x-generic
 chunks:
+- name: libcroco
+  repo: upstream:libcroco
+  ref: 611f624a6e15065792b41eb5ce14811293f3fb0a
+  unpetrify-ref: baserock/morph
+  build-depends: []
+- name: librsvg
+  repo: upstream:librsvg
+  ref: 61171ca59d02b58b7da1697ca1d924bff93e66cb
+  unpetrify-ref: baserock/morph
+  build-depends: []
 - name: xfce-dev-tools
   repo: upstream:xfce/xfce4-dev-tools
   ref: 9244250ac0c15ba160688758c5dccf97f3f160ef
-- 
cgit v1.2.1


From 10b8c6cb1607dfab361317568f9541cd3a5d84e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 31 Jul 2014 13:48:29 +0100
Subject: Move GTK+ dependencies to a new 'gtk-deps' stratum

As they are shared by GTK+2 and GTK+3
---
 gtk-deps.morph | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 gtk2.morph     | 76 ++--------------------------------------------------------
 2 files changed, 78 insertions(+), 74 deletions(-)
 create mode 100644 gtk-deps.morph

diff --git a/gtk-deps.morph b/gtk-deps.morph
new file mode 100644
index 00000000..30bc64bc
--- /dev/null
+++ b/gtk-deps.morph
@@ -0,0 +1,76 @@
+name: gtk-deps
+kind: stratum
+description: the GTK+ dependencies stratum
+build-depends:
+- morph: foundation
+- morph: x-common
+- morph: x-generic
+chunks:
+- name: shared-mime-info
+  repo: upstream:shared-mime-info
+  ref: 0d440d85a126ff8d535d4f70f2203a76a21d5f71
+  unpetrify-ref: baserock/morph
+  build-depends: []
+- name: gnome-common
+  repo: upstream:gnome-common
+  ref: 66d54b57313f0f6206cff32972d2b83d683628b2
+  unpetrify-ref: 3.7.4
+  build-depends: []
+- name: libtiff
+  repo: upstream:libtiff
+  ref: 2f83c385ff3d5493602308b62ca6d7707725b4fd
+  unpetrify-ref: Release-v4-0-3
+  build-depends: []
+- name: gdk-pixbuf
+  repo: upstream:gdk-pixbuf
+  ref: bc45874c7ba5a6a95f032b48ab78115b3e2238ad
+  unpetrify-ref: baserock/morph
+  build-depends:
+  - libtiff
+- name: atk
+  repo: upstream:atk
+  ref: e35410e06337afa3d66fcdde9b16422648de4e04
+  unpetrify-ref: ATK_2_9_3
+  build-depends:
+  - gnome-common
+- name: at-spi2-core
+  repo: upstream:at-spi2-core
+  ref: 9bfebf07e866acadb5d2123568fd0119a7e0575b
+  unpetrify-ref: AT_SPI2_CORE_2_9_5
+  build-depends: []
+- name: at-spi2-atk
+  repo: upstream:at-spi2-atk
+  ref: 363953fff4e3e12152ce2498b58a471884b497f5
+  unpetrify-ref: baserock/morph
+  build-depends:
+  - at-spi2-core
+  - atk
+- name: cairo
+  repo: upstream:cairo
+  ref: 25ef4d21f1616ddd9a6550cf7a129b2634b6caad
+  unpetrify-ref: 1.12.14
+  build-depends: []
+- name: colm
+  repo: upstream:colm
+  ref: 746b80d9b15dceca54dff43123d56ffcb6e42f06
+  unpetrify-ref: 0.11.1
+  build-depends: []
+- name: ragel
+  repo: upstream:ragel
+  ref: 5d4102ffe43a15608e0e864fc7e7f5c6c3b49aac
+  unpetrify-ref: baserock/morph
+  build-depends:
+  - colm
+- name: harfbuzz
+  repo: upstream:harfbuzz
+  ref: f0530a3d5d2e7b6eaa8325a310d458c478f505c9
+  unpetrify-ref: 0.9.19
+  build-depends:
+  - ragel
+- name: pango
+  repo: upstream:pango
+  ref: c05f6e5205711e97727885a86a57661c7e9cdc75
+  unpetrify-ref: baserock/xfce-build
+  build-depends:
+  - cairo
+  - harfbuzz
diff --git a/gtk2.morph b/gtk2.morph
index 8389cec4..50c0b9fd 100644
--- a/gtk2.morph
+++ b/gtk2.morph
@@ -3,84 +3,12 @@ kind: stratum
 description: the gtk2 stratum
 build-depends:
 - morph: genivi-foundation
+- morph: gtk-deps
 - morph: x-common
 - morph: x-generic
 chunks:
-- name: shared-mime-info
-  repo: upstream:shared-mime-info
-  ref: 0d440d85a126ff8d535d4f70f2203a76a21d5f71
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: gnome-common
-  repo: upstream:gnome-common
-  ref: 66d54b57313f0f6206cff32972d2b83d683628b2
-  unpetrify-ref: 3.7.4
-  build-depends: []
-- name: libtiff
-  repo: upstream:libtiff
-  ref: 2f83c385ff3d5493602308b62ca6d7707725b4fd
-  unpetrify-ref: Release-v4-0-3
-  build-depends: []
-- name: gdk-pixbuf
-  repo: upstream:gdk-pixbuf
-  ref: bc45874c7ba5a6a95f032b48ab78115b3e2238ad
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - libtiff
-- name: atk
-  repo: upstream:atk
-  ref: e35410e06337afa3d66fcdde9b16422648de4e04
-  unpetrify-ref: ATK_2_9_3
-  build-depends:
-  - gnome-common
-- name: at-spi2-core
-  repo: upstream:at-spi2-core
-  ref: 9bfebf07e866acadb5d2123568fd0119a7e0575b
-  unpetrify-ref: AT_SPI2_CORE_2_9_5
-  build-depends: []
-- name: at-spi2-atk
-  repo: upstream:at-spi2-atk
-  ref: 363953fff4e3e12152ce2498b58a471884b497f5
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - at-spi2-core
-  - atk
-- name: cairo
-  repo: upstream:cairo
-  ref: 25ef4d21f1616ddd9a6550cf7a129b2634b6caad
-  unpetrify-ref: 1.12.14
-  build-depends: []
-- name: colm
-  repo: upstream:colm
-  ref: 746b80d9b15dceca54dff43123d56ffcb6e42f06
-  unpetrify-ref: 0.11.1
-  build-depends: []
-- name: ragel
-  repo: upstream:ragel
-  ref: 5d4102ffe43a15608e0e864fc7e7f5c6c3b49aac
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - colm
-- name: harfbuzz
-  repo: upstream:harfbuzz
-  ref: f0530a3d5d2e7b6eaa8325a310d458c478f505c9
-  unpetrify-ref: 0.9.19
-  build-depends:
-  - ragel
-- name: pango
-  repo: upstream:pango
-  ref: c05f6e5205711e97727885a86a57661c7e9cdc75
-  unpetrify-ref: baserock/xfce-build
-  build-depends:
-  - cairo
-  - harfbuzz
 - name: gtk+
   repo: upstream:gtk+
   ref: 52de99559e5b5bf09160e5a5a164d0ca5fede98c
   unpetrify-ref: baserock/xfce-build
-  build-depends:
-  - pango
-  - gdk-pixbuf
-  - cairo
-  - atk
-  - at-spi2-atk
+  build-depends: []
-- 
cgit v1.2.1


From bf5ef5758f5d179ca63df5bc4bb7edb12b7fac69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 31 Jul 2014 13:48:30 +0100
Subject: gtk-deps.morph: Remove cairo, pango and deps as they are already in
 wayland stratum

---
 gtk-deps.morph | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/gtk-deps.morph b/gtk-deps.morph
index 30bc64bc..9a9c6d63 100644
--- a/gtk-deps.morph
+++ b/gtk-deps.morph
@@ -5,6 +5,7 @@ build-depends:
 - morph: foundation
 - morph: x-common
 - morph: x-generic
+- morph: wayland-x86_64-generic
 chunks:
 - name: shared-mime-info
   repo: upstream:shared-mime-info
@@ -45,32 +46,3 @@ chunks:
   build-depends:
   - at-spi2-core
   - atk
-- name: cairo
-  repo: upstream:cairo
-  ref: 25ef4d21f1616ddd9a6550cf7a129b2634b6caad
-  unpetrify-ref: 1.12.14
-  build-depends: []
-- name: colm
-  repo: upstream:colm
-  ref: 746b80d9b15dceca54dff43123d56ffcb6e42f06
-  unpetrify-ref: 0.11.1
-  build-depends: []
-- name: ragel
-  repo: upstream:ragel
-  ref: 5d4102ffe43a15608e0e864fc7e7f5c6c3b49aac
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - colm
-- name: harfbuzz
-  repo: upstream:harfbuzz
-  ref: f0530a3d5d2e7b6eaa8325a310d458c478f505c9
-  unpetrify-ref: 0.9.19
-  build-depends:
-  - ragel
-- name: pango
-  repo: upstream:pango
-  ref: c05f6e5205711e97727885a86a57661c7e9cdc75
-  unpetrify-ref: baserock/xfce-build
-  build-depends:
-  - cairo
-  - harfbuzz
-- 
cgit v1.2.1


From 8e1d6865ca21abd14e64153b2d1d4a0966392888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 31 Jul 2014 13:48:31 +0100
Subject: gtk2.morph: Remove some build-deps

GTK+2 doesnt depend on genivi-foundation and x-common is already a
dependency of x-x86_64-generic
---
 gtk2.morph | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gtk2.morph b/gtk2.morph
index 50c0b9fd..28cd4dbf 100644
--- a/gtk2.morph
+++ b/gtk2.morph
@@ -2,9 +2,7 @@ name: gtk2
 kind: stratum
 description: the gtk2 stratum
 build-depends:
-- morph: genivi-foundation
 - morph: gtk-deps
-- morph: x-common
 - morph: x-generic
 chunks:
 - name: gtk+
-- 
cgit v1.2.1


From fe3caeeb1b5a83fefa12e0b599a1eb13e91fbb45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 31 Jul 2014 13:48:32 +0100
Subject: gtk-deps.morph: Update gnome-common to 3.12.0

No morph file needed thanks to a patch upstreamed by me to use
autoreconf to check the automake version
---
 gtk-deps.morph | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gtk-deps.morph b/gtk-deps.morph
index 9a9c6d63..1f886441 100644
--- a/gtk-deps.morph
+++ b/gtk-deps.morph
@@ -14,8 +14,8 @@ chunks:
   build-depends: []
 - name: gnome-common
   repo: upstream:gnome-common
-  ref: 66d54b57313f0f6206cff32972d2b83d683628b2
-  unpetrify-ref: 3.7.4
+  ref: d213283fcb5228d05eb2c796579f18240e8467e8
+  unpetrify-ref: 3.12.0
   build-depends: []
 - name: libtiff
   repo: upstream:libtiff
-- 
cgit v1.2.1


From 5a2f9aa2fe46de9cc9a8cf76b103b2f65f45afd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 31 Jul 2014 13:48:33 +0100
Subject: gtk-deps.morph: Upgrade accesibility packages

No morph file is needed in any of them
---
 gtk-deps.morph | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gtk-deps.morph b/gtk-deps.morph
index 1f886441..27904da3 100644
--- a/gtk-deps.morph
+++ b/gtk-deps.morph
@@ -30,19 +30,19 @@ chunks:
   - libtiff
 - name: atk
   repo: upstream:atk
-  ref: e35410e06337afa3d66fcdde9b16422648de4e04
-  unpetrify-ref: ATK_2_9_3
+  ref: 94766ee6f1a42f94eb9736ba8396bc90af937fe4
+  unpetrify-ref: ATK_2_12_0
   build-depends:
   - gnome-common
 - name: at-spi2-core
   repo: upstream:at-spi2-core
-  ref: 9bfebf07e866acadb5d2123568fd0119a7e0575b
-  unpetrify-ref: AT_SPI2_CORE_2_9_5
+  ref: c354b5e8d8157e1018eafeca48642116a65c4ff5
+  unpetrify-ref: AT_SPI2_CORE_2_12_0
   build-depends: []
 - name: at-spi2-atk
   repo: upstream:at-spi2-atk
-  ref: 363953fff4e3e12152ce2498b58a471884b497f5
-  unpetrify-ref: baserock/morph
+  ref: 01e49759d5d1fc22fb108fc9f80cd34d8eb814f6
+  unpetrify-ref: AT_SPI2_ATK_2_12_1
   build-depends:
   - at-spi2-core
   - atk
-- 
cgit v1.2.1


From 8ab7d6b1170be26865c9f5ed0ca49bf15846278d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 31 Jul 2014 13:48:34 +0100
Subject: Add GTK+3 stratum

---
 gtk3.morph | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 gtk3.morph

diff --git a/gtk3.morph b/gtk3.morph
new file mode 100644
index 00000000..335336ce
--- /dev/null
+++ b/gtk3.morph
@@ -0,0 +1,13 @@
+name: gtk3
+kind: stratum
+description: the gtk3 stratum
+build-depends:
+- morph: gtk-deps
+- morph: x-generic
+- morph: wayland-x86_64-generic
+chunks:
+- name: gtk3
+  repo: upstream:gtk+
+  ref: f36770fd0566cafb0a0803e5d80047a41ae68f7d
+  unpetrify-ref: baserock/morph-gtk-3
+  build-depends: []
-- 
cgit v1.2.1