summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/poky.conf2
-rw-r--r--meta/packages/glib-2.0/glib-2.0-2.14.1/configure-libtool.patch (renamed from meta/packages/glib-2.0/glib-2.0-2.14.0/configure-libtool.patch)0
-rw-r--r--meta/packages/glib-2.0/glib-2.0_2.14.1.bb (renamed from meta/packages/glib-2.0/glib-2.0_2.14.0.bb)0
3 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index c11a949ef6..2e0a1243fe 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -160,7 +160,7 @@ PREFERRED_VERSION_gtk-sato-engine ?= "0.1"
160PREFERRED_VERSION_matchbox-theme-sato ?= "0.1" 160PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
161PREFERRED_VERSION_sato-icon-theme ?= "0.1" 161PREFERRED_VERSION_sato-icon-theme ?= "0.1"
162 162
163PREFERRED_VERSION_glib-2.0 ?= "2.14.0" 163PREFERRED_VERSION_glib-2.0 ?= "2.14.1"
164PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" 164PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
165PREFERRED_VERSION_atk ?= "1.18.0" 165PREFERRED_VERSION_atk ?= "1.18.0"
166PREFERRED_VERSION_cairo ?= "1.4.10" 166PREFERRED_VERSION_cairo ?= "1.4.10"
diff --git a/meta/packages/glib-2.0/glib-2.0-2.14.0/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.14.1/configure-libtool.patch
index a52327c8c9..a52327c8c9 100644
--- a/meta/packages/glib-2.0/glib-2.0-2.14.0/configure-libtool.patch
+++ b/meta/packages/glib-2.0/glib-2.0-2.14.1/configure-libtool.patch
diff --git a/meta/packages/glib-2.0/glib-2.0_2.14.0.bb b/meta/packages/glib-2.0/glib-2.0_2.14.1.bb
index 995efbd119..995efbd119 100644
--- a/meta/packages/glib-2.0/glib-2.0_2.14.0.bb
+++ b/meta/packages/glib-2.0/glib-2.0_2.14.1.bb