From 91e17c0c0ac2330f826b95e762542cd0d0c82385 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 16 Jan 2012 18:00:14 +0000 Subject: pango: Use gnomebase class, not gnome There was a circular dependency introduced by the recent gconf changes to depend on gtk+. The issue is that gtk+ depends on pango and pango depends on gconf. This patch changes to use the gnonebase class since pango has no need of gconf/mime/gtk-icon-cache and hence removes the circular dependency. Signed-off-by: Richard Purdie --- meta/recipes-graphics/pango/pango.inc | 2 +- meta/recipes-graphics/pango/pango_1.28.4.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/recipes-graphics/pango') diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index 5a2555f11f..e7262c3417 100644 --- a/meta/recipes-graphics/pango/pango.inc +++ b/meta/recipes-graphics/pango/pango.inc @@ -20,7 +20,7 @@ PACKAGES_DYNAMIC = "pango-module-*" RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc" -inherit gnome +inherit gnomebase # Create a pango-modules package ALLOW_EMPTY_${BPN}-modules = "1" PACKAGES += "${BPN}-modules" diff --git a/meta/recipes-graphics/pango/pango_1.28.4.bb b/meta/recipes-graphics/pango/pango_1.28.4.bb index d2776a6700..5778c3f6cd 100644 --- a/meta/recipes-graphics/pango/pango_1.28.4.bb +++ b/meta/recipes-graphics/pango/pango_1.28.4.bb @@ -2,7 +2,7 @@ require pango.inc LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" -PR = "r4" +PR = "r5" SRC_URI += "file://no-tests.patch" SRC_URI += "file://noconst.patch" -- cgit v1.2.3