From 7b65b6ba1ba8af8313738a15953ef36c9d299eec Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Fri, 24 Feb 2017 00:11:38 +0100 Subject: abiword: fix build and unblacklist MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'meta-gnome/recipes-gnome') 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 d02114781a..48b3c10bed 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" SECTION = "x11/office" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20" -DEPENDS = "perl-native wv libglade libfribidi jpeg libpng \ - librsvg libwmf-native gtkmathview asio gtk+ evolution-data-server \ - ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'redland rasqal', '', d)}" +DEPENDS = " \ + perl-native \ + gtk+ \ + gtkmathview \ + wv \ + libglade \ + libfribidi \ + jpeg \ + libpng \ + librsvg \ + libwmf-native \ + asio \ + evolution-data-server \ + libxslt \ + ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'redland rasqal', '', d)} \ +" RDEPENDS_${PN} = "glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" RCONFLICTS_${PN} = "${PN}-embedded" @@ -125,5 +138,3 @@ python populate_packages_prepend () { } FILES_${PN}-plugin-openxml += "${datadir}/${PN}-${SHRT_VER}/omml_xslt" - -PNBLACKLIST[abiword] ?= "Depends on blacklisted gtkmathview" -- cgit 1.2.3-korg