summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/poky-bleeding.conf7
-rw-r--r--meta/conf/distro/poky.conf11
2 files changed, 6 insertions, 12 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index 71cc975c12..66bca23e29 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -1,10 +1,3 @@
1PREFERRED_VERSION_atk ?= "1.20.0"
2PREFERRED_VERSION_gtk+ ?= "2.12.3"
3
4PREFERRED_VERSION_gnome-keyring ?= "2.20"
5PREFERRED_VERSION_gnome-vfs ?= "2.20.0"
6PREFERRED_VERSION_libgnomecanvas ?= "2.20.0"
7PREFERRED_VERSION_gtk-engines ?= "2.12.0"
8PREFERRED_VERSION_dbus ?= "1.1.1" 1PREFERRED_VERSION_dbus ?= "1.1.1"
9PREFERRED_VERSION_dbus-native ?= "1.1.1" 2PREFERRED_VERSION_dbus-native ?= "1.1.1"
10 3
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index d293d40bfa..7ad34b7957 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -186,24 +186,25 @@ PREFERRED_VERSION_matchbox-stroke ?= "0.0+svnr${SRCREV}"
186PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svnr${SRCREV}" 186PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svnr${SRCREV}"
187PREFERRED_VERSION_matchbox-wm ?= "1.2+svnr${SRCREV}" 187PREFERRED_VERSION_matchbox-wm ?= "1.2+svnr${SRCREV}"
188PREFERRED_VERSION_libmatchbox ?= "1.9" 188PREFERRED_VERSION_libmatchbox ?= "1.9"
189PREFERRED_VERSION_gtk-engines ?= "2.10.2" 189PREFERRED_VERSION_gtk-engines ?= "2.12.0"
190PREFERRED_VERSION_gtk-sato-engine ?= "0.1" 190PREFERRED_VERSION_gtk-sato-engine ?= "0.1"
191PREFERRED_VERSION_matchbox-theme-sato ?= "0.1" 191PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
192PREFERRED_VERSION_sato-icon-theme ?= "0.1" 192PREFERRED_VERSION_sato-icon-theme ?= "0.1"
193 193
194PREFERRED_VERSION_glib-2.0 ?= "2.14.4" 194PREFERRED_VERSION_glib-2.0 ?= "2.14.4"
195PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" 195PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
196PREFERRED_VERSION_atk ?= "1.18.0" 196PREFERRED_VERSION_atk ?= "1.20.0"
197PREFERRED_VERSION_cairo ?= "1.4.10" 197PREFERRED_VERSION_cairo ?= "1.4.10"
198PREFERRED_VERSION_pango ?= "1.18.3" 198PREFERRED_VERSION_pango ?= "1.18.3"
199PREFERRED_VERSION_gtk+ ?= "2.10.14" 199PREFERRED_VERSION_gtk+ ?= "2.12.3"
200 200
201PREFERRED_VERSION_dbus ?= "1.0.2" 201PREFERRED_VERSION_dbus ?= "1.0.2"
202PREFERRED_VERSION_dbus-native ?= "1.0.2" 202PREFERRED_VERSION_dbus-native ?= "1.0.2"
203PREFERRED_VERSION_dbus-glib ?= "0.74" 203PREFERRED_VERSION_dbus-glib ?= "0.74"
204PREFERRED_VERSION_dbus-glib-native ?= "0.74" 204PREFERRED_VERSION_dbus-glib-native ?= "0.74"
205PREFERRED_VERSION_gnome-vfs ?= "2.18.1" 205PREFERRED_VERSION_gnome-vfs ?= "2.20.0"
206PREFERRED_VERSION_libgnomecanvas ?= "2.14.0" 206PREFERRED_VERSION_libgnomecanvas ?= "2.20.0"
207PREFERRED_VERSION_gnome-keyring ?= "2.20"
207 208
208PREFERRED_VERSION_dillo2 ?= "0.6.6" 209PREFERRED_VERSION_dillo2 ?= "0.6.6"
209PREFERRED_VERSION_evince ?= "2.20.0" 210PREFERRED_VERSION_evince ?= "2.20.0"