From 00b72ab7d26c3a600a05d1139ac84b62e37d1198 Mon Sep 17 00:00:00 2001 From: Juergen Buchmueller Date: Mon, 22 Aug 2016 10:43:26 +0200 Subject: [PATCH] libreoffice: disable system liborcus (temporarily) Since libreoffice does not yet cope with the liborcus update to 0.12.0, for now use the internal liborcus-0.11.2 --- srcpkgs/libreoffice/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 6112c640ff..edadfbd90d 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=1 +revision=2 build_style=gnu-configure configure_args="--disable-werror" nopie=yes @@ -11,6 +11,9 @@ 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 @@ -23,7 +26,7 @@ makedepends="apr-devel boost-devel cups-devel libcurl-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 - glew-devel glyphy-devel libodfgen-devel liborcus-devel libpagemaker-devel + glew-devel glyphy-devel libodfgen-devel libpagemaker-devel librevenge-devel libvisio-devel libetonyek-devel libwpd-devel libwpg-devel libwps-devel mdds0 mythes-devel opencollada-devel vigra-devel" depends="hyphen openldap sane" @@ -117,7 +120,8 @@ do_configure() { configure_args+=" --with-system-glyphy" configure_args+=" --with-system-nss" configure_args+=" --with-system-graphite" - configure_args+=" --with-system-orcus" + # Disabled until libreoffice supports liborcus >= 0.12.0 + # configure_args+=" --with-system-orcus" configure_args+=" --with-system-harfbuzz" configure_args+=" --with-system-apr" configure_args+=" --with-system-neon"