summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2014-07-29 10:40:28 (GMT)
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2014-07-29 10:43:12 (GMT)
commit07215fa7a1ed37aee4c00607b6bf92262af7c95c (patch)
tree837bb32eb11bb717f78a1bfb29934d6d3cf1ac6d
parent8533643f972cc2ee92a41c7c676c542f31ccfa9e (diff)
parentb85ff0531afecce6b65a910d64f601c9f64e6fbd (diff)
downloaddefinitions-07215fa7a1ed37aee4c00607b6bf92262af7c95c.tar.gz
Merge branch 'baserock/adamcoldrick/apply-gtk3-patches'
This merges Javier's patch to update glib and gobject-introspection that was sent to the mailing list. Reviewed-by: Richard Maw Reviewed-by: Pedro Alvarez
-rw-r--r--foundation.morph8
1 files changed, 4 insertions, 4 deletions
diff --git a/foundation.morph b/foundation.morph
index 2392bda..b246a68 100644
--- a/foundation.morph
+++ b/foundation.morph
@@ -48,14 +48,14 @@ chunks:
- libusbx
- name: glib
repo: upstream:glib
- ref: 980156c4cb4a8c29335de83bbf1ac05a9a1f01a9
- unpetrify-ref: baserock/morph
+ ref: 3f8f040349ae821854bccb2c3535a58b0ee66803
+ unpetrify-ref: baserock/2.40.0
build-depends:
- libffi
- name: gobject-introspection
repo: upstream:gobject-introspection
- ref: 4f14c7dd0906608d4c9b741e0d0ba858e5c530f0
- unpetrify-ref: baserock/1.39.90
+ ref: 6750a92ca83aa301eeac5eb59e918576fe544231
+ unpetrify-ref: baserock/GOBJECT_INTROSPECTION_1_40_0
build-depends:
- glib
- name: dbus-pre