From c7fca99aab060efe14332ce6d913bc7d346a4478 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 4 Jan 2008 16:02:02 +0000 Subject: poky.conf: update to latest GTK+ version now that the filesystem changes have landed (yay tf). poky-bleeding.conf: remove GTK+ versions git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3410 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/distro/poky-bleeding.conf | 7 ------- meta/conf/distro/poky.conf | 11 ++++++----- 2 files changed, 6 insertions(+), 12 deletions(-) (limited to 'meta/conf') diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf index 71cc975c1..66bca23e2 100644 --- a/meta/conf/distro/poky-bleeding.conf +++ b/meta/conf/distro/poky-bleeding.conf @@ -1,10 +1,3 @@ -PREFERRED_VERSION_atk ?= "1.20.0" -PREFERRED_VERSION_gtk+ ?= "2.12.3" - -PREFERRED_VERSION_gnome-keyring ?= "2.20" -PREFERRED_VERSION_gnome-vfs ?= "2.20.0" -PREFERRED_VERSION_libgnomecanvas ?= "2.20.0" -PREFERRED_VERSION_gtk-engines ?= "2.12.0" PREFERRED_VERSION_dbus ?= "1.1.1" PREFERRED_VERSION_dbus-native ?= "1.1.1" diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index d293d40bf..7ad34b795 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}" PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svnr${SRCREV}" PREFERRED_VERSION_matchbox-wm ?= "1.2+svnr${SRCREV}" PREFERRED_VERSION_libmatchbox ?= "1.9" -PREFERRED_VERSION_gtk-engines ?= "2.10.2" +PREFERRED_VERSION_gtk-engines ?= "2.12.0" PREFERRED_VERSION_gtk-sato-engine ?= "0.1" PREFERRED_VERSION_matchbox-theme-sato ?= "0.1" PREFERRED_VERSION_sato-icon-theme ?= "0.1" PREFERRED_VERSION_glib-2.0 ?= "2.14.4" PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" -PREFERRED_VERSION_atk ?= "1.18.0" +PREFERRED_VERSION_atk ?= "1.20.0" PREFERRED_VERSION_cairo ?= "1.4.10" PREFERRED_VERSION_pango ?= "1.18.3" -PREFERRED_VERSION_gtk+ ?= "2.10.14" +PREFERRED_VERSION_gtk+ ?= "2.12.3" PREFERRED_VERSION_dbus ?= "1.0.2" PREFERRED_VERSION_dbus-native ?= "1.0.2" PREFERRED_VERSION_dbus-glib ?= "0.74" PREFERRED_VERSION_dbus-glib-native ?= "0.74" -PREFERRED_VERSION_gnome-vfs ?= "2.18.1" -PREFERRED_VERSION_libgnomecanvas ?= "2.14.0" +PREFERRED_VERSION_gnome-vfs ?= "2.20.0" +PREFERRED_VERSION_libgnomecanvas ?= "2.20.0" +PREFERRED_VERSION_gnome-keyring ?= "2.20" PREFERRED_VERSION_dillo2 ?= "0.6.6" PREFERRED_VERSION_evince ?= "2.20.0" -- cgit v1.2.3