diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 4227614b0e..dd0f26f091 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,7 +1,7 @@ # Template file for 'libreoffice' pkgname=libreoffice -version=5.4.2.2 -revision=2 +version=5.4.3.2 +revision=1 build_style=gnu-configure configure_args="--disable-werror" nocross=yes @@ -53,10 +53,10 @@ distfiles=" ${_ooopurl}/${_ooop_templates_md5hash}-OOOP-templates-pack-${_ooop_templates_version}.zip " checksum=" - 2fda4a8c446786a3afff2cf1b07b818c45c9dcd136bfae1f3191b0b1565ba675 - 36ee07e62c62383af7e3f742f85ea446450d1ccb3ff587829beca5b006029636 - 5fc740dbe77876b96ed731f0a6ce793925a9a4a4ba983b5a3506ab24beb73057 - d0eb02a65ffd164d8a9c287ef8b3e0d4db9b45979f72f496a6693ed5c39158d2 + d59526dc6adf96c53cd7ed3c0235d9a876cbd1af07ab653456395ea94479d931 + 4caa0315cd9b953d7543beb37d8c335de5cab5822ae65dcebc5e0f38bb31438a + 85dd76aabc205e8b30f9622bc5300156df6debf4ac0364eb732ced92932d30e4 + 7249cc6f87f7d2448e2c23356c2ae260a9aeaaa88ca75fa8ac66b42a3626fd2d cf21b8a0a58c0f0af562869846ce2af4c68b13a7178b9b74ee7be7480a87c84c c95f6c398e81ee7def378e51e4c7b5bdeba526f28ff281e79ca3795e6d467159 1834aa0632499134f98ce85057d6d67604b9ed3b7efa7f13e76046f5886a3a2d @@ -81,17 +81,19 @@ if [ -z "$CROSS_BUILD" ]; then fi case "$XBPS_TARGET_MACHINE" in - i686*) # Broken unit tests + i686) # Broken unit tests CXXFLAGS+=" -DDISABLE_CVE_TESTS=1" makedepends+=" clucene-devel" ;; *-musl) # use shipped clucene, because CLucene/analysis/cjk/CJKAnalyzer.h # is missing in the musl clucene-devel files ;; - *) build_options_default="java" + x86_64) build_options_default="java" makedepends+=" apache-ant openjdk " makedepends+=" clucene-devel" ;; + *) makedepends+=" clucene-devel" + ;; esac post_fetch() { @@ -153,6 +155,7 @@ do_configure() { # New strategy: enable all libs and headers, then disable what's missing configure_args+=" --with-system-libs" configure_args+=" --with-system-headers" + configure_args+=" --with-system-opencollada" case "$XBPS_TARGET_MACHINE" in i686*|*-musl) # Can't use system clucence