summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2012-01-12 15:39:57 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-16 12:23:20 +0000
commit65186bd86170d8c375931a18487c2fdf3bd1b3b0 (patch)
tree80037199884e92daf785ec26537f042aafa5cdfb
parent458ffd3f47b99ee89e6cb8015d68f9820f86e3e7 (diff)
downloadopenembedded-core-65186bd86170d8c375931a18487c2fdf3bd1b3b0.tar.gz
openembedded-core-65186bd86170d8c375931a18487c2fdf3bd1b3b0.tar.bz2
openembedded-core-65186bd86170d8c375931a18487c2fdf3bd1b3b0.zip
pango.inc: add directory "/etc/pango"
Command "pango-querymodules > /etc/pango/pango.modules" can't work when \ starting up yocto because of no directory "/etc/pango". It will cause \ messy code when gtk-demo running. [YOCTO #1900] [RP: PR bump] Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
-rw-r--r--meta/recipes-graphics/pango/pango.inc6
-rw-r--r--meta/recipes-graphics/pango/pango_1.28.4.bb2
2 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index b428b9df06..5a2555f11f 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -46,6 +46,11 @@ fi
}
+# Command "pango-querymodules > /etc/pango/pango.modules" needs this directory.
+do_install_prepend() {
+ install -d ${D}/${sysconfdir}/pango
+}
+
python populate_packages_prepend () {
prologue = d.getVar("postinst_prologue", 1)
@@ -54,6 +59,5 @@ python populate_packages_prepend () {
do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
}
-FILES_${PN} = "/etc/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"
FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
diff --git a/meta/recipes-graphics/pango/pango_1.28.4.bb b/meta/recipes-graphics/pango/pango_1.28.4.bb
index d7af871ce3..d2776a6700 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 = "r3"
+PR = "r4"
SRC_URI += "file://no-tests.patch"
SRC_URI += "file://noconst.patch"