From 13856a00f26d652310d09cd4e7ce16107435cb8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 3 Nov 2020 22:57:45 +0100 Subject: [PATCH] libreoffice: update to 7.0.3.1 Make libreoffice-common depend on libreoffice-i18n-en-US to avoid failing to start whenever someone installs just e.g. libreoffice-writer and no i18n package(s) at all. Always installing en-US is not the best solution but should avoid future complaints in the issue tracker. --- srcpkgs/libreoffice/template | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index ce261fc0077..40cf566a8ce 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,7 +1,9 @@ # Template file for 'libreoffice' pkgname=libreoffice -version=7.0.1.2 -revision=2 +version=7.0.3.1 +revision=1 +# Remove this and the following line once x86_64* is done +archs="x86_64*" build_style=meta make_build_args="build-nocheck" nocross="Several dependencies are nocross=yes" @@ -92,7 +94,7 @@ distfiles=" ${_addurl}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip ${_addurl}/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz ${_addurl}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - ${_addurl}/skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz + ${_addurl}/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz ${_addurl}/ltm-1.0.zip ${_addurl}/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz ${_addurl}/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz @@ -116,10 +118,10 @@ distfiles=" ${_addurl}/ReemKufi-0.7.zip ${_addurl}/Scheherazade-2.100.zip " -checksum="6363ee2a7cd1389620bd1933c41be8fa59a8f36ff46c51d3f91e5b31631c7832 - 80dd257bb073b408cf3f4fedf762af832f80a419caadf342c4a055c03fb5e33c - b97db437dc7129f5d65b3cb07181e522dfb257236a68c5347bfe2acf40b215c0 - e6f75aa0ef0924b5312f06601397b7abe0a326036d103dc96444eb0a071fd631 +checksum="6566bce180c6b9561554de334b02344340a59f3bc0663d2c3c72addec444292d + 959001bc692a67fd65296a0f33179a33414c0754182908396756849da1fee034 + eb1ce39cb90b7c04f69af6f47c75cb65526634315d12230e638e3a561b9b9293 + 442a2a1931549edbdbc6ab8f9fbc6b8e7088fde4d5806cda82263080d3617168 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776 @@ -152,7 +154,7 @@ checksum="6363ee2a7cd1389620bd1933c41be8fa59a8f36ff46c51d3f91e5b31631c7832 7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66 a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585 085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045 - f88dc1a500d29c87ef5251c5a6c3ea66aa4c7daf0cf5d349ece64b36f7623be0 + 3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760 083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483 c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09 4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a @@ -212,7 +214,7 @@ skip_extraction=" ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - skia-m84-c1baf6e1c2a5454148adb516f0f833483b5a0353.tar.xz + skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz ltm-1.0.zip 368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz @@ -538,7 +540,7 @@ do_install() { libreoffice-common_package() { short_desc+=" - Common files" - depends="hunspell hyphen mythes openldap" + depends="hunspell hyphen mythes openldap libreoffice-i18n-en-US>=${version}_${revision}" skiprdeps=/usr/lib/libreoffice/program/libofficebean.so pkg_install() { _split common