[Libreoffice-commits] online.git: Branch 'libreoffice-5-4' - loolwsd-systemplate-setup

Andras Timar andras.timar at collabora.com
Thu Feb 1 11:08:40 UTC 2018


 loolwsd-systemplate-setup |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c531bb06185769c068e43d8bcabf2c6ca0f23373
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Jul 11 12:39:10 2017 +0200

    add xpdfimport dependencies (e.g. system libpoppler) to systemplate
    
    Change-Id: Iedb77cc0eed107899b15d3d471edcfa0f655d176
    (cherry picked from commit 478e803819339f99920d1b6be805fbaa0db66ae2)
    Reviewed-on: https://gerrit.libreoffice.org/48964
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
index 790bbb38..8fb23552 100755
--- a/loolwsd-systemplate-setup
+++ b/loolwsd-systemplate-setup
@@ -37,6 +37,7 @@ find etc/passwd etc/group etc/hosts \
      usr/share/zoneinfo/* \
      usr/share/liblangtag \
      usr/lib/libpng* usr/lib64/libpng* lib/*-linux-gnu/libpng* \
+     usr/lib/*-linux-gnu/liblcms2* \
 	 -type f
 
 find etc/fonts \
@@ -45,11 +46,12 @@ find etc/fonts \
      lib/libcap* lib64/libcap* lib/*-linux-gnu/libcap* \
      lib/libattr* lib/*-linux-gnu/libattr* \
      usr/lib/libpng* usr/lib64/libpng* lib/*-linux-gnu/libpng* \
+     usr/lib/*-linux-gnu/liblcms2* \
 	 -type l
 
 # Go through the LO shared objects and check what system libraries
 # they link to.
-find $INSTDIR -name '*.so' -o -name '*.so.[0-9]*' |
+find $INSTDIR -name '*.so' -o -name '*.so.[0-9]*' -o -name 'xpdfimport' |
 while read file; do
     ldd $file 2>/dev/null
 done |


More information about the Libreoffice-commits mailing list