diff options
| -rw-r--r-- | meta/conf/distro/poky.conf | 2 | ||||
| -rw-r--r-- | meta/packages/atk/atk_1.10.3.bb | 20 | ||||
| -rw-r--r-- | meta/packages/atk/atk_1.18.0.bb | 16 |
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" | |||
| 143 | 143 | ||
| 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.18.0" |
| 147 | PREFERRED_VERSION_cairo ?= "1.4.10" | 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" |
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 @@ | |||
| 1 | DEPENDS = "glib-2.0 gtk-doc" | ||
| 2 | DESCRIPTION = "An accessibility toolkit for GNOME." | ||
| 3 | SECTION = "x11/libs" | ||
| 4 | PRIORITY = "optional" | ||
| 5 | LICENSE = "LGPL" | ||
| 6 | |||
| 7 | SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/atk-${PV}.tar.bz2" | ||
| 8 | |||
| 9 | inherit autotools pkgconfig | ||
| 10 | |||
| 11 | EXTRA_OECONF = "--disable-glibtest" | ||
| 12 | |||
| 13 | CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \ | ||
| 14 | -I${STAGING_INCDIR}/glib-2.0/glib \ | ||
| 15 | -I${STAGING_INCDIR}/glib-2.0/gobject" | ||
| 16 | |||
| 17 | do_stage () { | ||
| 18 | oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR} | ||
| 19 | autotools_stage_includes | ||
| 20 | } | ||
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 @@ | |||
| 1 | DESCRIPTION = "An accessibility toolkit for GNOME." | ||
| 2 | SECTION = "x11/libs" | ||
| 3 | PRIORITY = "optional" | ||
| 4 | LICENSE = "LGPL" | ||
| 5 | |||
| 6 | DEPENDS = "glib-2.0 gtk-doc" | ||
| 7 | |||
| 8 | SRC_URI = "http://download.gnome.org/sources/atk/1.18/${PN}-${PV}.tar.bz2" | ||
| 9 | |||
| 10 | inherit autotools pkgconfig | ||
| 11 | |||
| 12 | EXTRA_OECONF = "--disable-glibtest" | ||
| 13 | |||
| 14 | do_stage () { | ||
| 15 | autotools_stage_all | ||
| 16 | } | ||
