summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-02-12 15:07:35 +0000
committerJavier Jardón <jjardon@gnome.org>2015-02-12 15:09:01 +0000
commit3f099cb75c1d104e68a780d5b3435204a6fd7584 (patch)
tree4873c739f452a5f6666507ede931c501403b4aa5
parent124189b2955f30c383fc47c150ff2123568134a8 (diff)
parentb04a39dbc832662df241515cb273605f9cecef90 (diff)
downloaddefinitions-3f099cb75c1d104e68a780d5b3435204a6fd7584.tar.gz
Merge branch 'baserock/jjardon/gtk_deps'
Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk> Reviewed-by: Tiago Gomes <tiago.gomes@codethink.co.uk>
-rw-r--r--strata/gtk-deps.morph16
-rw-r--r--strata/gtk3.morph4
2 files changed, 10 insertions, 10 deletions
diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph
index 799ba87a..f1141fcd 100644
--- a/strata/gtk-deps.morph
+++ b/strata/gtk-deps.morph
@@ -14,8 +14,8 @@ chunks:
- name: shared-mime-info
morph: strata/gtk-deps/shared-mime-info.morph
repo: upstream:shared-mime-info
- ref: 0d440d85a126ff8d535d4f70f2203a76a21d5f71
- unpetrify-ref: baserock/morph
+ ref: c136fc2578aa8f7c0e098008da18d324033eb991
+ unpetrify-ref: Release-1-4
build-depends: []
- name: gnome-common
repo: upstream:gnome-common
@@ -30,19 +30,19 @@ chunks:
build-depends: []
- name: atk
repo: upstream:atk
- ref: 94766ee6f1a42f94eb9736ba8396bc90af937fe4
- unpetrify-ref: ATK_2_12_0
+ ref: 2fb9411c3f32adb7ee421b59e36d2e0aa2f30253
+ unpetrify-ref: ATK_2_15_4
build-depends:
- gnome-common
- name: at-spi2-core
repo: upstream:at-spi2-core
- ref: c354b5e8d8157e1018eafeca48642116a65c4ff5
- unpetrify-ref: AT_SPI2_CORE_2_12_0
+ ref: 96c2842088008670e72739ea7921d654487a57fb
+ unpetrify-ref: AT_SPI2_CORE_2_14_1
build-depends: []
- name: at-spi2-atk
repo: upstream:at-spi2-atk
- ref: 01e49759d5d1fc22fb108fc9f80cd34d8eb814f6
- unpetrify-ref: AT_SPI2_ATK_2_12_1
+ ref: 2c220ff6565c4f02428a0c80267616a677e81ac9
+ unpetrify-ref: AT_SPI2_ATK_2_14_1
build-depends:
- at-spi2-core
- atk
diff --git a/strata/gtk3.morph b/strata/gtk3.morph
index f471bf6e..851cb3dd 100644
--- a/strata/gtk3.morph
+++ b/strata/gtk3.morph
@@ -13,7 +13,7 @@ chunks:
- name: gtk3
morph: strata/gtk3/gtk3.morph
repo: upstream:gtk+
- ref: 911f3fb6d29f1570a2d30db6f2085d0202e7ad2a
- unpetrify-ref: 3.15.0
+ ref: 9e96461aa59cdb5454a48200b8b80caaf04c4147
+ unpetrify-ref: 3.15.5
build-depends:
- libepoxy