From 7fe7940d64b6475a661b99e4dbd66ca58e6dcf50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 8 Nov 2016 11:30:23 +0100 Subject: [PATCH] libreoffice(-native): add unoconv MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It useful on target and during build e.g for converting libreoffice files to pdf Signed-off-by: Andreas Müller --- recipes-libreoffice/libreoffice/libreoffice-native.bb | 5 +++++ recipes-libreoffice/libreoffice/libreoffice.bb | 4 ++++ recipes-libreoffice/libreoffice/libreoffice.inc | 2 ++ 3 files changed, 11 insertions(+) diff --git a/recipes-libreoffice/libreoffice/libreoffice-native.bb b/recipes-libreoffice/libreoffice/libreoffice-native.bb index 9fc965a..8110f48 100644 --- a/recipes-libreoffice/libreoffice/libreoffice-native.bb +++ b/recipes-libreoffice/libreoffice/libreoffice-native.bb @@ -121,6 +121,7 @@ do_compile() { BUILDDIR=${B} oe_runmake Library_configmgr BUILDDIR=${B} oe_runmake Library_fwk BUILDDIR=${B} oe_runmake Library_i18npool + BUILDDIR=${B} oe_runmake Library_pyuno # BUILDDIR=${B} oe_runmake Module_external } @@ -171,4 +172,8 @@ do_install() { # gengal script and binary to expected location install ${S}/svx/source/gengal/gengal.sh ${D}/${bindir}/gengal mv ${D}/${libdir}/gengal.bin ${D}/${bindir} + + # unoconv + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/git/unoconv ${D}/${bindir} } diff --git a/recipes-libreoffice/libreoffice/libreoffice.bb b/recipes-libreoffice/libreoffice/libreoffice.bb index 52981f1..d32bf73 100644 --- a/recipes-libreoffice/libreoffice/libreoffice.bb +++ b/recipes-libreoffice/libreoffice/libreoffice.bb @@ -193,6 +193,10 @@ do_configure() { do_install() { make DESTDIR=${D} distro-pack-install + + # unoconv + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/git/unoconv ${D}/${bindir} } diff --git a/recipes-libreoffice/libreoffice/libreoffice.inc b/recipes-libreoffice/libreoffice/libreoffice.inc index 9a125c3..d34b58f 100644 --- a/recipes-libreoffice/libreoffice/libreoffice.inc +++ b/recipes-libreoffice/libreoffice/libreoffice.inc @@ -9,10 +9,12 @@ LIC_FILES_CHKSUM = " \ require libreoffice-version.inc SRC_URI += " \ + git://github.com/dagwieers/unoconv.git;destsuffix=git/unoconv;name=unoconv \ file://0001-update-ax_boost-scripts-to-fix-configure-with-system.patch \ file://0002-fix-gcc-build-error.patch \ file://0003-Werror-shift-negative-value-GCC-6.patch \ " +SRCREV_unoconv = "260b815bf2c57118df439f381974f3f0987222a1" inherit autotools-brokensep pkgconfig distutils-base perlnative