community/libreoffice: upgrade to 5.2.0.4

2 files changed, 42 insertions, 41 deletions

diff --git a/community/libreoffice/APKBUILD b/community/libreoffice/APKBUILD
index 7fd01ff147..fe6326b364 100644
--- a/community/libreoffice/APKBUILD
+++ b/community/libreoffice/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer:
 pkgname=libreoffice
-pkgver=5.1.2.2
-pkgrel=1
+pkgver=5.2.0.4
+pkgrel=0
 pkgdesc="LibreOffice - Meta package for the full office suite"
 url="http://www.libreoffice.org/"
 arch="all"
@@ -29,10 +29,12 @@ case $pkgver in
 	*.*.*.*) _v=${pkgver%.*};;
 	*.*.*) _v=$pkgver;;
 esac
+
+# grep LIBXMLSEC_TARBALL download.lst
 source="http://download.documentfoundation.org/libreoffice/src/${_v}/libreoffice-$pkgver.tar.xz
 	http://download.documentfoundation.org/libreoffice/src/${_v}/libreoffice-dictionaries-$pkgver.tar.xz
 	http://download.documentfoundation.org/libreoffice/src/${_v}/libreoffice-translations-$pkgver.tar.xz
-	$_addsrcurl/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+	$_addsrcurl/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
 	linux-musl.patch
 	fix-execinfo.patch
 	fix-includes.patch
@@ -135,6 +137,10 @@ build() {
 		--disable-gltf \
 		--disable-liblangtag \
 		|| return 1
+	# adding '-isystem /usr/include' make things break with gcc6
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823145
+	sed -i -e 's:-isystem /usr/include[^/]::g' config_host.mk || return 1
+
 	make build-nocheck || return 1
 }
 
@@ -206,24 +212,24 @@ writer() {
 	_split writer
 }
 
-md5sums="6145510261094a85a6cecaecefa10c94  libreoffice-5.1.2.2.tar.xz
-05188274ca5b5aac92f0321e4cf153d7  libreoffice-dictionaries-5.1.2.2.tar.xz
-4075e99e6075fb7bd163a5f66e24c0f3  libreoffice-translations-5.1.2.2.tar.xz
-1f24ab1d39f4a51faf22244c94a6203f  1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+md5sums="40ee24812d171238981599843ca9f5b6  libreoffice-5.2.0.4.tar.xz
+6a30891f131323947db97de00b99e3a9  libreoffice-dictionaries-5.2.0.4.tar.xz
+584877f514a723403c0344cc84a0bc59  libreoffice-translations-5.2.0.4.tar.xz
+ce12af00283eb90d9281956524250d6e  ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
 bfde50b1b04c715cd172be03a204521f  linux-musl.patch
 1cff63a520d1b037edddf1b4de4799dc  fix-execinfo.patch
-2410b3fef56a2163a0d3142330ecbcdc  fix-includes.patch"
-sha256sums="54ecdc9e0201a64fb6a0898b2e5ebd6c6e22c36965e3eb797ae351219e441781  libreoffice-5.1.2.2.tar.xz
-c500d21160a22808986b80230c71a1eff8b2f2102e2d5f9d1d543dcfa698a03e  libreoffice-dictionaries-5.1.2.2.tar.xz
-7fbf0d742df7d9a5cf567bb8b8d78e16160936a6f339b9d035e0ac9e1d2455f0  libreoffice-translations-5.1.2.2.tar.xz
-390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a  1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+c6fc4d38ef1bab69f3570a0d087b4c52  fix-includes.patch"
+sha256sums="47de41b85f6bb084bd657cd4f56510997ae04d0e6c6342877ec160a7c45c6bec  libreoffice-5.2.0.4.tar.xz
+2f08228c234382a8da732bef94043e2206c7bdef78f9b730fb1d3b05967e5b3f  libreoffice-dictionaries-5.2.0.4.tar.xz
+a5d17109dbe8af2ab2d8a4dd2feda61e78826c73a48cb7e5b95387992ab66d28  libreoffice-translations-5.2.0.4.tar.xz
+3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305  ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
 fd0778cfd18b034a415a8966f7a3d8437c3f2ba1c6cfde8220ba663261b9c67f  linux-musl.patch
 7171dfa651a7ee81b4e13a9fd9131428d9a65af138cac4cb428ae6c3e4bcb1f3  fix-execinfo.patch
