diff --git a/srcpkgs/libreoffice/files/musl-fcntl_h.patch b/srcpkgs/libreoffice/files/musl-fcntl_h.patch deleted file mode 100644 index 9dd7752f312..00000000000 --- a/srcpkgs/libreoffice/files/musl-fcntl_h.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/common/os/os_utils.h 2016-09-27 10:03:58.000000000 +0200 -+++ src/common/os/os_utils.h 2017-02-04 03:05:37.357148694 +0100 -@@ -29,6 +29,9 @@ - #define INCLUDE_OS_FILE_UTILS_H - - #include -+#if !defined(__GLIBC__) -+#include -+#endif - - #include "../common/classes/fb_string.h" - #include "../common/StatusArg.h" diff --git a/srcpkgs/libreoffice/files/musl-os_utils_h.patch b/srcpkgs/libreoffice/files/musl-os_utils_h.patch new file mode 100644 index 00000000000..40572b8091d --- /dev/null +++ b/srcpkgs/libreoffice/files/musl-os_utils_h.patch @@ -0,0 +1,18 @@ +--- src/common/os/os_utils.h 2016-04-14 16:07:29.000000000 +0200 ++++ src/common/os/os_utils.h 2017-10-08 22:15:46.091610818 +0200 +@@ -34,12 +34,13 @@ + #include "../common/StatusArg.h" + #include "../common/classes/array.h" + +-#ifdef WIN_NT + #include + ++#ifdef WIN_NT + #define mode_t int + #define DEFAULT_OPEN_MODE (_S_IREAD | _S_IWRITE) +-#else ++#endif ++#if !defined(DEFAULT_OPEN_MODE) + #define DEFAULT_OPEN_MODE (0666) + #endif + diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index dbf9b129c2f..c1d22d273c4 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,7 +1,7 @@ # Template file for 'libreoffice' pkgname=libreoffice -version=5.4.1.2 -revision=2 +version=5.4.2.2 +revision=1 build_style=gnu-configure configure_args="--disable-werror" nopie=yes @@ -17,20 +17,16 @@ esac # 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-devel libressl-devel libgcrypt-devel - libgpg-error-devel poppler-cpp-devel postgresql-libs-devel redland-devel +makedepends="apr-devel gst-plugins-base1-devel gtk+-devel gtk+3-devel + libatomic_ops-devel librsvg-devel nss-devel python3-devel libgcrypt-devel + gpgmepp-devel poppler-cpp-devel postgresql-libs-devel redland-devel liborcus-devel lpsolve-devel unixodbc-devel libXt-devel neon-devel - avahi-libs-devel hunspell-devel hyphen-devel libabw-devel libcdr-devel CoinMP-devel - libcmis-devel libcppunit-devel libe-book-devel libfreehand-devel - libexttextcat-devel liblangtag-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 - vlc-devel" + avahi-libs-devel hunspell-devel hyphen-devel libabw-devel libcdr-devel + CoinMP-devel libbluetooth-devel libcmis-devel libe-book-devel libfreehand-devel + libexttextcat-devel libgltf-devel libldap-devel libmspub-devel libmwaw-devel + glew-devel glyphy-devel gst-plugins-base1-devel libodfgen-devel + libpagemaker-devel libvisio-devel libetonyek-devel libwpg-devel telepathy-glib-devel + libwps-devel glm mdds0 mythes-devel opencollada-devel sane-devel vigra-devel vlc-devel" depends="hyphen openldap sane" short_desc="Productivity suite, formerly OpenOffice.org" maintainer="Jürgen Buchmüller " @@ -62,10 +58,10 @@ distfiles=" ${_ooopurl}/${_ooop_templates_md5hash}-OOOP-templates-pack-${_ooop_templates_version}.zip " checksum=" - d320b01900a77cd7427e1b82fb2739fd1eb1fd3a08a75928929638b6470a2730 - 85c341e504d34266349f13979bd54a87afc6c14c57cf33d812e88a26ab726505 - ced4b795b92d42d2acc06be6393faad82a7e6cfbf738819dd4d460a44e61efaa - 8f91589ccc03c09f6e7b8079ccea775194c7c9f559ff68b8eef642f9647121c7 + 2fda4a8c446786a3afff2cf1b07b818c45c9dcd136bfae1f3191b0b1565ba675 + 36ee07e62c62383af7e3f742f85ea446450d1ccb3ff587829beca5b006029636 + 5fc740dbe77876b96ed731f0a6ce793925a9a4a4ba983b5a3506ab24beb73057 + d0eb02a65ffd164d8a9c287ef8b3e0d4db9b45979f72f496a6693ed5c39158d2 cf21b8a0a58c0f0af562869846ce2af4c68b13a7178b9b74ee7be7480a87c84c c95f6c398e81ee7def378e51e4c7b5bdeba526f28ff281e79ca3795e6d467159 1834aa0632499134f98ce85057d6d67604b9ed3b7efa7f13e76046f5886a3a2d @@ -84,7 +80,6 @@ skip_extraction=" if [ -z "$CROSS_BUILD" ]; then # mariadbclient can't currently be cross compiled makedepends+=" libmariadbclient-devel" - configure_args+=" --with-system-mariadb" fi case "$XBPS_TARGET_MACHINE" in @@ -94,8 +89,7 @@ case "$XBPS_TARGET_MACHINE" in *-musl) # use shipped clucene, because CLucene/analysis/cjk/CJKAnalyzer.h # is missing in the musl clucene-devel files ;; - *) configure_args+=" --with-system-clucene" - makedepends+=" clucene-devel" + *) makedepends+=" clucene-devel" ;; esac @@ -129,9 +123,9 @@ pre_configure() { chmod +x bin/unpack-sources mkdir -p external/firebird # Add musl patch - cp ${FILESDIR}/musl-fcntl_h.patch external/firebird/ + cp ${FILESDIR}/musl-os_utils_h.patch external/firebird/ sed -i external/firebird/UnpackedTarball_firebird.mk \ - -e's;\(.*external/firebird\)/libc++.patch\(.*\)$;\1/libc++.patch\2\n\1/musl-fcntl_h.patch\2;' + -e's;\(.*external/firebird\)/libc++.patch\(.*\)$;\1/libc++.patch\2\n\1/musl-os_utils_h.patch\2;' } do_configure() { @@ -155,24 +149,16 @@ 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" + # New strategy: enable all libs and headers, then disable what's missing + configure_args+=" --with-system-libs" + configure_args+=" --with-system-headers" case "$XBPS_TARGET_MACHINE" in - *-musl) # Can't use the glibc external modules - configure_args+=" --without-java" + *-musl) configure_args+=" --without-java" + configure_args+=" --without-system-clucene" ;; *) 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-jdk-home=/usr/lib/jvm/openjdk" @@ -180,64 +166,19 @@ do_configure() { ;; esac configure_args+=" --with-tls=nss" - configure_args+=" --with-system-cairo" + # xmlsec1-nss is missing, thus don't use system-xmlsec + configure_args+=" --without-system-xmlsec" + configure_args+=" --without-system-libzmf" + configure_args+=" --without-system-libstaroffice" + configure_args+=" --without-system-mysql-cppconn" + # libreoffice want's firebird3 + configure_args+=" --without-system-firebird" + configure_args+=" --without-system-libtommath" + configure_args+=" --without-system-jfreereport" + configure_args+=" --without-system-apache-commons" + configure_args+=" --without-system-beanshell" 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" - # Currently broken: libgltf-0.1.x API changed - # configure_args+=" --with-system-libgltf" - configure_args+=" --with-system-graphite" - configure_args+=" --with-system-orcus" - configure_args+=" --with-system-harfbuzz" - configure_args+=" --with-system-apr" - 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-neon" - configure_args+=" --with-system-postgresql" - # Firebird-3.0.1 does not work with libreoffice - # configure_args+=" --with-system-firebird" configure_args+=" --with-external-hyph-dir=${XBPS_CROSS_BASE}/usr/share/hyphen" configure_args+=" --with-parallelism=${XBPS_MAKEJOBS}"