summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-11-18 10:10:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:07 +0000
commitc19036abc020a99bb2faa70df6c11ad42884b47d (patch)
tree63d2abaafb54316038b9f9469520aed9f8e74401
parent43b29d9d07200396545dfdefd079794ca5074478 (diff)
downloadpoky-contrib-c19036abc020a99bb2faa70df6c11ad42884b47d.tar.gz
poky-contrib-c19036abc020a99bb2faa70df6c11ad42884b47d.tar.bz2
poky-contrib-c19036abc020a99bb2faa70df6c11ad42884b47d.zip
pango: use ptest-gnome
Instead of hand-coding the ptest integration, use the ptest-gnome class. (From OE-Core rev: 70674d4ee2a24971d1bab048906fa8d0d2ba2e75) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/pango/pango.inc13
1 files changed, 3 insertions, 10 deletions
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index 04143bdca5f..78cd560af72 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -12,16 +12,13 @@ LICENSE = "LGPLv2.0+"
X11DEPENDS = "virtual/libx11 libxft"
DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo harfbuzz qemu-native"
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'ptest', '', d)}"
-
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
PACKAGECONFIG[x11] = "--with-xft,--without-xft,${X11DEPENDS}"
-PACKAGECONFIG[ptest] = "--enable-installed-tests,--disable-installed-tests,glib-2.0-native"
BBCLASSEXTEND = "native"
DEPENDS_class-native = "glib-2.0-native cairo-native harfbuzz-native"
-inherit gnomebase gtk-doc qemu ptest
+inherit gnomebase gtk-doc qemu ptest-gnome
EXTRA_AUTORECONF = ""
@@ -46,11 +43,7 @@ FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}"
FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
-FILES_${PN}-ptest += "${libexecdir}/installed-tests/* \
- ${datadir}/installed-tests/pango"
-FILES_${PN}-dbg += "${libexecdir}/installed-tests/.debug"
-
-RDEPENDS_${PN}-ptest += "gnome-desktop-testing liberation-fonts"
+RDEPENDS_${PN}-ptest += "liberation-fonts"
RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \
pango-module-basic-fc pango-module-arabic-lang"