From 473cf10a94f1e7063608f9a24ae30c9465e5a202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 26 Aug 2018 18:40:38 +0200 Subject: [PATCH] libreoffice: update to 6.1.0.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- .../libreoffice/patches/0010-musl-vlc.patch | 10 ---- srcpkgs/libreoffice/template | 46 +++++++++---------- 2 files changed, 22 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/libreoffice/patches/0010-musl-vlc.patch diff --git a/srcpkgs/libreoffice/patches/0010-musl-vlc.patch b/srcpkgs/libreoffice/patches/0010-musl-vlc.patch deleted file mode 100644 index 89559176c18..00000000000 --- a/srcpkgs/libreoffice/patches/0010-musl-vlc.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- avmedia/source/vlc/wrapper/Types.hxx 2017-01-12 01:54:33.000000000 +0100 -+++ avmedia/source/vlc/wrapper/Types.hxx 2017-01-27 20:03:39.243895504 +0100 -@@ -15,6 +15,7 @@ - #if defined(_WIN32) - typedef __int64 libvlc_time_t; - #else -+# include - typedef int64_t libvlc_time_t; - #endif - diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template index 2a8e25131b6..1a0a9b8029d 100644 --- a/srcpkgs/libreoffice/template +++ b/srcpkgs/libreoffice/template @@ -1,8 +1,8 @@ #!/bin/sh # Template file for 'libreoffice' pkgname=libreoffice -version=6.0.4.2 -revision=3 +version=6.1.0.3 +revision=1 build_style=meta make_build_args="build-nocheck" nocross=yes @@ -18,7 +18,7 @@ makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel glyphy-devel hyphen-devel libXt-devel libabw-devel libatomic_ops-devel libbluetooth-devel libcdr-devel libcmis-devel libe-book-devel libepubgen-devel libetonyek-devel libexttextcat-devel libfreehand-devel libgcrypt-devel libgltf-devel - libldap-devel libmariadbclient-devel libmspub-devel libmwaw-devel + libldap-devel libmariadbclient-devel libmspub-devel libmwaw-devel libnumbertext-devel libodfgen-devel liborcus-devel libpagemaker-devel libqxp-devel librsvg-devel libvisio-devel libwpg-devel libwps-devel lpsolve-devel mdds0 mythes-devel neon-devel nss-devel poppler-cpp-devel postgresql-libs-devel python3-devel @@ -85,9 +85,9 @@ distfiles=" ${_addurl}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip ${_addurl}/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 ${_addurl}/Firebird-3.0.0.32483-0.tar.bz2 - ${_addurl}/libstaroffice-0.0.5.tar.xz + ${_addurl}/libstaroffice-0.0.6.tar.xz ${_addurl}/libzmf-0.0.2.tar.xz - ${_addurl}/pdfium-3235.tar.bz2 + ${_addurl}/pdfium-3426.tar.bz2 ${_addurl}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip ${_exturl}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar ${_exturl}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar @@ -123,16 +123,17 @@ distfiles=" ${_addurl}/culmus-0.131.tar.gz ${_addurl}/libre-hebrew-1.0.tar.gz ${_addurl}/alef-1.001.tar.gz - ${_addurl}/amiri-0.109.zip ${_addurl}/ttf-kacst_2.01+mry.tar.gz - ${_addurl}/ReemKufi-0.6.tar.gz + ${_addurl}/lxml-4.1.1.tgz + ${_addurl}/Amiri-0.111.zip + ${_addurl}/ReemKufi-0.7.zip ${_addurl}/Scheherazade-2.100.zip " checksum=" - 9081fb132090e9fe1ed8896ba4085e6f7ceef145f3a76889caeaed6c032510f7 - 8d757b8cb865f249ab3d09325099be51932060fc7ca95919d8ab135d87015150 - cef0f0d54da925bb9a69725177ba8594683f5f7500f226bdeeaf344ecb5c41fc - 865f78003114c9333d8df63ee64197b25f1894c5dd1038f563abb4c91a1c542e + 54eccd268f75d62fa6ab78d25685719c109257e1c0f4d628eae92ec09632ebd8 + fc1e088a15518c153df634cc5fb1f7faeb5632a38b3dafadb411376743a7a7d6 + bbc5ccdba93ab8a2e792311a6b5e84f160882ef4048eff46ecdfc31d0bd5da2b + a7625274535154e393e22ac1a1795859d4f7ead1c78e25b63554446f0d061190 cf21b8a0a58c0f0af562869846ce2af4c68b13a7178b9b74ee7be7480a87c84c c95f6c398e81ee7def378e51e4c7b5bdeba526f28ff281e79ca3795e6d467159 1834aa0632499134f98ce85057d6d67604b9ed3b7efa7f13e76046f5886a3a2d @@ -146,9 +147,9 @@ checksum=" 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd 48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d 6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860 - 315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982 + 6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4 27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22 - 7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f + 80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957 d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770 aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf @@ -184,9 +185,10 @@ checksum=" dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52 - 97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6 dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56 - 4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b + 940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e + 1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166 + f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f 251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5 " skip_extraction=" @@ -206,9 +208,9 @@ skip_extraction=" ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 Firebird-3.0.0.32483-0.tar.bz2 - libstaroffice-0.0.5.tar.xz + libstaroffice-0.0.6.tar.xz libzmf-0.0.2.tar.xz - pdfium-3235.tar.bz2 + pdfium-3426.tar.bz2 bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar @@ -244,20 +246,16 @@ skip_extraction=" culmus-0.131.tar.gz libre-hebrew-1.0.tar.gz alef-1.001.tar.gz - amiri-0.109.zip ttf-kacst_2.01+mry.tar.gz - ReemKufi-0.6.tar.gz + lxml-4.1.1.tgz + Amiri-0.111.zip + ReemKufi-0.7.zip Scheherazade-2.100.zip " build_options="java" desc_option_java="Enable Java support" -if [ -z "$CROSS_BUILD" ]; then - # mariadbclient can't currently be cross compiled - makedepends+=" libmariadbclient-devel" -fi - if [ -n "$XBPS_CHECK_PKGS" ]; then make_build_args="build" fi