summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-16 18:00:14 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-16 18:01:43 +0000
commit7c8ebf6f0d4f32a50b390eda6dec1fd39b71dd56 (patch)
tree4ea504ae6159f891775fba13eaf81151a995f366
parentb02e7d45e06d1fbaf072deea9f3773ca14787e65 (diff)
downloadpoky-7c8ebf6f0d4f32a50b390eda6dec1fd39b71dd56.tar.gz
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. (From OE-Core rev: 91e17c0c0ac2330f826b95e762542cd0d0c82385) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/pango/pango.inc2
-rw-r--r--meta/recipes-graphics/pango/pango_1.28.4.bb2
2 files changed, 2 insertions, 2 deletions
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-*"
20 20
21RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc" 21RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc"
22 22
23inherit gnome 23inherit gnomebase
24# Create a pango-modules package 24# Create a pango-modules package
25ALLOW_EMPTY_${BPN}-modules = "1" 25ALLOW_EMPTY_${BPN}-modules = "1"
26PACKAGES += "${BPN}-modules" 26PACKAGES += "${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
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" 3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
4 4
5PR = "r4" 5PR = "r5"
6 6
7SRC_URI += "file://no-tests.patch" 7SRC_URI += "file://no-tests.patch"
8SRC_URI += "file://noconst.patch" 8SRC_URI += "file://noconst.patch"