Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=lotesting.git;a=commitdiff;h=14610c5d7984957f3e3622352dfe612422c31f53
commit 14610c5d7984957f3e3622352dfe612422c31f53 Author: Miklos Vajna <[email protected]> Date: Tue Jun 23 11:09:25 2015 +0200 libreoffice-5.0.0.1-1-x86_64 - drop --disable-gltf, now the required dependencies are packaged diff --git a/source/xapps/libreoffice/FrugalBuild b/source/xapps/libreoffice/FrugalBuild index 9bef36c..c27543c 100644 --- a/source/xapps/libreoffice/FrugalBuild +++ b/source/xapps/libreoffice/FrugalBuild @@ -31,6 +31,7 @@ depends=( 'libexttextcat>=3.4.0' 'libfbembed' 'libfreehand' + 'libgltf' 'liblangtag' 'libmspub' 'libmwaw>=0.2.0' @@ -47,6 +48,7 @@ depends=( 'lp_solve' 'mythes' 'neon>=0.26.1' + 'opencollada' 'openjre' 'perl-archive-zip' 'poppler-glib>=0.18' @@ -105,7 +107,8 @@ ext_source=(http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3 http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip \ http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip \ http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip \ - http://dev-www.libreoffice.org/src/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2) + http://dev-www.libreoffice.org/src/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2 \ + http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2) for i in ${ext_source[@]} do source=(${source[@]} $i) @@ -239,6 +242,8 @@ build() done Fpatchall touch autogen.lastrun + export OPENCOLLADA_CFLAGS='-I/usr/include/COLLADABaseUtils -I/usr/include/COLLADAFramework -I/usr/include/COLLADASaxFrameworkLoader -I/usr/include/GeneratedSaxParser' + export OPENCOLLADA_LIBS='-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser' _F_conf_configure="./autogen.sh" Fconfopts+=" --prefix=/usr --sysconfdir=/etc --localstatedir=/var --docdir=/usr/share/doc/libreoffice-$pkgver --infodir=/usr/share/info --mandir=/usr/share/man" Fconf --with-vendor="Frugalware Linux" \ @@ -249,12 +254,12 @@ build() --enable-kde4 \ --without-fonts \ --with-system-libs \ + --with-system-opencollada \ --with-system-headers \ --with-system-ucpp \ --without-system-hsqldb \ --without-system-orcus \ --disable-coinmp \ - --disable-gltf \ --with-external-tar=`pwd`/ext_source \ --with-system-jars \ --with-system-dicts \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
