[oe-commits] org.oe.dev atk: unify

[Laibsch commit]

atk: unify

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: a0a2b80866edb542ad580e318d4f18be4ae39121
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a0a2b80866edb542ad580e318d4f18be4ae39121
Files:
1
packages/atk/atk.inc
packages/atk/atk_1.10.3.bb
packages/atk/atk_1.2.0.bb
packages/atk/atk_1.6.0.bb
packages/atk/atk_1.6.1.bb
packages/atk/atk_1.9.0.bb
Diffs:

#
# mt diff -ra98e06eb29c0d8f228038acbaf2a660ea5c43fc6 -ra0a2b80866edb542ad580e318d4f18be4ae39121
#
# 
# 
# add_file "packages/atk/atk.inc"
#  content [12a24475f571a0921b5788ca3986c5c64bb547fb]
# 
# patch "packages/atk/atk_1.10.3.bb"
#  from [3a102ab8fd75ee16a142df2c62aec61792e71629]
#    to [d40395db2b77c72fb291045b958bcac4b7932afc]
# 
# patch "packages/atk/atk_1.2.0.bb"
#  from [3c6378ac01e9d2795ccdcdbc5f6b1d70155c1817]
#    to [65573439fbaa2e917536a28543fdda7cf2aff9e9]
# 
# patch "packages/atk/atk_1.6.0.bb"
#  from [ff0f1c9dac31ee8eae2bdd9bde9da51c4fa40ddc]
#    to [f7df9bf6c68b8718e240365edb6b7f74a5c92d6d]
# 
# patch "packages/atk/atk_1.6.1.bb"
#  from [ecc33a3903e06d9dfe7f786efe3aa9f1d2dfe8d0]
#    to [db0aa25a32999a192c493f19121d949955d517ac]
# 
# patch "packages/atk/atk_1.9.0.bb"
#  from [d58a37bee72909d3d3acde4d78af8d53c0c83839]
#    to [14eec8ca6fc3483b0ad32457076da1253623157b]
# 
============================================================
--- packages/atk/atk.inc	12a24475f571a0921b5788ca3986c5c64bb547fb
+++ packages/atk/atk.inc	12a24475f571a0921b5788ca3986c5c64bb547fb
@@ -0,0 +1,13 @@
+DEPENDS = "glib-2.0 gtk-doc"
+DESCRIPTION = "An accessibility toolkit for GNOME."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+
+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"
============================================================
--- packages/atk/atk_1.10.3.bb	3a102ab8fd75ee16a142df2c62aec61792e71629
+++ packages/atk/atk_1.10.3.bb	d40395db2b77c72fb291045b958bcac4b7932afc
@@ -1,20 +1,8 @@
-DEPENDS = "glib-2.0 gtk-doc"
-DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "LGPL"
+require atk.inc
 
 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
+        oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
+        autotools_stage_includes
 }
============================================================
--- packages/atk/atk_1.2.0.bb	3c6378ac01e9d2795ccdcdbc5f6b1d70155c1817
+++ packages/atk/atk_1.2.0.bb	65573439fbaa2e917536a28543fdda7cf2aff9e9
@@ -1,19 +1,8 @@
-DEPENDS = "glib-2.0"
-DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "x11/libs"
-LICENSE = "LGPL"
+require atk.inc
 
-SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/atk/1.2/atk-${PV}.tar.bz2 \
+SRC_URI = "${GNOME_MIRROR}/atk/1.2/atk-${PV}.tar.bz2 \
 	   file://m4.patch;patch=1"
 
-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}
 	install -d ${STAGING_INCDIR}/atk
============================================================
--- packages/atk/atk_1.6.0.bb	ff0f1c9dac31ee8eae2bdd9bde9da51c4fa40ddc
+++ packages/atk/atk_1.6.0.bb	f7df9bf6c68b8718e240365edb6b7f74a5c92d6d
@@ -1,20 +1,8 @@
-DEPENDS = "glib-2.0"
-DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "LGPL"
+require atk.inc
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/atk-${PV}.tar.bz2 \
 	   file://gtk-doc.patch;patch=1"
 
-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}
 	install -d ${STAGING_INCDIR}/atk
============================================================
--- packages/atk/atk_1.6.1.bb	ecc33a3903e06d9dfe7f786efe3aa9f1d2dfe8d0
+++ packages/atk/atk_1.6.1.bb	db0aa25a32999a192c493f19121d949955d517ac
@@ -1,19 +1,7 @@
-DEPENDS = "glib-2.0 gtk-doc"
-DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "LGPL"
+require atk.inc
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/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
============================================================
--- packages/atk/atk_1.9.0.bb	d58a37bee72909d3d3acde4d78af8d53c0c83839
+++ packages/atk/atk_1.9.0.bb	14eec8ca6fc3483b0ad32457076da1253623157b
@@ -1,20 +1,8 @@
-DEPENDS = "glib-2.0 gtk-doc"
-DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "LGPL"
+require atk.inc
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/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
+        oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
+        autotools_stage_includes
 }