summaryrefslogtreecommitdiff
path: root/meta/conf/distro/include
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-06-25 15:07:01 +0800
committerSaul Wold <Saul.Wold@intel.com>2010-07-02 15:32:28 -0700
commit31180a56d1b6981fa9d5588ad3538f34e339e0fe (patch)
tree2e4bb97f22d2d02357f316c8a628dea6af1059ff /meta/conf/distro/include
parent6b81c6dbb55d57a0f8d96ee5e3f5d1e6148850b1 (diff)
downloadopenembedded-core-31180a56d1b6981fa9d5588ad3538f34e339e0fe.tar.gz
openembedded-core-31180a56d1b6981fa9d5588ad3538f34e339e0fe.tar.bz2
openembedded-core-31180a56d1b6981fa9d5588ad3538f34e339e0fe.tar.xz
openembedded-core-31180a56d1b6981fa9d5588ad3538f34e339e0fe.zip
glib-2.0: upgrade to 2.24.1
(borrow from OE 2.24.0, with study about reason for detail changes) [Patches-Poky] KEEP _configure-libtool.patch_: fix cross-build env REMOVE _glibconfig-sysdefs.h_: introduced in glib-1.2.10, which is actually not valid today KEEP _glib-gettexize-dir.patch_: another quite old patch added before 2.10.3 add history info, and mark for upstream [Patches-OE] NOTAKE _gio.patch_: a private extension for a window matching library (wncksync) NOTAKE _gvavriant.patch_: in 2.24.1 now NOTAKE _gasync.patch_: in 2.24.1 now TAKE _60_wait-longer-for-threads-to-die.patch: said to fix anonying warning TAKE _gatomic-proper-get-cast.patch_: fix error about type casting. Instead of using OE's patch, I found a better one from latest repo NOTAKE _g_once_init_enter.patch_: in OE since 2.22.1, not quite sure of its purpose, also it's not in upstream yet [Recipe] - fix metadata - keep glib-2.inc which is for python optimization - remove PRIORITY since 'optional' is the default - no need to specially install glibconfig.h in ad hoc path, which is only relied by 'obexpush' which poky doesn't have and can be fixed in 'obexpush' itself as what OE does - no need to manually create glib2.0/glib, which is handled by current code - remove 'acpaths' which only applies to versions before 2.12.4 - below lines are not taken from OE * glib-mkenums tweaks, which exists in OE for a long time but never in poky. since there's no way to find out original commit, keep poky's style instead. * host libtool check. not sure about its purpose, and it's also in OE for quite long time Signed-off-by Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'meta/conf/distro/include')
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 72dcdcf56..edadc1b4b 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -9,8 +9,8 @@ PREFERRED_VERSION_libmatchbox ?= "1.9"
PREFERRED_VERSION_gtk-sato-engine ?= "0.3.1"
PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
-PREFERRED_VERSION_glib-2.0 ?= "2.22.3"
-PREFERRED_VERSION_glib-2.0-native ?= "2.22.3"
+PREFERRED_VERSION_glib-2.0 ?= "2.24.1"
+PREFERRED_VERSION_glib-2.0-native ?= "2.24.1"
PREFERRED_VERSION_atk ?= "1.24.0"
PREFERRED_VERSION_cairo ?= "1.8.2"
PREFERRED_VERSION_pango ?= "1.22.2"