diff --git a/srcpkgs/libreoffice/patches/0005-firebird-glibc.patch b/srcpkgs/libreoffice/patches/0005-firebird-glibc.patch deleted file mode 100644 index c290e3d62e9..00000000000 --- a/srcpkgs/libreoffice/patches/0005-firebird-glibc.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- /dev/null 2016-02-21 14:44:37.295798706 +0100 -+++ external/firebird/firebird-glibc.patch.0 2016-02-24 15:12:43.055606993 +0100 -@@ -0,0 +1,11 @@ -+--- src/common/classes/rwlock.h 2015-03-27 14:47:01.000000000 +0100 -++++ src/common/classes/rwlock.h 2016-02-24 15:11:46.043602883 +0100 -+@@ -191,7 +191,7 @@ -+ -+ void init() -+ { -+-#if defined(LINUX) && !defined(USE_VALGRIND) -++#if defined(LINUX) && defined(__GLIBC__) && !defined(USE_VALGRIND) -+ pthread_rwlockattr_t attr; -+ if (pthread_rwlockattr_init(&attr)) -+ system_call_failed::raise("pthread_rwlockattr_init"); diff --git a/srcpkgs/libreoffice/patches/0006-firebird-libio.patch b/srcpkgs/libreoffice/patches/0006-firebird-libio.patch deleted file mode 100644 index 1ac287e3832..00000000000 --- a/srcpkgs/libreoffice/patches/0006-firebird-libio.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- /dev/null 2016-02-21 14:44:37.295798706 +0100 -+++ external/firebird/firebird-libio.patch.0 2016-02-24 15:39:05.303721064 +0100 -@@ -0,0 +1,11 @@ -+--- src/jrd/perf.h 2015-03-27 14:46:58.000000000 +0100 -++++ src/jrd/perf.h 2016-02-24 15:38:06.674716837 +0100 -+@@ -31,7 +31,7 @@ -+ #ifndef JRD_PERF_H -+ #define JRD_PERF_H -+ -+-#ifdef LINUX -++#if defined(LINUX) && defined(__GLIBC__) -+ #include -+ #endif -+ diff --git a/srcpkgs/libreoffice/patches/0007-firebird-patches.patch b/srcpkgs/libreoffice/patches/0007-firebird-patches.patch deleted file mode 100644 index 6974637f874..00000000000 --- a/srcpkgs/libreoffice/patches/0007-firebird-patches.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- external/firebird/UnpackedTarball_firebird.mk 2016-01-27 01:58:25.000000000 +0100 -+++ external/firebird/UnpackedTarball_firebird.mk 2016-02-24 15:13:34.733610719 +0100 -@@ -19,6 +19,8 @@ - external/firebird/firebird-c++11replfn.patch.0 \ - external/firebird/firebird.disable-ib-util-not-found.patch.1 \ - external/firebird/firebird-c++14.patch \ -+ external/firebird/firebird-glibc.patch.0 \ -+ external/firebird/firebird-libio.patch.0 \ - )) - - ifeq ($(OS)-$(COM),WNT-MSC) diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 0f32d23681f..72146d0f36f 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,32 +1,32 @@ # Template file for 'libreoffice' pkgname=libreoffice version=5.1.0.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-werror" nopie=yes nocross=yes # -# XXX: libwps-0.4.x mit-krb5-devel nasm openjdk sane vlc -# hamcrest hyphen iwyu libebook libfreehand libmwaw -# lp_solve mdds ogl-math OpenCOLLADA orcus telepathy-glib-devel +# XXX: mit-krb5-devel nasm openjdk vlc hamcrest +# iwyu ogl-math libgltf telepathy-glib-devel # Missing, required libraries are downloaded and built internally # hostmakedepends="automake libtool pkg-config bison flex gperf icu - perl-Archive-Zip unzip zip wget" + 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 neon-devel nss-devel python3.4-devel libressl-devel libgcrypt-devel libgpg-error-devel poppler-devel postgresql-libs-devel redland-devel - unixodbc-devel libXt-devel - - avahi-libs-devel hunspell-devel libabw-devel libcdr-devel libcmis-devel - libcppunit-devel libexttextcat-devel liblangtag-devel libmspub-devel - glew-devel glyphy-devel libodfgen-devel libpagemaker-devel librevenge-devel - libvisio-devel libetonyek-devel libwpd-devel libwpg-devel mythes-devel - vigra-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 + glew-devel glyphy-devel libodfgen-devel liborcus10-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" short_desc="Productivity suite, formerly OpenOffice.org" maintainer="Jürgen Buchmüller " license="LGPL-3" @@ -52,8 +52,6 @@ conflicts="libreoffice-bin>=0" _LO_PREFIX=/opt/${pkgname}${version%.*.*} if [ -z "$CROSS_BUILD" ]; then - # serf can't be cross compiled because of apr-util-devel - makedepends+=" serf-devel" # mariadbclient can't currently be cross compiled makedepends+=" libmariadbclient-devel" configure_args+=" --with-system-mariadb" @@ -85,6 +83,8 @@ pre_configure() { } do_configure() { + local incdir="${XBPS_CROSS_BASE}/usr/include" + # Separate autogen.sh and configure because we need # to patch configure for musl support NOCONFIGURE=1 ./autogen.sh @@ -92,71 +92,86 @@ do_configure() { # Add linux-musl* as host OS to lines containing linux-gnu* sed -i configure -e 's;linux-gnu\*;linux-gnu*|linux-musl*;g' + configure_args+=" --prefix=${_LO_PREFIX}" + configure_args+=" --exec-prefix=${_LO_PREFIX}" + configure_args+=" --with-vendor='VoidLinux'" + configure_args+=" --with-help" + configure_args+=" --with-alloc=system" + configure_args+=" --without-java" + configure_args+=" --without-system-dicts" + configure_args+=" --disable-odk" + configure_args+=" --enable-python=system" + configure_args+=" --enable-gtk3" + configure_args+=" --disable-dependency-tracking" + configure_args+=" --enable-release-build=yes" + configure_args+=" --disable-dconf" + configure_args+=" --with-tls=nss" + configure_args+=" --with-system-cairo" + configure_args+=" --with-myspell-dicts" + configure_args+=" --with-system-zlib" + configure_args+=" --with-system-jpeg" + configure_args+=" --with-system-expat" + configure_args+=" --with-system-icu" + configure_args+=" --with-system-icu-for-build=yes" + configure_args+=" --with-system-ucpp" + configure_args+=" --with-system-opencollada" + configure_args+=" --with-system-poppler" + configure_args+=" --with-system-curl" + configure_args+=" --with-system-boost" + configure_args+=" --with-system-mdds" + configure_args+=" --with-system-glew" + configure_args+=" --with-system-glyphy" + configure_args+=" --with-system-nss" + configure_args+=" --with-system-graphite" + configure_args+=" --with-system-orcus" + configure_args+=" --with-system-harfbuzz" + configure_args+=" --with-system-apr" + configure_args+=" --with-system-neon" + configure_args+=" --with-system-openssl" + configure_args+=" --with-system-redland" + configure_args+=" --with-system-libexttextcat" + configure_args+=" --with-system-libpng" + configure_args+=" --with-system-lpsolve" + configure_args+=" --with-system-coinmp" + configure_args+=" --with-system-liblangtag" + configure_args+=" --with-system-lcms2" + configure_args+=" --with-system-cppunit" + configure_args+=" --with-system-hunspell" + configure_args+=" --with-system-libabw" + configure_args+=" --with-system-libatomic_ops" + configure_args+=" --with-system-libcdr" + configure_args+=" --with-system-libcmis" + configure_args+=" --with-system-libebook" + configure_args+=" --with-system-libetonyek" + configure_args+=" --with-system-libfreehand" + configure_args+=" --with-system-libmspub" + configure_args+=" --with-system-libmwaw" + configure_args+=" --with-system-libodfgen" + configure_args+=" --with-system-libpagemaker" + configure_args+=" --with-system-librevenge" + configure_args+=" --with-system-libvisio" + configure_args+=" --with-system-libwpd" + configure_args+=" --with-system-libwpg" + configure_args+=" --with-system-libwps" + configure_args+=" --with-system-libxml" + configure_args+=" --with-system-mythes" + configure_args+=" --with-system-altlinuxhyph" + configure_args+=" --with-system-odbc" + configure_args+=" --with-system-openldap" + configure_args+=" --with-system-openssl" + configure_args+=" --with-system-postgresql" + configure_args+=" --with-system-firebird" + configure_args+=" --with-system-vigra" + 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. - - ./configure ${configure_args} \ - --prefix=${_LO_PREFIX} \ - --exec-prefix=${_LO_PREFIX} \ - --with-vendor='VoidLinux' \ - --with-lang='en-US de es fr it pl pt' \ - --with-help \ - --with-alloc=system \ - --without-java \ - --without-system-dicts \ - --disable-odk \ - --enable-python=system \ - --enable-gtk3 \ - --disable-dependency-tracking \ - --enable-release-build=yes \ - --disable-dconf \ - --with-tls=nss \ - --with-system-cairo \ - --with-myspell-dicts \ - --with-system-zlib \ - --with-system-jpeg \ - --with-system-expat \ - --with-system-icu \ - --with-system-icu-for-build=yes \ - --with-system-poppler \ - --with-system-curl \ - --with-system-boost \ - --with-system-glew \ - --with-system-glyphy \ - --with-system-nss \ - --with-system-graphite \ - --with-system-harfbuzz \ - --with-system-apr \ - --with-system-serf \ - --with-system-neon \ - --with-system-openssl \ - --with-system-redland \ - --with-system-libexttextcat \ - --with-system-libpng \ - --with-system-liblangtag \ - --with-system-lcms2 \ - --with-system-cppunit \ - --with-system-hunspell \ - --with-system-libabw \ - --with-system-libatomic_ops \ - --with-system-libcdr \ - --with-system-libcmis \ - --with-system-libetonyek \ - --with-system-libmspub \ - --with-system-libodfgen \ - --with-system-libpagemaker \ - --with-system-librevenge \ - --with-system-libvisio \ - --with-system-libwpd \ - --with-system-libwpg \ - --with-system-libxml \ - --with-system-mythes \ - --with-system-odbc \ - --with-system-openldap \ - --with-system-openssl \ - --with-system-postgresql \ - --with-system-vigra \ - --with-parallelism=${XBPS_MAKEJOBS} + 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 -l fToa" \ + COLLADA2GLTF_CFLAGS="-I${incdir}/opencollada/COLLADABaseUtils -I${incdir}/opencollada/COLLADAFramework -I${incdir}/opencollada/COLLADASaxFrameworkLoader -I${incdir}/opencollada/COLLADAStreamWriter -I${incdir}/opencollada/GeneratedSaxParser -I${incdir}/GLTF" \ + COLLADA2GLTF_LIBS="-L${XBPS_CROSS_BASE}/usr/lib/opecollada -lGeneratedSaxParser -lMathMLSolver -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lOpenCOLLADAStreamWriter -lUTF -lbuffer -l ftoa" \ + ./configure ${configure_args} --with-lang='en-US de es fr it pl pt' } do_build() { @@ -203,7 +218,7 @@ do_install() { # Icons vmkdir usr/share/pixmaps for f in $(find ${INSTDIR}/share/icons/hicolor/32x32/apps -type f); do - f=${f#${DESTDIR}/} + f=${f#${DESTDIR}} ln -sf $f ${DESTDIR}/usr/share/pixmaps/ done fi @@ -212,7 +227,7 @@ do_install() { # Desktop menu entries vmkdir usr/share/applications for f in $(find ${INSTDIR}/lib/libreoffice/share/xdg -type f); do - f=${f#${DESTDIR}/} + f=${f#${DESTDIR}} ln -sf $f ${DESTDIR}/usr/share/applications/libreoffice-$(basename $f) done fi @@ -221,7 +236,7 @@ do_install() { # Manual pages vmkdir usr/share/man/man1 for f in $(find ${INSTDIR}/share/man/man1 -type f); do - f=${f#${DESTDIR}/} + f=${f#${DESTDIR}} ln -sf $f ${DESTDIR}/usr/share/man/man1/ done fi