diff options
| author | Ross Burton <ross@openedhand.com> | 2008-03-14 09:59:22 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2008-03-14 09:59:22 +0000 |
| commit | 70483e47c5e9cece727d0958b53646550ada41cc (patch) | |
| tree | 47b94e34b40d20928b4e874ee72e9b4e2c013709 | |
| parent | 1fe96696cb17c1a41c198d076483d252dabcc98e (diff) | |
| download | openembedded-core-70483e47c5e9cece727d0958b53646550ada41cc.tar.gz openembedded-core-70483e47c5e9cece727d0958b53646550ada41cc.tar.bz2 openembedded-core-70483e47c5e9cece727d0958b53646550ada41cc.tar.xz openembedded-core-70483e47c5e9cece727d0958b53646550ada41cc.zip | |
glib: upgrade from 2.14.6 to 2.16.1
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3995 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/conf/distro/poky.conf | 4 | ||||
| -rw-r--r-- | meta/packages/glib-2.0/glib-2.0-2.16.1/configure-libtool.patch (renamed from meta/packages/glib-2.0/glib-2.0-2.14.6/configure-libtool.patch) | 0 | ||||
| -rw-r--r-- | meta/packages/glib-2.0/glib-2.0-2.16.1/glib-gettextize-dir.patch (renamed from meta/packages/glib-2.0/glib-2.0-2.14.6/glib-gettextize-dir.patch) | 0 | ||||
| -rw-r--r-- | meta/packages/glib-2.0/glib-2.0-native_2.16.1.bb (renamed from meta/packages/glib-2.0/glib-2.0-native_2.14.6.bb) | 2 | ||||
| -rw-r--r-- | meta/packages/glib-2.0/glib-2.0_2.16.1.bb (renamed from meta/packages/glib-2.0/glib-2.0_2.14.6.bb) | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index dca40432a..29fdf6e23 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -200,8 +200,8 @@ PREFERRED_VERSION_gtk-sato-engine ?= "0.3.1" PREFERRED_VERSION_matchbox-theme-sato ?= "0.1" PREFERRED_VERSION_sato-icon-theme ?= "0.4.1" -PREFERRED_VERSION_glib-2.0 ?= "2.14.6" -PREFERRED_VERSION_glib-2.0-native ?= "2.14.6" +PREFERRED_VERSION_glib-2.0 ?= "2.16.1" +PREFERRED_VERSION_glib-2.0-native ?= "2.16.1" PREFERRED_VERSION_atk ?= "1.20.0" PREFERRED_VERSION_cairo ?= "1.4.14" PREFERRED_VERSION_pango ?= "1.18.3" diff --git a/meta/packages/glib-2.0/glib-2.0-2.14.6/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.16.1/configure-libtool.patch index a52327c8c..a52327c8c 100644 --- a/meta/packages/glib-2.0/glib-2.0-2.14.6/configure-libtool.patch +++ b/meta/packages/glib-2.0/glib-2.0-2.16.1/configure-libtool.patch diff --git a/meta/packages/glib-2.0/glib-2.0-2.14.6/glib-gettextize-dir.patch b/meta/packages/glib-2.0/glib-2.0-2.16.1/glib-gettextize-dir.patch index efe332557..efe332557 100644 --- a/meta/packages/glib-2.0/glib-2.0-2.14.6/glib-gettextize-dir.patch +++ b/meta/packages/glib-2.0/glib-2.0-2.16.1/glib-gettextize-dir.patch diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.14.6.bb b/meta/packages/glib-2.0/glib-2.0-native_2.16.1.bb index 0921cb847..b26480dd0 100644 --- a/meta/packages/glib-2.0/glib-2.0-native_2.14.6.bb +++ b/meta/packages/glib-2.0/glib-2.0-native_2.16.1.bb @@ -9,7 +9,7 @@ PRIORITY = "optional" DEPENDS += "gtk-doc-native" PR="r2" -SRC_URI = "http://download.gnome.org/sources/glib/2.14/glib-${PV}.tar.bz2 \ +SRC_URI = "http://download.gnome.org/sources/glib/2.16/glib-${PV}.tar.bz2 \ file://glib-gettextize-dir.patch;patch=1 \ file://configure-libtool.patch;patch=1 \ file://glibconfig-sysdefs.h" diff --git a/meta/packages/glib-2.0/glib-2.0_2.14.6.bb b/meta/packages/glib-2.0/glib-2.0_2.16.1.bb index 59d393e9a..7ac48e14f 100644 --- a/meta/packages/glib-2.0/glib-2.0_2.14.6.bb +++ b/meta/packages/glib-2.0/glib-2.0_2.16.1.bb @@ -2,6 +2,6 @@ require glib.inc PR = "r1" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${PV}.tar.bz2 \ +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ file://configure-libtool.patch;patch=1" |