-2044d4c997472a46e95c68fa8bec19c1424e9074fad05df9f1c0d220dec00281  fix-includes.patch"
-sha512sums="0b2d9d2f91b40fc6eda67d9d6a16f95391f985be8ffa43e8f577c42bc0c1228e2c14de4dfbdef808a6edd61985903d5e12e0696ef43f522e78ee123c1d5f01e8  libreoffice-5.1.2.2.tar.xz
-b74d1ac8c43610eeb70138fc995d638fb33b55f238bfffc3885093e377dc721cfedd1426c04ceac4d2a419efc927e1d2ba414ff04a95bca20f38645cffdda3a2  libreoffice-dictionaries-5.1.2.2.tar.xz
-01ee739af883530744ca792754ee398b6e41a8def997151e0757a52957cad054a445c505c08fb8fb92eec1a5bedde78085d099128d119d9a30aa25aa1f26a54b  libreoffice-translations-5.1.2.2.tar.xz
-5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91  1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+51052d983eeea85d8d71385e4eeda61b6a8746854fe046b9a91e12c013d9ed89  fix-includes.patch"
+sha512sums="43142bbde02b21538b5c49bb2baf973d8a2f7bdeb5fdc60630b1c1819c4f2f2acd8851b7a4e103cbb1d502e3c59b8fd9d9fc9b760c1b5991b931aac078cf5f6a  libreoffice-5.2.0.4.tar.xz
+70d7aad21affa73665afde50619a1b0b92c8f67a7ba57cabc5ae3664c9fae8b8daa072564722180a469c4635059bfcefefb439920122fe3595ecd3a0639acedb  libreoffice-dictionaries-5.2.0.4.tar.xz
+77c89603dda394a59e80776ac6e8d92bafb7961131dcefd2df262825cfc2052f0f152d46841cd925e7b417789c9096cc87d30e4ae60682f7f9c1c6b0f6a214f7  libreoffice-translations-5.2.0.4.tar.xz
+2f8d473916abf9822367edbe857fc2e12dc9858d12e790d689d787e439904bd6a452bf631043aa66e7502457ab0815a473657f58fca17a213e2490f5655e5ae5  ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
 6abfd9c6cf1917e9ee89695086013c94f5ec68f9732ad60faeeaabe6f3765f5ff19df575a3ef0098d6dd6ba3c76369cec871770396f5cd84829031c3e38485a8  linux-musl.patch
 567123f990c4a47c2e4cebf99f3486150740015e647ca2b2521e606f3350fc55ceda6c7ac031302da34e8fc90747d66619334fcfda4e7b8998456fe3619ab860  fix-execinfo.patch
-15defc8362fb0e53db32b75d9c4ece73e1ee8bd1cc05b4dd8f072f808e6943b385a5415513b237d3daa130dedce3c6ac6370e05ec0b4a25065ce27aadd269e92  fix-includes.patch"
+c9e0b05640d7d0e6053b8dd4735664d761a7d381c5b5cbda059fb7b38ab28531c014b6d38f58a0e1f7171a43d62f04d8ecbb7b6b008d0ad30017228ec7e6601a  fix-includes.patch"
diff --git a/community/libreoffice/fix-includes.patch b/community/libreoffice/fix-includes.patch
index b1f1b44101..1c925fc9be 100644
--- a/community/libreoffice/fix-includes.patch
+++ b/community/libreoffice/fix-includes.patch
@@ -1,26 +1,8 @@
---- libreoffice-4.4.0.3/vcl/inc/headless/svpinst.hxx	2015-02-02 20:38:46.879497689 -0200
-+++ libreoffice-4.4.0.3/vcl/inc/headless/svpinst.hxx	2015-02-02 20:38:55.482831474 -0200
-@@ -32,6 +32,7 @@
- #include <list>
- 
- #include <time.h>
-+#include <sys/time.h>
- 
- #define VIRTUAL_DESKTOP_WIDTH 1024
- #define VIRTUAL_DESKTOP_HEIGHT 768
---- libreoffice-4.4.0.3/vcl/unx/generic/gdi/cairotextrender.cxx	2015-02-02 21:19:22.822959064 -0200
-+++ libreoffice-4.4.0.3/vcl/unx/generic/gdi/cairotextrender.cxx	2015-02-02 21:19:48.312960404 -0200
-@@ -18,6 +18,7 @@
-  */
- 
- #include "cairotextrender.hxx"
-+#include "generic/glyphcache.hxx"
- 
- #include <basegfx/polygon/b2dpolypolygon.hxx>
- #include <vcl/settings.hxx>
---- libreoffice-4.4.0.3/sd/source/ui/remotecontrol/BluetoothServer.cxx	2015-02-03 08:42:36.590056362 -0200
-+++ libreoffice-4.4.0.3/sd/source/ui/remotecontrol/BluetoothServer.cxx	2015-02-03 08:42:46.030056456 -0200
-@@ -22,7 +22,7 @@
+diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
+index f177d86..99bb408 100644
+--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
++++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
+@@ -21,7 +21,7 @@
    #include <dbus/dbus.h>
    #include <errno.h>
    #include <fcntl.h>
@@ -29,3 +11,16 @@
    #include <sys/socket.h>
    #include <bluetooth/bluetooth.h>
    #include <bluetooth/rfcomm.h>
+diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
+index 932e928..b65ced7 100644
+--- a/vcl/inc/headless/svpinst.hxx
++++ b/vcl/inc/headless/svpinst.hxx
+@@ -30,7 +30,7 @@
+ 
+ #include <list>
+ 
+-#include <time.h>
++#include <sys/time.h>
+ 
+ #define VIRTUAL_DESKTOP_WIDTH 1024
+ #define VIRTUAL_DESKTOP_HEIGHT 768