Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=lotesting.git;a=commitdiff;h=ce1fdfa2e8de34a07700a2313d7f9e93e83413ec
commit ce1fdfa2e8de34a07700a2313d7f9e93e83413ec Author: Miklos Vajna <[email protected]> Date: Sun Jun 22 17:10:33 2014 +0200 libreoffice-4.3.0.1-1-x86_64 - build with system glm diff --git a/source/xapps/libreoffice/FrugalBuild b/source/xapps/libreoffice/FrugalBuild index ec027f9..7d35b7c 100644 --- a/source/xapps/libreoffice/FrugalBuild +++ b/source/xapps/libreoffice/FrugalBuild @@ -41,7 +41,8 @@ makedepends=('apache-ant' 'boost>=1.50.0' 'hunspell>=1.3.2' \ # build-time friend of libfbembed 'firebird' \ # required by sdremote - 'bluez') + 'bluez' \ + 'glm') groups=('xapps') archs=('i686' 'x86_64') mirror="http://download.documentfoundation.org/libreoffice/src/$minor"; @@ -55,14 +56,12 @@ do source=(${source[@]} $mirror/libreoffice-$i${pkgver/_/-}.tar.xz) signatures=("${signatures[@]}" $mirror/libreoffice-$i${pkgver/_/-}.tar.xz.asc) done -# TODO system-glm ext_source=(http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll \ http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz \ 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/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz \ - http://dev-www.libreoffice.org/src/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip) + http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) for i in ${ext_source[@]} do source=(${source[@]} $i) @@ -211,7 +210,6 @@ build() --with-system-libs \ --with-system-headers \ --without-system-hsqldb \ - --without-system-glm \ --disable-coinmp \ --disable-gltf \ --with-external-tar=`pwd`/ext_source \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
