From 70674d4ee2a24971d1bab048906fa8d0d2ba2e75 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 18 Nov 2015 10:10:13 +0000 Subject: pango: use ptest-gnome Instead of hand-coding the ptest integration, use the ptest-gnome class. Signed-off-by: Ross Burton --- meta/recipes-graphics/pango/pango.inc | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'meta/recipes-graphics/pango') diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index 04143bdca5..78cd560af7 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" -- cgit 1.2.3-korg