summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-04-08 15:15:42 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-04-08 15:15:42 +0000
commit2c147f87a576d38d3255b8cd4bfe8f18cba28e72 (patch)
tree0e1fd8529918ec0a5d4fd7f295a69e5ad157b527
parentb796776f5e593b47e8df7b0355d5375f7454bbee (diff)
downloadopenembedded-core-2c147f87a576d38d3255b8cd4bfe8f18cba28e72.tar.gz
openembedded-core-2c147f87a576d38d3255b8cd4bfe8f18cba28e72.tar.bz2
openembedded-core-2c147f87a576d38d3255b8cd4bfe8f18cba28e72.tar.xz
openembedded-core-2c147f87a576d38d3255b8cd4bfe8f18cba28e72.zip
atk: merge unification from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4207 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/atk/atk.inc14
-rw-r--r--meta/packages/atk/atk_1.18.0.bb17
-rw-r--r--meta/packages/atk/atk_1.20.0.bb12
3 files changed, 17 insertions, 26 deletions
diff --git a/meta/packages/atk/atk.inc b/meta/packages/atk/atk.inc
new file mode 100644
index 000000000..5f81cdf67
--- /dev/null
+++ b/meta/packages/atk/atk.inc
@@ -0,0 +1,14 @@
+DESCRIPTION = "An accessibility toolkit for GNOME."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+
+DEPENDS = "glib-2.0 gtk-doc-native"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-glibtest"
+
+do_stage () {
+ autotools_stage_all
+}
diff --git a/meta/packages/atk/atk_1.18.0.bb b/meta/packages/atk/atk_1.18.0.bb
index 07ed57250..3613f2526 100644
--- a/meta/packages/atk/atk_1.18.0.bb
+++ b/meta/packages/atk/atk_1.18.0.bb
@@ -1,16 +1,3 @@
-DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "LGPL"
+require atk.inc
-DEPENDS = "glib-2.0 gtk-doc-native"
-
-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
-}
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/atk/1.18/atk-${PV}.tar.bz2"
diff --git a/meta/packages/atk/atk_1.20.0.bb b/meta/packages/atk/atk_1.20.0.bb
index a909e0eb6..bb6449233 100644
--- a/meta/packages/atk/atk_1.20.0.bb
+++ b/meta/packages/atk/atk_1.20.0.bb
@@ -1,16 +1,6 @@
-DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-
-DEPENDS = "glib-2.0 gtk-doc-native"
+require atk.inc
SRC_URI = "http://download.gnome.org/sources/atk/1.20/${PN}-${PV}.tar.bz2"
-inherit autotools pkgconfig
-EXTRA_OECONF = "--disable-glibtest"
-do_stage () {
- autotools_stage_all
-}