summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-07-19 16:13:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-22 11:42:19 +0100
commit4a5f8d84ee8555dd6b2e72f2611e13da9989efde (patch)
tree11d5a2eb611f091716104cb1cca24d83d8d1cac2 /meta
parent9f779782238beb074374f802cd888829e3993331 (diff)
downloadpoky-4a5f8d84ee8555dd6b2e72f2611e13da9989efde.tar.gz
pango: cleanup thanks to new gtk-doc.bbclass
(From OE-Core rev: 1c5fbfe7f284c8e8f6d850593192b8350c3ce7d5) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/pango/pango.inc4
-rw-r--r--meta/recipes-graphics/pango/pango_1.28.4.bb2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index 4fcc94f951..c9e92f00b7 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -10,7 +10,7 @@ SECTION = "libs"
10LICENSE = "LGPLv2.0+" 10LICENSE = "LGPLv2.0+"
11 11
12X11DEPENDS = "virtual/libx11 libxft" 12X11DEPENDS = "virtual/libx11 libxft"
13DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo elfutils" 13DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo elfutils"
14 14
15PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 15PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
16PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}" 16PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}"
@@ -22,7 +22,7 @@ PACKAGES_DYNAMIC = "pango-module-*"
22 22
23RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc" 23RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc"
24 24
25inherit gnomebase 25inherit gnomebase gtk-doc
26# Create a pango-modules package 26# Create a pango-modules package
27ALLOW_EMPTY_${BPN}-modules = "1" 27ALLOW_EMPTY_${BPN}-modules = "1"
28PACKAGES += "${BPN}-modules" 28PACKAGES += "${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 7055158192..48695920d1 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 = "r8" 5PR = "r9"
6 6
7SRC_URI += "file://no-tests.patch \ 7SRC_URI += "file://no-tests.patch \
8 file://noconst.patch \ 8 file://noconst.patch \