From 1798655e5a7a6062d529aa4e0f48ca7dd7567c71 Mon Sep 17 00:00:00 2001 From: Juergen Buchmueller Date: Fri, 9 Sep 2016 08:34:51 +0200 Subject: [PATCH] libreoffice: update to 5.2.1.2 --- srcpkgs/libreoffice/template | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index edadfbd90dc..ce926f1aa13 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,7 +1,7 @@ # Template file for 'libreoffice' pkgname=libreoffice -version=5.2.0.4 -revision=2 +version=5.2.1.2 +revision=1 build_style=gnu-configure configure_args="--disable-werror" nopie=yes @@ -11,9 +11,6 @@ nocross=yes # iwyu ogl-math libgltf telepathy-glib-devel # Missing, required libraries are downloaded and built internally # -# Temporarily disable --with-system-orcus until libreoffice works -# with liborcus >= 0.12.0 -# hostmakedepends="automake libtool pkg-config bison flex gperf icu perl-Archive-Zip hyphen openldap sane ucpp unzip zip wget" makedepends="apr-devel boost-devel cups-devel libcurl-devel @@ -22,7 +19,7 @@ makedepends="apr-devel boost-devel cups-devel libcurl-devel libatomic_ops-devel lcms2-devel librsvg-devel libxml2-devel libxslt-devel MesaLib-devel neon-devel nss-devel python3.4-devel libressl-devel libgcrypt-devel libgpg-error-devel poppler-cpp-devel postgresql-libs-devel redland-devel - lpsolve-devel unixodbc-devel libXt-devel + liborcus11-devel lpsolve-devel unixodbc-devel libXt-devel avahi-libs-devel hunspell-devel hyphen-devel libabw-devel libcdr-devel CoinMP-devel libcmis-devel libcppunit-devel libe-book-devel libfbclient-devel libfreehand-devel libexttextcat-devel liblangtag-devel libldap-devel libmspub-devel libmwaw-devel @@ -41,10 +38,10 @@ distfiles=" ${_baseurl}/${pkgname}-help-${version}.tar.xz ${_baseurl}/${pkgname}-translations-${version}.tar.xz" checksum=" - 47de41b85f6bb084bd657cd4f56510997ae04d0e6c6342877ec160a7c45c6bec - 2f08228c234382a8da732bef94043e2206c7bdef78f9b730fb1d3b05967e5b3f - 20d53e07750a1c4bafeed8c01c648f983c72cdf356e907dcf46a34bd169fcabf - a5d17109dbe8af2ab2d8a4dd2feda61e78826c73a48cb7e5b95387992ab66d28" + 81399c823a554bfae416a32e06f074cda4cec38747e764587d7a93162fefe291 + fa192f197b6f3943db9e899a39e1f07abff2f39ca6e2a946b66e69ca18f097b9 + 0721618b93b2377ac53d049f08e8646037c2acb4b3f0440823f3b0e1710d9656 + 755f1df2d8255763fe48b85926f331286b0fafa318d340480060a9657df80daa" skip_extraction=" ${pkgname}-dictionaries-${version}.tar.xz ${pkgname}-help-${version}.tar.xz @@ -120,8 +117,7 @@ do_configure() { configure_args+=" --with-system-glyphy" configure_args+=" --with-system-nss" configure_args+=" --with-system-graphite" - # Disabled until libreoffice supports liborcus >= 0.12.0 - # configure_args+=" --with-system-orcus" + configure_args+=" --with-system-orcus" configure_args+=" --with-system-harfbuzz" configure_args+=" --with-system-apr" configure_args+=" --with-system-neon" @@ -163,8 +159,7 @@ do_configure() { configure_args+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen" configure_args+=" --with-parallelism=${XBPS_MAKEJOBS}" - # In theory we could use --with-lang=ALL but then - # building the package then takes ages. + # In theory we could use --with-lang=ALL but building the package then takes ages. OPENCOLLADA_CFLAGS="-I${incdir}/opencollada/COLLADABaseUtils -I${incdir}/opencollada/COLLADAFramework -I${incdir}/opencollada/COLLADASaxFrameworkLoader -I${incdir}/opencollada/COLLADAStreamWriter -I${incdir}/opencollada/GeneratedSaxParser" \ OPENCOLLADA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lGeneratedSaxParser -lMathMLSolver -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lOpenCOLLADAStreamWriter -lUTF -lbuffer -lftoa" \ ./configure ${configure_args} --with-lang='en-US de es fr it pl pt'