[oe-commits] [meta-openembedded] 52/52: abiword: make build deterministic for meta-office [1] in layers

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit d24c10b921b7f131371f6be3b4dd318f2bef7482
Author: Andreas Müller <schnitzeltony at googlemail.com>
AuthorDate: Sun Feb 7 23:35:29 2016 +0100

    abiword: make build deterministic for meta-office [1] in layers
    
    The conditional DEPENDS was added for opendocument-plugin. Problem solving this
    by PACKAGECONFIG is that --enable-plugins enables all plugins. Changing that to
    --enable-plugins=<list of plugins> is a list which needs maintenance for future
    versions of abiword. The change affects users adding meta-office in their
    layers only. These tend to building libreoffice which DEPENDS on the additional
    DEPENDS set her anyway - so there is not much additional build for these users.
    
    [1] https://github.com/schnitzeltony/meta-office
    
    Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 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 d4c8c56..962a56c 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb
+++ b/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb
@@ -4,7 +4,8 @@ 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"
+               librsvg libwmf-native gtkmathview asio gtk+ evolution-data-server \
+               ${@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"
@@ -24,7 +25,11 @@ SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]
 
 inherit autotools-brokensep pkgconfig
 
-PACKAGECONFIG ??= "collab-backend-xmpp collab-backend-tcp"
+PACKAGECONFIG ??= " \
+    collab-backend-xmpp collab-backend-tcp \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libical', '', d)} \
+"
+PACKAGECONFIG[libical] = "--with-libical,--without-libical,libical raptor2"
 PACKAGECONFIG[spell] = "--enable-spell,--disable-spell,enchant"
 PACKAGECONFIG[collab-backend-xmpp] = "--enable-collab-backend-xmpp,--disable-collab-backend-xmpp,libgsf libxml2 loudmouth"
 PACKAGECONFIG[collab-backend-tcp] = "--enable-collab-backend-tcp,--disable-collab-backend-tcp,libgsf libxml2"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.