Upgrade atk to 1.18

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2311 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 17 insertions, 21 deletions

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 358b42a9d0..203e6db5df 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -143,7 +143,7 @@ PREFERRED_VERSION_sato-icon-theme = "0.1"
 
 PREFERRED_VERSION_glib-2.0 ?= "2.12.13"
 PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
-PREFERRED_VERSION_atk ?= "1.10.3"
+PREFERRED_VERSION_atk ?= "1.18.0"
 PREFERRED_VERSION_cairo ?= "1.4.10"
 PREFERRED_VERSION_pango ?= "1.16.5"
 PREFERRED_VERSION_gtk+ ?= "2.10.14"
diff --git a/meta/packages/atk/atk_1.10.3.bb b/meta/packages/atk/atk_1.10.3.bb
deleted file mode 100644
index d04b943557..0000000000
--- a/meta/packages/atk/atk_1.10.3.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DEPENDS = "glib-2.0 gtk-doc"
-DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/atk-${PV}.tar.bz2"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-glibtest"
-
-CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \
-                  -I${STAGING_INCDIR}/glib-2.0/glib \
-                  -I${STAGING_INCDIR}/glib-2.0/gobject"
-
-do_stage () {
-        oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
-        autotools_stage_includes
-}
diff --git a/meta/packages/atk/atk_1.18.0.bb b/meta/packages/atk/atk_1.18.0.bb
new file mode 100644
index 0000000000..d27e9bb29b
--- /dev/null
+++ b/meta/packages/atk/atk_1.18.0.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "An accessibility toolkit for GNOME."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+
+DEPENDS = "glib-2.0 gtk-doc"
+
+SRC_URI = "http://download.gnome.org/sources/atk/1.18/${PN}-${PV}.tar.bz2"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-glibtest"
+
+do_stage () {
+        autotools_stage_all
+}