summaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2017-02-24 00:11:38 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2017-02-28 12:34:13 +0100
commit7b65b6ba1ba8af8313738a15953ef36c9d299eec (patch)
tree361badead5053400271d84ec6e181218e2660ee9 /meta-gnome
parent3279e86fc3d32ea522ac542789f869a111912e27 (diff)
downloadmeta-openembedded-7b65b6ba1ba8af8313738a15953ef36c9d299eec.tar.gz
abiword: fix build and unblacklist
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb21
1 files changed, 16 insertions, 5 deletions
diff --git a/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb b/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb
index d02114781..48b3c10be 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb
+++ b/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb
@@ -3,9 +3,22 @@ HOMEPAGE = "http://www.abiword.org"
3SECTION = "x11/office" 3SECTION = "x11/office"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20" 5LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
6DEPENDS = "perl-native wv libglade libfribidi jpeg libpng \ 6DEPENDS = " \
7 librsvg libwmf-native gtkmathview asio gtk+ evolution-data-server \ 7 perl-native \
8 ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'redland rasqal', '', d)}" 8 gtk+ \
9 gtkmathview \
10 wv \
11 libglade \
12 libfribidi \
13 jpeg \
14 libpng \
15 librsvg \
16 libwmf-native \
17 asio \
18 evolution-data-server \
19 libxslt \
20 ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'redland rasqal', '', d)} \
21"
9RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ 22RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \
10 glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" 23 glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
11RCONFLICTS_${PN} = "${PN}-embedded" 24RCONFLICTS_${PN} = "${PN}-embedded"
@@ -125,5 +138,3 @@ python populate_packages_prepend () {
125} 138}
126 139
127FILES_${PN}-plugin-openxml += "${datadir}/${PN}-${SHRT_VER}/omml_xslt" 140FILES_${PN}-plugin-openxml += "${datadir}/${PN}-${SHRT_VER}/omml_xslt"
128
129PNBLACKLIST[abiword] ?= "Depends on blacklisted gtkmathview"