From 93bde74e5b31f53c59c5fc14251e477c9780a93e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 26 Aug 2020 18:07:18 -0300 Subject: [PATCH] libreoffice: update to 7.0.1.2 Also remove obsolete patch from files/ and use system clucene. Remove archs=noarch from i18n and fonts. Closes: #24495 [via git-merge-pr] --- .../libreoffice/files/musl-os_utils_h.patch | 10 -------- srcpkgs/libreoffice/template | 23 ++++++------------- 2 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/libreoffice/files/musl-os_utils_h.patch diff --git a/srcpkgs/libreoffice/files/musl-os_utils_h.patch b/srcpkgs/libreoffice/files/musl-os_utils_h.patch deleted file mode 100644 index 3ff37f206e0..00000000000 --- a/srcpkgs/libreoffice/files/musl-os_utils_h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/common/os/os_utils.h 2016-04-14 16:07:29.000000000 +0200 -+++ - 2019-02-15 02:22:49.698708718 +0100 -@@ -40,6 +40,7 @@ - #define mode_t int - #define DEFAULT_OPEN_MODE (_S_IREAD | _S_IWRITE) - #else -+#include - #define DEFAULT_OPEN_MODE (0666) - #endif - diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 0eb5941e2ad..9c51c4a2a5a 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,10 +1,12 @@ # Template file for 'libreoffice' pkgname=libreoffice -version=7.0.0.3 +version=7.0.1.2 revision=1 build_style=meta make_build_args="build-nocheck" nocross="Several dependencies are nocross=yes" +# Remove this and the next line once x86_64 is finished +archs="x86_64*" # # XXX: mit-krb5-devel nasm hamcrest iwyu ogl-math poppler @@ -80,7 +82,6 @@ distfiles=" ${_addurl}/dtoa-20180411.tgz ${_addurl}/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip ${_addurl}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - ${_addurl}/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz ${_addurl}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt ${_addurl}/b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt ${_addurl}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip @@ -117,10 +118,10 @@ distfiles=" ${_addurl}/ReemKufi-0.7.zip ${_addurl}/Scheherazade-2.100.zip " -checksum="b25faf8272c6216b72c3c63fa2f56cc5385d38c83619bcb84916a26aabd9541d - 5a3bce5bd05f2e80368492c1a8c5d6b91225167c84c3cea95566c311c2fc5a8d - 85804410f466875eb380664150ddb4c5f4d8eaa2f4eda28c0b5942ff48a3f7fd - 8b7c9f0f972633a0fd05cb6369b948151a9f89b8ebc0b01ac713c8b10764d2c6 +checksum="6363ee2a7cd1389620bd1933c41be8fa59a8f36ff46c51d3f91e5b31631c7832 + 80dd257bb073b408cf3f4fedf762af832f80a419caadf342c4a055c03fb5e33c + b97db437dc7129f5d65b3cb07181e522dfb257236a68c5347bfe2acf40b215c0 + e6f75aa0ef0924b5312f06601397b7abe0a326036d103dc96444eb0a071fd631 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776 @@ -141,7 +142,6 @@ checksum="b25faf8272c6216b72c3c63fa2f56cc5385d38c83619bcb84916a26aabd9541d 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 - ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab 71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3 1568ed1d2feb8210bb5de61d69574a165cded536cfa17c6953c9064076469de2 75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba @@ -202,7 +202,6 @@ skip_extraction=" dtoa-20180411.tgz beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip @@ -258,8 +257,6 @@ case "$XBPS_TARGET_MACHINE" in 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 @@ -297,7 +294,6 @@ _add_lang() { _languages="$_languages ${pkglang//_/-}" eval "libreoffice-i18n-${1}_package() { short_desc+=\"- ${2} language pack\" - archs=noarch pkg_install() { _split lang_${pkglang} } @@ -482,10 +478,6 @@ do_configure() { opts+=" --with-system-libs" opts+=" --with-system-headers" case "$XBPS_TARGET_MACHINE" in - i686*|*-musl) - # Can't use system clucence - opts+=" --without-system-clucene" - ;; x86_64) # opts+=" --enable-ext-mariadb-connector" opts+=" --enable-ext-ct2n" opts+=" --enable-ext-numbertext" @@ -584,7 +576,6 @@ libreoffice-draw_package() { libreoffice-fonts_package() { short_desc+=" - Fonts" - archs=noarch pkg_install() { vmkdir usr/lib/libreoffice/share mv ${DESTDIR}/all/usr/lib/libreoffice/share/fonts \