diff options
| author | Ross Burton <ross@openedhand.com> | 2007-08-04 16:50:07 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2007-08-04 16:50:07 +0000 |
| commit | c0e5fe61b4bab56a919449f0b434547aca52c925 (patch) | |
| tree | 91049eaeb8474f510c7dadf9fff5b6eb7a6adc4c | |
| parent | 7ea7a1d8e4f88426e290575a2639b6ab1c1eab2b (diff) | |
| download | poky-c0e5fe61b4bab56a919449f0b434547aca52c925.tar.gz | |
Upgrade poky to glib 2.14
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2359 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/conf/distro/poky-bleeding.conf | 1 | ||||
| -rw-r--r-- | meta/conf/distro/poky.conf | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf index a52f5c39ad..0b59df5823 100644 --- a/meta/conf/distro/poky-bleeding.conf +++ b/meta/conf/distro/poky-bleeding.conf | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | PREFERRED_VERSION_glib-2.0 ?= "2.14.0" | ||
| 2 | PREFERRED_VERSION_pango ?= "1.17.5" | 1 | PREFERRED_VERSION_pango ?= "1.17.5" |
| 3 | PREFERRED_VERSION_gtk+ ?= "2.11.6" | 2 | PREFERRED_VERSION_gtk+ ?= "2.11.6" |
| 4 | 3 | ||
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 56441d4319..5051009828 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf | |||
| @@ -142,7 +142,7 @@ PREFERRED_VERSION_gtk-sato-engine = "0.1" | |||
| 142 | PREFERRED_VERSION_matchbox-theme-sato = "0.1" | 142 | PREFERRED_VERSION_matchbox-theme-sato = "0.1" |
| 143 | PREFERRED_VERSION_sato-icon-theme = "0.1" | 143 | PREFERRED_VERSION_sato-icon-theme = "0.1" |
| 144 | 144 | ||
| 145 | PREFERRED_VERSION_glib-2.0 ?= "2.12.13" | 145 | PREFERRED_VERSION_glib-2.0 ?= "2.14.0" |
| 146 | PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" | 146 | PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" |
| 147 | PREFERRED_VERSION_atk ?= "1.18.0" | 147 | PREFERRED_VERSION_atk ?= "1.18.0" |
| 148 | PREFERRED_VERSION_cairo ?= "1.4.10" | 148 | PREFERRED_VERSION_cairo ?= "1.4.10" |