diff options
| author | Ross Burton <ross@openedhand.com> | 2007-08-01 15:57:48 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2007-08-01 15:57:48 +0000 |
| commit | f90f6b05791657c2dca5f0be5c7728b37254d88f (patch) | |
| tree | 0555b186b7d99fa5b72d9ae77a345bf16f96a813 | |
| parent | fff91ca178a24a09ddb5e638a2710f682357503f (diff) | |
| download | poky-f90f6b05791657c2dca5f0be5c7728b37254d88f.tar.gz | |
Upgrade cairo to 1.4.10
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2298 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/conf/distro/poky-bleeding.conf | 1 | ||||
| -rw-r--r-- | meta/conf/distro/poky.conf | 2 | ||||
| -rw-r--r-- | meta/packages/cairo/cairo_1.4.10.bb (renamed from meta/packages/cairo/cairo_1.4.8.bb) | 0 |
3 files changed, 1 insertions, 2 deletions
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf index 799dbffd8c..5f2e7fd9bb 100644 --- a/meta/conf/distro/poky-bleeding.conf +++ b/meta/conf/distro/poky-bleeding.conf | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | PREFERRED_VERSION_glib-2.0 ?= "2.13.7" | 1 | PREFERRED_VERSION_glib-2.0 ?= "2.13.7" |
| 2 | PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" | 2 | PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" |
| 3 | 3 | ||
| 4 | PREFERRED_VERSION_cairo ?= "1.4.8" | ||
| 5 | PREFERRED_VERSION_pango ?= "1.17.5" | 4 | PREFERRED_VERSION_pango ?= "1.17.5" |
| 6 | PREFERRED_VERSION_gtk+ ?= "2.10.14" | 5 | PREFERRED_VERSION_gtk+ ?= "2.10.14" |
| 7 | PREFERRED_VERSION_gtk-engines ?= "2.10.0" | 6 | PREFERRED_VERSION_gtk-engines ?= "2.10.0" |
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 889e6a9bfd..9a49d778e1 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf | |||
| @@ -144,7 +144,7 @@ PREFERRED_VERSION_sato-icon-theme = "0.1" | |||
| 144 | PREFERRED_VERSION_glib-2.0 ?= "2.12.13" | 144 | PREFERRED_VERSION_glib-2.0 ?= "2.12.13" |
| 145 | PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" | 145 | PREFERRED_VERSION_glib-2.0-native ?= "2.12.4" |
| 146 | PREFERRED_VERSION_atk ?= "1.10.3" | 146 | PREFERRED_VERSION_atk ?= "1.10.3" |
| 147 | PREFERRED_VERSION_cairo ?= "1.4.8" | 147 | PREFERRED_VERSION_cairo ?= "1.4.10" |
| 148 | PREFERRED_VERSION_pango ?= "1.16.5" | 148 | PREFERRED_VERSION_pango ?= "1.16.5" |
| 149 | PREFERRED_VERSION_gtk+ ?= "2.10.14" | 149 | PREFERRED_VERSION_gtk+ ?= "2.10.14" |
| 150 | 150 | ||
diff --git a/meta/packages/cairo/cairo_1.4.8.bb b/meta/packages/cairo/cairo_1.4.10.bb index 845e14fc29..845e14fc29 100644 --- a/meta/packages/cairo/cairo_1.4.8.bb +++ b/meta/packages/cairo/cairo_1.4.10.bb | |||