summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-07-31 14:20:43 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-07-31 14:20:43 +0100
commitfcfaff85e990a704df04be4706806ff4f9d7aa40 (patch)
treee7d97d4a5bc356ab1bc62a3fc05fcb65cd6b425e
parent0946a88d22c25d9678feecbb1d80254508b60256 (diff)
parent8ab7d6b1170be26865c9f5ed0ca49bf15846278d (diff)
downloaddefinitions-fcfaff85e990a704df04be4706806ff4f9d7aa40.tar.gz
Merge branch 'baserock/jjardon/gtk3-stratum'
Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk> Reviewed-By: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
-rw-r--r--gtk-deps.morph48
-rw-r--r--gtk2.morph95
-rw-r--r--gtk3.morph13
-rw-r--r--xfce.morph10
4 files changed, 73 insertions, 93 deletions
diff --git a/gtk-deps.morph b/gtk-deps.morph
new file mode 100644
index 00000000..27904da3
--- /dev/null
+++ b/gtk-deps.morph
@@ -0,0 +1,48 @@
+name: gtk-deps
+kind: stratum
+description: the GTK+ dependencies stratum
+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
+ ref: 0d440d85a126ff8d535d4f70f2203a76a21d5f71
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: gnome-common
+ repo: upstream:gnome-common
+ ref: d213283fcb5228d05eb2c796579f18240e8467e8
+ unpetrify-ref: 3.12.0
+ 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: 94766ee6f1a42f94eb9736ba8396bc90af937fe4
+ unpetrify-ref: ATK_2_12_0
+ build-depends:
+ - gnome-common
+- name: at-spi2-core
+ repo: upstream:at-spi2-core
+ ref: c354b5e8d8157e1018eafeca48642116a65c4ff5
+ unpetrify-ref: AT_SPI2_CORE_2_12_0
+ build-depends: []
+- name: at-spi2-atk
+ repo: upstream:at-spi2-atk
+ ref: 01e49759d5d1fc22fb108fc9f80cd34d8eb814f6
+ unpetrify-ref: AT_SPI2_ATK_2_12_1
+ build-depends:
+ - at-spi2-core
+ - atk
diff --git a/gtk2.morph b/gtk2.morph
index 01eef819..28cd4dbf 100644
--- a/gtk2.morph
+++ b/gtk2.morph
@@ -2,102 +2,11 @@ name: gtk2
kind: stratum
description: the gtk2 stratum
build-depends:
-- morph: genivi-foundation
-- morph: x-common
+- morph: gtk-deps
- 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: libcroco
- repo: upstream:libcroco
- ref: 611f624a6e15065792b41eb5ce14811293f3fb0a
- unpetrify-ref: baserock/morph
- build-depends:
- - gnome-common
-- 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
-- name: librsvg
- repo: upstream:librsvg
- ref: 61171ca59d02b58b7da1697ca1d924bff93e66cb
- unpetrify-ref: baserock/morph
- build-depends:
- - cairo
- - gdk-pixbuf
- - gnome-common
- - gtk+
- - libcroco
- - pango
+ build-depends: []
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: []
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