From 491e2e45a4b0de52de2432d76f7ae13df64cd9a4 Mon Sep 17 00:00:00 2001 From: Juergen Buchmueller Date: Sat, 1 Oct 2016 21:34:47 +0200 Subject: [PATCH] libreoffice: disable extras for -ENOSPC The builders seem to have insufficient disk or tmpfs space. Disable the extras and external modules for now. Disabling ext also fixes the musl build (no -lnsl in musl libc). --- srcpkgs/libreoffice/template | 95 +++++++++++++++++------------------- 1 file changed, 46 insertions(+), 49 deletions(-) diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index f9134b2ff4..a0fe988ee7 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,8 +1,7 @@ -broken=yes # Template file for 'libreoffice' pkgname=libreoffice version=5.2.2.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-werror" nopie=yes @@ -13,36 +12,36 @@ nocross=yes # 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 - dbus-glib-devel libjpeg-turbo-devel libpng-devel glu-devel graphite-devel - gst-plugins-base1-devel gtk+-devel gtk+3-devel harfbuzz-devel icu-devel - libatomic_ops-devel lcms2-devel librsvg-devel libxml2-devel libxslt-devel - MesaLib-devel nss-devel python3.4-devel libressl-devel libgcrypt-devel - libgpg-error-devel poppler-cpp-devel postgresql-libs-devel redland-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 +makedepends="apr-devel gst-plugins-base1-devel gtk+-devel gtk+3-devel + libatomic_ops-devel librsvg-devel nss-devel python3.4-devel libgcrypt-devel + poppler-cpp-devel postgresql-libs-devel redland-devel liborcus11-devel + lpsolve-devel unixodbc-devel libXt-devel avahi-libs-devel hunspell-devel + hyphen-devel libabw-devel libcdr-devel CoinMP-devel + libcmis-devel libe-book-devel libfbclient-devel libfreehand-devel + libexttextcat-devel libldap-devel libmspub-devel libmwaw-devel glew-devel glyphy-devel gst-plugins-base1-devel libodfgen-devel libpagemaker-devel - librevenge-devel libvisio-devel libetonyek-devel libwpd-devel libwpg-devel - telepathy-glib-devel libwps-devel mdds0 mythes-devel opencollada-devel vigra-devel" + libvisio-devel libetonyek-devel libwpg-devel telepathy-glib-devel libwps-devel + mdds0 mythes-devel opencollada-devel vigra-devel" depends="hyphen openldap sane" short_desc="Productivity suite, formerly OpenOffice.org" maintainer="Jürgen Buchmüller " license="LGPL-3" homepage="http://www.libreoffice.org/" +# XXX: -ENOSPC on the builders; verified working locally +# Enable again when the builders have enough disk or tmpfs space +# # Additional zip archives -_ooop_fonts_md5hash=a10aa597411643326e27d7fc128af12d -_ooop_fonts_version=2.9.0.0 -_ooop_gallery_md5hash=af9314c5972d95a5d6da23ffad818f68 -_ooop_gallery_version=2.8.0.0 -_ooop_samples_md5hash=a6bccacf44914969e6e7b2f8faf4132c -_ooop_samples_version=2.7.0.0 -_ooop_templates_md5hash=1be202fbbbc13f10592a98f70a4a87fb -_ooop_templates_version=2.9.0.0 -# Extra gallery, samples and templates -_ooopurl="http://ooo.itc.hu/oxygenoffice/download/libreoffice" +#_ooop_fonts_md5hash=a10aa597411643326e27d7fc128af12d +#_ooop_fonts_version=2.9.0.0 +#_ooop_gallery_md5hash=af9314c5972d95a5d6da23ffad818f68 +#_ooop_gallery_version=2.8.0.0 +#_ooop_samples_md5hash=a6bccacf44914969e6e7b2f8faf4132c +#_ooop_samples_version=2.7.0.0 +#_ooop_templates_md5hash=1be202fbbbc13f10592a98f70a4a87fb +#_ooop_templates_version=2.9.0.0 +# # Extra gallery, samples and templates +#_ooopurl="http://ooo.itc.hu/oxygenoffice/download/libreoffice" # Source, dictionary, help and translations _baseurl="http://download.documentfoundation.org/${pkgname}/src/${version%.*}" @@ -51,21 +50,25 @@ distfiles=" ${_baseurl}/${pkgname}-dictionaries-${version}.tar.xz ${_baseurl}/${pkgname}-help-${version}.tar.xz ${_baseurl}/${pkgname}-translations-${version}.tar.xz - ${_ooopurl}/${_ooop_fonts_md5hash}-OOOP-fonts-pack-${_ooop_fonts_version}.zip - ${_ooopurl}/${_ooop_gallery_md5hash}-OOOP-gallery-pack-${_ooop_gallery_version}.zip - ${_ooopurl}/${_ooop_samples_md5hash}-OOOP-samples-pack-${_ooop_samples_version}.zip - ${_ooopurl}/${_ooop_templates_md5hash}-OOOP-templates-pack-${_ooop_templates_version}.zip " +# XXX: -ENOSPC on the builders +# ${_ooopurl}/${_ooop_fonts_md5hash}-OOOP-fonts-pack-${_ooop_fonts_version}.zip +# ${_ooopurl}/${_ooop_gallery_md5hash}-OOOP-gallery-pack-${_ooop_gallery_version}.zip +# ${_ooopurl}/${_ooop_samples_md5hash}-OOOP-samples-pack-${_ooop_samples_version}.zip +# ${_ooopurl}/${_ooop_templates_md5hash}-OOOP-templates-pack-${_ooop_templates_version}.zip + checksum=" 5952eaa0b06a0659cf7cca397f95c00e73f0f410f14310deb363985746dad9e0 f201c12e7a488c14b11a188b2c7eb9ee13895b68e5c4779c6706d8d39b9318dd 01c639223d9a31b58480935e1fef4f1bc7b82306f5fac8b6269541ab411ca2be f1ae61411106679769bdafa8c62f48b124874784e19bb53501ebbf61d670bc5b - cf21b8a0a58c0f0af562869846ce2af4c68b13a7178b9b74ee7be7480a87c84c - c95f6c398e81ee7def378e51e4c7b5bdeba526f28ff281e79ca3795e6d467159 - 1834aa0632499134f98ce85057d6d67604b9ed3b7efa7f13e76046f5886a3a2d - c31a4b1ab988a6b016654cc91e9652727cbb0fcbe9b09ee4b3d93b57a57901e0 " +# XXX: -ENOSPC on the builders +# cf21b8a0a58c0f0af562869846ce2af4c68b13a7178b9b74ee7be7480a87c84c +# c95f6c398e81ee7def378e51e4c7b5bdeba526f28ff281e79ca3795e6d467159 +# 1834aa0632499134f98ce85057d6d67604b9ed3b7efa7f13e76046f5886a3a2d +# c31a4b1ab988a6b016654cc91e9652727cbb0fcbe9b09ee4b3d93b57a57901e0 + skip_extraction=" ${pkgname}-dictionaries-${version}.tar.xz ${pkgname}-help-${version}.tar.xz @@ -102,7 +105,9 @@ post_fetch() { ${_ooop_gallery_md5hash}-OOOP-gallery-pack-${_ooop_gallery_version}.zip \ ${_ooop_samples_md5hash}-OOOP-samples-pack-${_ooop_samples_version}.zip \ ${_ooop_templates_md5hash}-OOOP-templates-pack-${_ooop_templates_version}.zip; do - ln -sf ${srcdistdir}/${pkg} ${wrksrc}/external/tarballs/ + if [ -f "${srcdistdir}/${pkg}" ]; then + ln -sf "${srcdistdir}/${pkg}" "${wrksrc}/external/tarballs/" + fi done } @@ -135,22 +140,6 @@ do_configure() { configure_args+=" --disable-dependency-tracking" configure_args+=" --enable-release-build=yes" configure_args+=" --disable-dconf" - configure_args+=" --enable-extra-gallery" - configure_args+=" --enable-extra-template" - configure_args+=" --enable-extra-sample" - configure_args+=" --enable-extra-font" - configure_args+=" --enable-ext-mariadb-connector" - configure_args+=" --enable-ext-watch-window" - configure_args+=" --enable-ext-diagram" - configure_args+=" --enable-ext-validator" - configure_args+=" --enable-ext-barcode" - configure_args+=" --enable-ext-ct2n" - configure_args+=" --enable-ext-numbertext" - configure_args+=" --enable-ext-hunart" - configure_args+=" --enable-ext-typo" - configure_args+=" --enable-ext-google-docs" - configure_args+=" --enable-ext-nlpsolver" - configure_args+=" --enable-ext-languagetool" configure_args+=" --with-tls=nss" configure_args+=" --with-system-cairo" configure_args+=" --with-myspell-dicts" @@ -174,6 +163,8 @@ do_configure() { configure_args+=" --with-system-orcus" configure_args+=" --with-system-harfbuzz" configure_args+=" --with-system-apr" + # Currently broken: missing libtest_ucb_webdav_local_neon.so + # configure_args+=" --with-system-neon" configure_args+=" --with-system-openssl" configure_args+=" --with-system-redland" configure_args+=" --with-system-libexttextcat" @@ -211,6 +202,12 @@ do_configure() { configure_args+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen" configure_args+=" --with-parallelism=${XBPS_MAKEJOBS}" + # XXX: -ENOSPC on the builders + #configure_args+=" --enable-extra-gallery" + #configure_args+=" --enable-extra-template" + #configure_args+=" --enable-extra-sample" + #configure_args+=" --enable-extra-font" + # 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" \