From f4799b15f6e3f6e159dd6313b9a59a0bee3b744b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 27 Jun 2020 23:13:06 +0200 Subject: [PATCH] libreoffice: update to 6.4.4.2 --- srcpkgs/libreoffice/template | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index a4efa2625ae..c79bf84650f 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,7 +1,7 @@ # Template file for 'libreoffice' pkgname=libreoffice -version=6.4.1.2 -revision=2 +version=6.4.4.2 +revision=1 build_style=meta make_build_args="build-nocheck" nocross="Several dependencies are nocross=yes" @@ -115,10 +115,10 @@ distfiles=" ${_addurl}/ReemKufi-0.7.zip ${_addurl}/Scheherazade-2.100.zip " -checksum="0d64a09d3e20140def0ce09f6d8914b83dc17f6bfa8e7923ddf3f54b1d493f0a - 25505e935579bb24e17b260f96869a366b6d2d4bf01f61073602043eff95df8f - cf950517344e62c23cc2fd4872f5cd5e0468200c335e1f1b250d954b7d76253f - f60b2cacd10b30e141d8cafe405404d475ffc505e8ca0f9aa0a9af4e3a8e4309 +checksum="54388597dffc9c32f81446e6e634f7af76ca0e0e5a0d27bc3fe89033a011c078 + d04c3258a6f8a849d2aac6170cccf7d5d6f472463f0e0adbb38c657724562c6a + c61ac7b9ceac9aa0813bce405ce25b13dc1b698509ce33827ff7c65dffde25ac + 49cd385aabe7f197447ac0645a8fcdba75b04642b38fac49342aace2055098bd 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776 @@ -243,18 +243,20 @@ if [ "$XBPS_CHECK_PKGS" ]; then fi case "$XBPS_TARGET_MACHINE" in - i686) # Broken unit tests + i686*) # Broken unit tests CXXFLAGS+=" -DDISABLE_CVE_TESTS=1" ;; - *-musl) # use shipped clucene, because CLucene/analysis/cjk/CJKAnalyzer.h - # is missing in the musl clucene-devel files - makedepends+=" libexecinfo-devel" - ;; x86_64) build_options_default="java" makedepends+=" apache-ant openjdk11 " ;; esac +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + # use shipped clucene, because CLucene/analysis/cjk/CJKAnalyzer.h + # is missing in the musl clucene-devel files + makedepends+=" libexecinfo-devel" +fi + if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" fi